From d31a28a42799c92cb57b4501cbdfcc04fd425bdc Mon Sep 17 00:00:00 2001 From: laiiihz Date: Fri, 8 Jan 2021 16:52:53 +0800 Subject: [PATCH] update first enter app logic fix jingtong goods img display issue --- lib/pages/user/items/item_logistic.dart | 2 +- lib/pages/user/order/logistic_detail_page.dart | 2 +- lib/pages/welcome/launch_widget.dart | 12 ++++++------ tool/grind.dart | 4 ++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/pages/user/items/item_logistic.dart b/lib/pages/user/items/item_logistic.dart index 49f41c9..d628c07 100644 --- a/lib/pages/user/items/item_logistic.dart +++ b/lib/pages/user/items/item_logistic.dart @@ -80,7 +80,7 @@ class LogisticItem extends StatelessWidget { crossAxisCount: 4), itemBuilder: (_, index) { return CustomCacheImage( - imageUrl: Api.getResizeImgUrl(model.picUrls[index], 150), + imageUrl: Api.getImgUrl(model.picUrls[index]), fit: BoxFit.cover, ); }) diff --git a/lib/pages/user/order/logistic_detail_page.dart b/lib/pages/user/order/logistic_detail_page.dart index c4c7b82..8ab3a4d 100644 --- a/lib/pages/user/order/logistic_detail_page.dart +++ b/lib/pages/user/order/logistic_detail_page.dart @@ -73,7 +73,7 @@ class _LogisticDetailPageState extends BaseStoreState { width: rSize(84), height: rSize(84), fit: BoxFit.cover, - imageUrl: Api.getResizeImgUrl(_model.picUrls[0], 100), + imageUrl: Api.getImgUrl(_model.picUrls[0]), ), SizedBox( width: 8, diff --git a/lib/pages/welcome/launch_widget.dart b/lib/pages/welcome/launch_widget.dart index 5010cf6..5a30a69 100644 --- a/lib/pages/welcome/launch_widget.dart +++ b/lib/pages/welcome/launch_widget.dart @@ -56,12 +56,12 @@ class _LaunchWidgetState extends BaseStoreState bool secondAgree = (await launchPrivacySecondDialog(context)) ?? false; //第2次不同意 - if (!secondAgree) SystemNavigator.pop(); - // else - // HiveStore.appBox.put('privacy_init', true); - } - // else - // HiveStore.appBox.put('privacy_init', true); + if (!secondAgree) + SystemNavigator.pop(); + else + HiveStore.appBox.put('privacy_init', true); + } else + HiveStore.appBox.put('privacy_init', true); } AppRouter.fadeAndReplaced(globalContext, RouteName.WELCOME_PAGE); }); diff --git a/tool/grind.dart b/tool/grind.dart index 77fa9f1..0ea6f05 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -69,6 +69,10 @@ sign() async { stdout.write(process.stdout); stderr.write(process.stderr); stdout.write('end SIGN 🔑\n'); + Process.run('adb', [ + 'install', + '${Config.downloadPath}/builds/${Config.packageName}_release_signed.apk', + ]); } @DefaultTask()