Update sample codes for v2.6.3

loopsocial · Feb 17, 2024 · 00676a8 · 00676a8
1 parent 614aa6d
commit 00676a8
Show file tree

Hide file tree

Showing 593 changed files with 623 additions and 600 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## [2.6.3]
+
+### Fixed
+
+- [Android] `stopFloatingPlayer` doesn't work when the video pauses
+
+### Changed
+
+- [Android] Upgrade Firework Android SDK to V6.9.3
+
 ## [2.6.2]
 
 ### Changed

diff --git a/FireworkFlutterSDKSample/lib/my_app.dart b/FireworkFlutterSDKSample/lib/my_app.dart
@@ -93,11 +93,17 @@ class _MyAppState extends State<MyApp> {
     };
 
     FireworkSDK.getInstance().shopping.onShoppingCTA =
-        HostAppService.getInstance().onAddToCart;
+        HostAppService.getInstance().onShopNow;
     FireworkSDK.getInstance().shopping.onUpdateProductDetails =
         HostAppService.getInstance().onUpdateProductDetails;
     FireworkSDK.getInstance().shopping.onCustomClickCartIcon =
         HostAppService.getInstance().onCustomClickCartIcon;
+    FireworkSDK.getInstance().shopping.productInfoViewConfiguration =
+        ProductInfoViewConfiguration(
+      ctaButton: ShoppingCTAButtonConfiguration(
+        text: ShoppingCTAButtonText.shopNow,
+      ),
+    );
 
     FireworkSDK.getInstance().liveStream.onLiveStreamEvent = (event) {
       if (event != null) {

diff --git a/FireworkFlutterSDKSample/lib/screens/home/home_screen.dart b/FireworkFlutterSDKSample/lib/screens/home/home_screen.dart
@@ -360,6 +360,8 @@ class _HomeScreenState extends State<HomeScreen> {
     List<Widget> widgetList = <Widget>[];
 
     for (var e in _defaultHomeStoryBlockPlaylistInfoArray) {
+      FWExampleLoggerUtil.log(
+          "_buildMultiFeeds channelId: ${e.channelId} playlistId: ${e.playlistId}");
       widgetList.addAll([
         const SizedBox(
           height: 20,
@@ -374,6 +376,10 @@ class _HomeScreenState extends State<HomeScreen> {
             channel: e.channelId,
             playlist: e.playlistId,
             enablePictureInPicture: _enablePip,
+            onStoryBlockEmpty: (error) {
+              FWExampleLoggerUtil.log(
+                  "onStoryBlockEmpty error ${error?.displayString()}");
+            },
           ),
         ),
         const SizedBox(

diff --git a/FireworkFlutterSDKSample/lib/screens/more/more_screen.dart b/FireworkFlutterSDKSample/lib/screens/more/more_screen.dart
@@ -7,7 +7,7 @@ import 'package:fw_flutter_sdk_example/utils/host_app_service.dart';
 import '../../generated/l10n.dart';
 import '../../widgets/fw_app_bar.dart';
 
-const fwNativeVersionOfAndroid = '6.9.2';
+const fwNativeVersionOfAndroid = '6.9.3';
 
 class MoreScreen extends StatefulWidget {
   const MoreScreen({

diff --git a/FireworkFlutterSDKSample/lib/utils/host_app_service.dart b/FireworkFlutterSDKSample/lib/utils/host_app_service.dart
@@ -32,7 +32,7 @@ class HostAppService {
       return null;
     }
 
-    await closePlayerOrStartFloatingPlayer();
+    await startFloatingPlayer();
 
     globalNavigatorKey.currentState?.pushNamed('/link_content', arguments: {
       "url": event.url,
@@ -134,7 +134,7 @@ class HostAppService {
     FWExampleLoggerUtil.log(
         "onCustomClickCartIcon feedId: ${event?.video.feedId}");
 
-    await closePlayerOrStartFloatingPlayer();
+    await startFloatingPlayer();
     final showCart = await shouldShowCart();
     if (showCart) {
       globalNavigatorKey.currentState?.pushNamed('/cart');
@@ -201,14 +201,14 @@ class HostAppService {
 
   Future<void> onCustomClickLinkButton(
       CustomClickLinkButtonEvent? event) async {
-    await closePlayerOrStartFloatingPlayer();
+    await startFloatingPlayer();
     globalNavigatorKey.currentState?.pushNamed('/link_content', arguments: {
       "url": event?.url ?? '',
     });
   }
 
   Future<void> onCustomTapProductCard(CustomTapProductCardEvent? event) async {
-    await closePlayerOrStartFloatingPlayer();
+    await startFloatingPlayer();
     FWExampleLoggerUtil.log(
       "onCustomTapProductCard event?.url ${event?.url}",
     );
@@ -220,7 +220,7 @@ class HostAppService {
   void onCustomCTAClick(CustomCTAClickEvent? event) {
     FWExampleLoggerUtil.log("onCustomCTAClick feedId ${event?.video.feedId}");
 
-    closePlayerOrStartFloatingPlayer().then((_) {
+    startFloatingPlayer().then((_) {
       if (enablePausePlayer) {
         event?.playerHandler?.pause();
       }
@@ -230,12 +230,13 @@ class HostAppService {
     });
   }
 
-  Future<void> closePlayerOrStartFloatingPlayer() async {
+  Future<void> startFloatingPlayer() async {
     final result =
         await FireworkSDK.getInstance().navigator.startFloatingPlayer();
-    if (!result) {
-      await FireworkSDK.getInstance().navigator.popNativeContainer();
-    }
+    FWExampleLoggerUtil.log("startFloatingPlayer result: $result");
+    // if (!result) {
+    //   await FireworkSDK.getInstance().navigator.popNativeContainer();
+    // }
   }
 
   Future<void> removeAllCartItems() async {

diff --git a/FireworkFlutterSDKSample/pubspec.lock b/FireworkFlutterSDKSample/pubspec.lock
@@ -308,10 +308,10 @@ packages:
     dependency: "direct main"
     description:
       name: fw_flutter_sdk
-      sha256: "59d822b46bdc4c2e6a2a3f6a842da942fa50322de2c2b5746f82fb1c6116da0e"
+      sha256: "9c444b4efc92e4b8171f52481fe8633fefea15d2cff619dc02abc2af19cc3baf"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.2"
+    version: "2.6.3"
   glob:
     dependency: transitive
     description:

diff --git a/FireworkFlutterSDKSample/pubspec.yaml b/FireworkFlutterSDKSample/pubspec.yaml
@@ -19,7 +19,7 @@ dependencies:
     sdk: flutter
 
 
-  fw_flutter_sdk: 2.6.2
+  fw_flutter_sdk: 2.6.3
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.5

diff --git a/docs/__404error.html b/docs/__404error.html
@@ -93,7 +93,7 @@ <h5><span class="package-name">fw_flutter_sdk</span> <span class="package-kind">
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdBadgeConfiguration-class.html b/docs/fw_flutter_sdk/AdBadgeConfiguration-class.html
@@ -258,7 +258,7 @@ <h5>fw_flutter_sdk library</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdBadgeConfiguration/AdBadgeConfiguration.html b/docs/fw_flutter_sdk/AdBadgeConfiguration/AdBadgeConfiguration.html
@@ -114,7 +114,7 @@ <h5>AdBadgeConfiguration class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdBadgeConfiguration/androidFontInfo.html b/docs/fw_flutter_sdk/AdBadgeConfiguration/androidFontInfo.html
@@ -111,7 +111,7 @@ <h5>AdBadgeConfiguration class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdBadgeConfiguration/backgroundColor.html b/docs/fw_flutter_sdk/AdBadgeConfiguration/backgroundColor.html
@@ -110,7 +110,7 @@ <h5>AdBadgeConfiguration class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdBadgeConfiguration/badgeTextType.html b/docs/fw_flutter_sdk/AdBadgeConfiguration/badgeTextType.html
@@ -110,7 +110,7 @@ <h5>AdBadgeConfiguration class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdBadgeConfiguration/deepCopy.html b/docs/fw_flutter_sdk/AdBadgeConfiguration/deepCopy.html
@@ -114,7 +114,7 @@ <h5>AdBadgeConfiguration class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdBadgeConfiguration/textColor.html b/docs/fw_flutter_sdk/AdBadgeConfiguration/textColor.html
@@ -110,7 +110,7 @@ <h5>AdBadgeConfiguration class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdBadgeTextType.html b/docs/fw_flutter_sdk/AdBadgeTextType.html
@@ -284,7 +284,7 @@ <h5>fw_flutter_sdk library</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdBadgeTextType/AdBadgeTextType.html b/docs/fw_flutter_sdk/AdBadgeTextType/AdBadgeTextType.html
@@ -101,7 +101,7 @@ <h5>AdBadgeTextType enum</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdBadgeTextType/values-constant.html b/docs/fw_flutter_sdk/AdBadgeTextType/values-constant.html
@@ -105,7 +105,7 @@ <h5>AdBadgeTextType enum</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdConfiguration-class.html b/docs/fw_flutter_sdk/AdConfiguration-class.html
@@ -247,7 +247,7 @@ <h5>fw_flutter_sdk library</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdConfiguration/AdConfiguration.html b/docs/fw_flutter_sdk/AdConfiguration/AdConfiguration.html
@@ -112,7 +112,7 @@ <h5>AdConfiguration class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdConfiguration/adsFetchTimeout.html b/docs/fw_flutter_sdk/AdConfiguration/adsFetchTimeout.html
@@ -111,7 +111,7 @@ <h5>AdConfiguration class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdConfiguration/deepCopy.html b/docs/fw_flutter_sdk/AdConfiguration/deepCopy.html
@@ -113,7 +113,7 @@ <h5>AdConfiguration class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdConfiguration/requiresAds.html b/docs/fw_flutter_sdk/AdConfiguration/requiresAds.html
@@ -112,7 +112,7 @@ <h5>AdConfiguration class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AdConfiguration/vastAttributes.html b/docs/fw_flutter_sdk/AdConfiguration/vastAttributes.html
@@ -109,7 +109,7 @@ <h5>AdConfiguration class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AndroidFontInfo-class.html b/docs/fw_flutter_sdk/AndroidFontInfo-class.html
@@ -232,7 +232,7 @@ <h5>fw_flutter_sdk library</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AndroidFontInfo/AndroidFontInfo.html b/docs/fw_flutter_sdk/AndroidFontInfo/AndroidFontInfo.html
@@ -110,7 +110,7 @@ <h5>AndroidFontInfo class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AndroidFontInfo/deepCopy.html b/docs/fw_flutter_sdk/AndroidFontInfo/deepCopy.html
@@ -112,7 +112,7 @@ <h5>AndroidFontInfo class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AndroidFontInfo/hashCode.html b/docs/fw_flutter_sdk/AndroidFontInfo/hashCode.html
@@ -147,7 +147,7 @@ <h5>AndroidFontInfo class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AndroidFontInfo/isCustom.html b/docs/fw_flutter_sdk/AndroidFontInfo/isCustom.html
@@ -109,7 +109,7 @@ <h5>AndroidFontInfo class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AndroidFontInfo/operator_equals.html b/docs/fw_flutter_sdk/AndroidFontInfo/operator_equals.html
@@ -155,7 +155,7 @@ <h5>AndroidFontInfo class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/AndroidFontInfo/typefaceName.html b/docs/fw_flutter_sdk/AndroidFontInfo/typefaceName.html
@@ -110,7 +110,7 @@ <h5>AndroidFontInfo class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/ButtonInfo-class.html b/docs/fw_flutter_sdk/ButtonInfo-class.html
@@ -245,7 +245,7 @@ <h5>fw_flutter_sdk library</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/ButtonInfo/ButtonInfo.html b/docs/fw_flutter_sdk/ButtonInfo/ButtonInfo.html
@@ -112,7 +112,7 @@ <h5>ButtonInfo class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/ButtonInfo/deepCopy.html b/docs/fw_flutter_sdk/ButtonInfo/deepCopy.html
@@ -113,7 +113,7 @@ <h5>ButtonInfo class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
 
 

diff --git a/docs/fw_flutter_sdk/ButtonInfo/hashCode.html b/docs/fw_flutter_sdk/ButtonInfo/hashCode.html
@@ -148,7 +148,7 @@ <h5>ButtonInfo class</h5>
 <footer>
   <span class="no-break">
     fw_flutter_sdk
-      2.6.2
+      2.6.3
   </span>
-Original file line number
+Diff line change
@@ Expand Up @@
     <footer>
       <span class="no-break">
         fw_flutter_sdk
-.6.2
+.6.3
       </span>
@@ Expand Down @@