From 9648e8dba92afc24740b08723877dbdf505195c8 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Sat, 9 Mar 2024 13:51:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B9=B3=E5=8F=B0=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=8E=89=E4=B8=8A=E6=9E=B6=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/login/login/starLock_login_page.dart | 34 +++++++----- star_lock/lib/main.dart | 9 ++- .../main/lockMian/lockMain/lockMain_page.dart | 14 +++-- .../mine/mineSet/mineSet/mineSet_page.dart | 55 +++++++++++-------- 4 files changed, 65 insertions(+), 47 deletions(-) diff --git a/star_lock/lib/login/login/starLock_login_page.dart b/star_lock/lib/login/login/starLock_login_page.dart index 6e34d4e5..efc685b6 100644 --- a/star_lock/lib/login/login/starLock_login_page.dart +++ b/star_lock/lib/login/login/starLock_login_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/flavors.dart'; import '../../appRouters.dart'; import '../../app_settings/app_colors.dart'; @@ -199,21 +200,24 @@ class _StarLockLoginPageState extends State { width: 10.sp, )), //上架审核注释 提交Google暂时屏蔽 - // GestureDetector( - // child: SizedBox( - // // width: 150.w, - // height: 50.h, - // // color: Colors.red, - // child: Center( - // child: Text('演示模式', - // style: TextStyle( - // fontSize: 22.sp, color: AppColors.mainColor)), - // ), - // ), - // onTap: () { - // Get.toNamed(Routers.demoModeLockDetailPage); - // }, - // ) + F.appFlavor == Flavor.sky + ? Container() + : GestureDetector( + child: SizedBox( + // width: 150.w, + height: 50.h, + // color: Colors.red, + child: Center( + child: Text('演示模式', + style: TextStyle( + fontSize: 22.sp, + color: AppColors.mainColor)), + ), + ), + onTap: () { + Get.toNamed(Routers.demoModeLockDetailPage); + }, + ) ], ), ], diff --git a/star_lock/lib/main.dart b/star_lock/lib/main.dart index dfdc7067..652ef00a 100644 --- a/star_lock/lib/main.dart +++ b/star_lock/lib/main.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:star_lock/flavors.dart'; import 'package:star_lock/translations/trans_lib.dart'; import 'app.dart'; import 'package:star_lock/tools/device_info_service.dart'; @@ -36,7 +37,11 @@ Future _initTranslation() async => TranslationLoader.loadTranslation( Future _setCommonServices() async { await Get.putAsync(() => StoreService().init()); await Get.putAsync(() => PlatformInfoService().init()); - //上架审核注释 - // await Get.putAsync(() => DeviceInfoService().init()); + if (F.appFlavor == Flavor.sky) { + //上架审核注释 获取设备信息 + // await Get.putAsync(() => DeviceInfoService().init()); + } else { + await Get.putAsync(() => DeviceInfoService().init()); + } // Get.log(PlatformInfoService.to.info.version); } diff --git a/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart b/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart index 3f8585a9..4a580c15 100644 --- a/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart +++ b/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart @@ -199,12 +199,14 @@ class _StarLockMainPageState extends State with BaseWidget { height: 160.h, ), //上架审核注释 提交Google暂时屏蔽 - // SubmitBtn( - // btnName: '演示模式', - // onClick: () { - // Get.toNamed(Routers.demoModeLockDetailPage); - // }, - // ) + F.appFlavor == Flavor.sky + ? Container() + : SubmitBtn( + btnName: '演示模式', + onClick: () { + Get.toNamed(Routers.demoModeLockDetailPage); + }, + ) ], ), ], diff --git a/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart b/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart index acd2d454..2c429680 100644 --- a/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/flavors.dart'; import 'package:star_lock/mine/mineSet/mineSet/mineSet_logic.dart'; import '../../../appRouters.dart'; import '../../../app_settings/app_colors.dart'; @@ -185,30 +186,36 @@ class _MineSetPageState extends State { height: 10.h, ), //上架审核注释 - // CommonItem( - // leftTitel: "Amazon Alexa", - // rightTitle: "", - // isHaveLine: true, - // isHaveDirection: true, - // action: () { - // logic.showToast("功能暂未开放"); - // }), - // CommonItem( - // leftTitel: "Google Home", - // rightTitle: "", - // isHaveLine: true, - // isHaveDirection: true, - // action: () { - // logic.showToast("功能暂未开放"); - // }), - // CommonItem( - // leftTitel: TranslationLoader.lanKeys!.xiaomiIOTPlatform!.tr, - // rightTitle: "", - // isHaveLine: false, - // isHaveDirection: true, - // action: () { - // logic.showToast("功能暂未开放"); - // }), + F.appFlavor == Flavor.sky + ? Container() + : CommonItem( + leftTitel: "Amazon Alexa", + rightTitle: "", + isHaveLine: true, + isHaveDirection: true, + action: () { + logic.showToast("功能暂未开放"); + }), + F.appFlavor == Flavor.sky + ? Container() + : CommonItem( + leftTitel: "Google Home", + rightTitle: "", + isHaveLine: true, + isHaveDirection: true, + action: () { + logic.showToast("功能暂未开放"); + }), + F.appFlavor == Flavor.sky + ? Container() + : CommonItem( + leftTitel: TranslationLoader.lanKeys!.xiaomiIOTPlatform!.tr, + rightTitle: "", + isHaveLine: false, + isHaveDirection: true, + action: () { + logic.showToast("功能暂未开放"); + }), // CommonItem(leftTitel:TranslationLoader.lanKeys!.valueAddedServices!.tr, rightTitle:"", isHaveDirection: true, action: (){ // // }),