From 4994bda26ff262b6335d181a5983a875c1817854 Mon Sep 17 00:00:00 2001 From: GeJiaXiang <353358601@qq.com> Date: Thu, 28 Mar 2024 09:51:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC1.0.21+2024?= =?UTF-8?q?032801?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star_lock/lib/flavors.dart | 2 ++ star_lock/lib/login/login/starLock_login_page.dart | 3 +-- star_lock/lib/main.dart | 2 +- star_lock/lib/main/lockMian/lockMain/lockMain_page.dart | 3 +-- star_lock/lib/{main_sky.dart => main_sky_full.dart} | 0 star_lock/lib/main_sky_lite.dart | 9 +++++++++ star_lock/lib/mine/mine/starLockMine_page.dart | 4 ++-- star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart | 6 +++--- star_lock/pubspec.yaml | 3 ++- 9 files changed, 21 insertions(+), 11 deletions(-) rename star_lock/lib/{main_sky.dart => main_sky_full.dart} (100%) create mode 100644 star_lock/lib/main_sky_lite.dart diff --git a/star_lock/lib/flavors.dart b/star_lock/lib/flavors.dart index 39d9a0f2..7eda6066 100644 --- a/star_lock/lib/flavors.dart +++ b/star_lock/lib/flavors.dart @@ -16,6 +16,8 @@ class StarLockAMapKey { class F { static Flavor? appFlavor; + // 是否为精简模式(在一些应用商店场景下，需要精简掉一些功能) + static bool isLite = false; static String get name => appFlavor?.name ?? ''; diff --git a/star_lock/lib/login/login/starLock_login_page.dart b/star_lock/lib/login/login/starLock_login_page.dart index cef26e15..86b8b2bb 100644 --- a/star_lock/lib/login/login/starLock_login_page.dart +++ b/star_lock/lib/login/login/starLock_login_page.dart @@ -201,8 +201,7 @@ class _StarLockLoginPageState extends State { child: SizedBox( width: 10.sp, )), - //上架审核注释 提交Google暂时屏蔽 - F.appFlavor == Flavor.sky + F.isLite ? Container() : GestureDetector( child: SizedBox( diff --git a/star_lock/lib/main.dart b/star_lock/lib/main.dart index 44bc6a36..a32db23e 100644 --- a/star_lock/lib/main.dart +++ b/star_lock/lib/main.dart @@ -40,7 +40,7 @@ Future _initTranslation() async => TranslationLoader.loadTranslation( Future _setCommonServices() async { await Get.putAsync(() => StoreService().init()); await Get.putAsync(() => PlatformInfoService().init()); - if (F.appFlavor == Flavor.sky) { + if (F.isLite) { //上架审核注释 获取设备信息 // await Get.putAsync(() => DeviceInfoService().init()); } else { diff --git a/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart b/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart index 2094997e..f75b807f 100644 --- a/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart +++ b/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart @@ -215,8 +215,7 @@ class _StarLockMainPageState extends State with BaseWidget { SizedBox( height: 160.h, ), - //上架审核注释 提交Google暂时屏蔽 - F.appFlavor == Flavor.sky + F.isLite ? Container() : SubmitBtn( btnName: '演示模式', diff --git a/star_lock/lib/main_sky.dart b/star_lock/lib/main_sky_full.dart similarity index 100% rename from star_lock/lib/main_sky.dart rename to star_lock/lib/main_sky_full.dart diff --git a/star_lock/lib/main_sky_lite.dart b/star_lock/lib/main_sky_lite.dart new file mode 100644 index 00000000..3c0a2b0b --- /dev/null +++ b/star_lock/lib/main_sky_lite.dart @@ -0,0 +1,9 @@ +import 'flavors.dart'; + +import 'main.dart' as runner; + +Future main() async { + F.appFlavor = Flavor.sky; + F.isLite = true; + await runner.main(); +} diff --git a/star_lock/lib/mine/mine/starLockMine_page.dart b/star_lock/lib/mine/mine/starLockMine_page.dart index 020c8953..d8d14814 100644 --- a/star_lock/lib/mine/mine/starLockMine_page.dart +++ b/star_lock/lib/mine/mine/starLockMine_page.dart @@ -146,14 +146,14 @@ class StarLockMinePageState extends State with BaseWidget { Get.toNamed(Routers.mineSetPage); }), //上架审核 - F.appFlavor == Flavor.sky + F.isLite ? Container() : mineItem('images/mine/icon_mine_main_vip.png', TranslationLoader.lanKeys!.valueAddedServices!.tr, () { Get.back(); Get.toNamed(Routers.valueAddedServicesPage); }), - F.appFlavor == Flavor.sky + F.isLite ? Container() : mineItem( 'images/mine/icon_mine_main_shoppingcart.png', "配件商城".tr, () { diff --git a/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart b/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart index 09d702d0..899022bb 100644 --- a/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -204,7 +204,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { height: 10.h, ), //上架审核注释 - F.appFlavor == Flavor.sky + F.isLite ? Container() : CommonItem( leftTitel: "Amazon Alexa", @@ -214,7 +214,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { action: () { logic.showToast("功能暂未开放"); }), - F.appFlavor == Flavor.sky + F.isLite ? Container() : CommonItem( leftTitel: "Google Home", @@ -224,7 +224,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { action: () { logic.showToast("功能暂未开放"); }), - F.appFlavor == Flavor.sky + F.isLite ? Container() : CommonItem( leftTitel: TranslationLoader.lanKeys!.xiaomiIOTPlatform!.tr, diff --git a/star_lock/pubspec.yaml b/star_lock/pubspec.yaml index 6c027ca9..f7d0f79a 100644 --- a/star_lock/pubspec.yaml +++ b/star_lock/pubspec.yaml @@ -22,7 +22,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # 1.0.18+2024032002：修复注册页布局错乱；修复第二次才可以删除锁的问题；修改申请权限字符串 # 1.0.18+20240321(2024032101)：打包给欧阳测试 # 1.0.20+2024032102：修复Apple Store App Tracking Transparency权限问题 -version: 1.0.20+2024032102 +# 1.0.21+2024032801：同为斯凯环境也区分删减版和完整版，通过main_sky_lite.dart/main_sky_full.dart切换 +version: 1.0.21+2024032801 environment: sdk: '>=2.12.0 <3.0.0'