From aea483ec3fd32608f633a68e1f123ffd7c8de94d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Tue, 17 Oct 2023 16:19:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E5=8A=9F=E8=83=BD=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E6=B7=BB=E5=8A=A0=E9=94=81=E6=94=B9=E6=88=90=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=BC=94=E7=A4=BA=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checkingInList/checkingInList_page.dart | 16 +++++++++++----- .../lockOperatingRecord_page.dart | 4 +++- .../otherTypeAddKey/otherTypeAddKey_page.dart | 3 ++- .../otherTypeKeyList/otherTypeKeyList_page.dart | 4 +++- .../demoModeLockDetail_page.dart | 6 ++++-- .../demoModeLockSet/demoModeLockSet_page.dart | 4 +++- 6 files changed, 26 insertions(+), 11 deletions(-) diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart index 0c41d5d8..b13f5f10 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInList/checkingInList_page.dart @@ -11,6 +11,7 @@ import '../../../../tools/showBottomSheetTool.dart'; import '../../../../tools/showCalendar.dart'; import '../../../../tools/storage.dart'; import '../../../../tools/titleAppBar.dart'; +import '../../../../tools/toast.dart'; import '../../../../translations/trans_lib.dart'; import 'checkingInListDay_entity.dart'; import 'checkingInList_logic.dart'; @@ -44,7 +45,8 @@ class _CheckingInListPageState extends State { "getKeyInfosData": state.getKeyInfosData.value, }); }else{ - Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.seletLockTypePage); + Toast.show(msg: "演示模式"); } }, child: Image.asset('images/main/icon_lockDetail_checkIn_set.png', width: 36.w, height: 36.w,)), @@ -93,7 +95,8 @@ class _CheckingInListPageState extends State { logic.loadDataByType(); }); }else{ - Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.seletLockTypePage); + Toast.show(msg: "演示模式"); } }, child: Container( @@ -129,7 +132,8 @@ class _CheckingInListPageState extends State { logic.loadDataByType(); }); }else{ - Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.seletLockTypePage); + Toast.show(msg: "演示模式"); } }, child: Container( @@ -169,7 +173,8 @@ class _CheckingInListPageState extends State { }); }); }else{ - Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.seletLockTypePage); + Toast.show(msg: "演示模式"); } }, child: Row( @@ -329,7 +334,8 @@ class _CheckingInListPageState extends State { if(isDemoMode == false){ showListType(); }else{ - Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.seletLockTypePage); + Toast.show(msg: "演示模式"); } }, child: Obx(() => Container( diff --git a/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart b/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart index 18501551..7be310e9 100644 --- a/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart +++ b/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart @@ -9,6 +9,7 @@ import '../../../tools/jh_pop_menus.dart'; import '../../../tools/noData.dart'; import '../../../tools/storage.dart'; import '../../../tools/titleAppBar.dart'; +import '../../../tools/toast.dart'; import '../../../translations/trans_lib.dart'; import 'lockOperatingRecord_logic.dart'; @@ -57,7 +58,8 @@ class _LockOperatingRecordPageState extends State { {'text': '导出记录'}, ]); }else{ - Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.seletLockTypePage); + Toast.show(msg: "演示模式"); } }, ), diff --git a/star_lock/lib/main/lockDetail/otherTypeKey/otherTypeAddKey/otherTypeAddKey_page.dart b/star_lock/lib/main/lockDetail/otherTypeKey/otherTypeAddKey/otherTypeAddKey_page.dart index 00f43b7b..7fd5bcf4 100644 --- a/star_lock/lib/main/lockDetail/otherTypeKey/otherTypeAddKey/otherTypeAddKey_page.dart +++ b/star_lock/lib/main/lockDetail/otherTypeKey/otherTypeAddKey/otherTypeAddKey_page.dart @@ -175,7 +175,8 @@ class _OtherTypeAddKeyPageState extends State { logic.addFingerprintsData(); }else{ - Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.seletLockTypePage); + Toast.show(msg: "演示模式"); } }), diff --git a/star_lock/lib/main/lockDetail/otherTypeKey/otherTypeKeyList/otherTypeKeyList_page.dart b/star_lock/lib/main/lockDetail/otherTypeKey/otherTypeKeyList/otherTypeKeyList_page.dart index 91111628..92d72aa2 100644 --- a/star_lock/lib/main/lockDetail/otherTypeKey/otherTypeKeyList/otherTypeKeyList_page.dart +++ b/star_lock/lib/main/lockDetail/otherTypeKey/otherTypeKeyList/otherTypeKeyList_page.dart @@ -9,6 +9,7 @@ import '../../../../tools/noData.dart'; import '../../../../tools/storage.dart'; import '../../../../tools/submitBtn.dart'; import '../../../../tools/titleAppBar.dart'; +import '../../../../tools/toast.dart'; import '../../../../translations/trans_lib.dart'; import 'fingerprintListData_entity.dart'; import 'otherTypeKeyList_logic.dart'; @@ -59,7 +60,8 @@ class _OtherTypeKeyListPageState extends State { break; } }else{ - Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.seletLockTypePage); + Toast.show(msg: "演示模式"); } }, ), diff --git a/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart b/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart index 0e427b16..ffe51330 100644 --- a/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart +++ b/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/tools/toast.dart'; import '../../../../appRouters.dart'; import '../../../../app_settings/app_colors.dart'; @@ -60,7 +61,7 @@ class _DemoModeLockDetailPageState extends State { children: [ Row( children: [ - Expanded(child: Text("提示:当前界面为展示界面,请添加设备后继续使用", style: TextStyle(fontSize: 24.sp, color: AppColors.mainColor))), + Expanded(child: Text("提示:当前界面为展示界面,添加设备后才能继续使用", style: TextStyle(fontSize: 24.sp, color: AppColors.mainColor))), ], ), ], @@ -367,6 +368,7 @@ class _DemoModeLockDetailPageState extends State { } void gotoLogin(){ - Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.seletLockTypePage); + Toast.show(msg: "演示模式"); } } diff --git a/star_lock/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart b/star_lock/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart index a56f120f..90faba47 100644 --- a/star_lock/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart +++ b/star_lock/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart @@ -9,6 +9,7 @@ import '../../../../app_settings/app_colors.dart'; import '../../../../tools/commonItem.dart'; import '../../../../tools/submitBtn.dart'; import '../../../../tools/titleAppBar.dart'; +import '../../../../tools/toast.dart'; import '../../../../translations/trans_lib.dart'; class DemoModeLockSetPage extends StatefulWidget { @@ -347,7 +348,8 @@ class _DemoModeLockSetPageState extends State { } void gotoAddLock(){ - Get.toNamed(Routers.seletLockTypePage); + // Get.toNamed(Routers.seletLockTypePage); + Toast.show(msg: "演示模式"); } }