From 767ef0bddb22deb7303c082c4865fa7b0d9fec15 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Tue, 10 Nov 2020 13:26:53 +0800 Subject: [PATCH] 1.3.6+196 --- android/app/build.gradle | 2 +- android/tmpmob/ShareSDK/assets/ShareSDK.xml | 2 +- lib/constants/api.dart | 2 +- lib/pages/home/home_page.dart | 2 +- lib/pages/live/live_stream/live_page.dart | 35 +++++++++++-------- .../live_stream/live_pick_goods_page.dart | 6 ++-- lib/third_party/wechat/wechat_utils.dart | 2 +- pubspec.yaml | 2 +- 8 files changed, 29 insertions(+), 24 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 474630c..61e6f0e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -38,7 +38,7 @@ MobSDK { SinaWeibo { appKey "3484799074" appSecret "0cc08d31b4d63dc81fbb7a2559999fb3" - callbackUri "https://www.reecook.cn" + callbackUri "https://reecook.cn" } QZone { appId "101876843" diff --git a/android/tmpmob/ShareSDK/assets/ShareSDK.xml b/android/tmpmob/ShareSDK/assets/ShareSDK.xml index 68e00aa..530290e 100644 --- a/android/tmpmob/ShareSDK/assets/ShareSDK.xml +++ b/android/tmpmob/ShareSDK/assets/ShareSDK.xml @@ -1,6 +1,6 @@ - + diff --git a/lib/constants/api.dart b/lib/constants/api.dart index 585f89a..a63a927 100644 --- a/lib/constants/api.dart +++ b/lib/constants/api.dart @@ -297,7 +297,7 @@ class AttentionApi { } class WebApi { - static const String recookHttp = "https://www.reecook.cn/"; + static const String recookHttp = "https://reecook.cn/"; // static const String inviteRegist = "${recookHttp}download.html?code="; static const String goodsDetail = "https://h5.reecook.cn/#/goods/detail/"; static const String inviteRegist = diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 1ed611d..ff01804 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -1356,7 +1356,7 @@ class _HomePageState extends BaseStoreState _mobShareInit() { ShareSDKRegister register = ShareSDKRegister(); register.setupSinaWeibo("3484799074", "0cc08d31b4d63dc81fbb7a2559999fb3", - "https://www.reecook.cn"); + "https://reecook.cn"); register.setupQQ("101876843", "6f367bfad98978e22c2e11897dd74f00"); SharesdkPlugin.regist(register); } diff --git a/lib/pages/live/live_stream/live_page.dart b/lib/pages/live/live_stream/live_page.dart index 1cb124a..f34aecc 100644 --- a/lib/pages/live/live_stream/live_page.dart +++ b/lib/pages/live/live_stream/live_page.dart @@ -519,21 +519,26 @@ class _LivePageState extends State with WidgetsBindingObserver { crossAxisAlignment: CrossAxisAlignment.start, children: [ LiveBuyingWidget(key: _globalBuyingWidgetKey), - Container( - height: 300, - child: ListView.builder( - reverse: true, - controller: _scrollController, - physics: AlwaysScrollableScrollPhysics( - parent: BouncingScrollPhysics()), - itemBuilder: (context, index) { - return LiveChatBox( - sender: chatObjects[index].name, - note: chatObjects[index].message, - userEnter: chatObjects[index].enterUser, - ); - }, - itemCount: chatObjects.length, + GestureDetector( + onTap: () { + _focusNode.unfocus(); + }, + child: Container( + height: 300, + child: ListView.builder( + reverse: true, + controller: _scrollController, + physics: AlwaysScrollableScrollPhysics( + parent: BouncingScrollPhysics()), + itemBuilder: (context, index) { + return LiveChatBox( + sender: chatObjects[index].name, + note: chatObjects[index].message, + userEnter: chatObjects[index].enterUser, + ); + }, + itemCount: chatObjects.length, + ), ), ), Container( diff --git a/lib/pages/live/live_stream/live_pick_goods_page.dart b/lib/pages/live/live_stream/live_pick_goods_page.dart index aab6abf..c6657f2 100644 --- a/lib/pages/live/live_stream/live_pick_goods_page.dart +++ b/lib/pages/live/live_stream/live_pick_goods_page.dart @@ -118,8 +118,8 @@ class _LivePickGoodsPageState extends State controller: _tabController, isScrollable: true, tabs: [ - Tab(text: '直播车'), Tab(text: '热门商品'), + Tab(text: '直播车'), Tab(text: '历史直播'), Tab(text: '全部商品'), ], @@ -141,12 +141,12 @@ class _LivePickGoodsPageState extends State child: TabBarView( controller: _tabController, children: [ - GoodsCartView( + HotGoodsView( onPick: () { setState(() {}); }, ), - HotGoodsView( + GoodsCartView( onPick: () { setState(() {}); }, diff --git a/lib/third_party/wechat/wechat_utils.dart b/lib/third_party/wechat/wechat_utils.dart index e6fdb2d..f2698e6 100644 --- a/lib/third_party/wechat/wechat_utils.dart +++ b/lib/third_party/wechat/wechat_utils.dart @@ -112,7 +112,7 @@ class WeChatUtils { var userId = UserManager.instance.user.info.id; var model = fluwx.WeChatShareMiniProgramModel( path: "pages/goods/detail?goods_id=$goodsId&code=$invitationNo&userId=$userId", - webPageUrl: "www.reecook.cn", + webPageUrl: "reecook.cn", miniProgramType: _wxType, userName: AppConfig.WX_APP_MINIPRO_USERNAME, // scene: fluWX.WeChatScene.SESSION, diff --git a/pubspec.yaml b/pubspec.yaml index 5485019..3203647 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: recook description: Recook Market App. publish_to: "none" -version: 1.3.5+195 +version: 1.3.6+196 # sdk min version to 2.2.2 # to support ... feature