diff --git a/star_lock/ios/Runner.xcodeproj/xcshareddata/xcschemes/pre.xcscheme b/star_lock/ios/Runner.xcodeproj/xcshareddata/xcschemes/pre.xcscheme index 77531151..300f95db 100644 --- a/star_lock/ios/Runner.xcodeproj/xcshareddata/xcschemes/pre.xcscheme +++ b/star_lock/ios/Runner.xcodeproj/xcshareddata/xcschemes/pre.xcscheme @@ -7,7 +7,7 @@ buildImplicitDependencies = "YES"> @@ -24,7 +24,7 @@ + buildConfiguration = "Release-pre"> { final logic = Get.put(SendElectronicKeyLogic()); final state = Get.find().state; - bool isDemoMode = false; + bool isDemoMode = true; @override initState() { @@ -49,13 +49,12 @@ class _SendElectronicKeyPageState extends State { state.type.value = widget.type; return SingleChildScrollView( - child: Obx(() => indexChangeWidget()), + child: isDemoMode ? indexChangeWidget() : Obx(() => indexChangeWidget()), ); } Widget indexChangeWidget() { - if (state.isSendSuccess.value == true && - state.sendSucceedType.value.toString() == widget.type) { + if (state.isSendSuccess.value == true && state.sendSucceedType.value.toString() == widget.type) { return sendElectronicKeySucceed(); } else { switch (int.parse(widget.type)) { @@ -518,8 +517,7 @@ class _SendElectronicKeyPageState extends State { // 远程开锁 Widget remoteUnlockingWidget() { return Visibility( - visible: - state.keyInfo.value.lockSetting!.remoteUnlock == 1 ? true : false, + visible: isDemoMode ? false: (state.keyInfo.value.lockSetting!.remoteUnlock == 1 ? true : false), child: Column( children: [ CommonItem( diff --git a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart index 47965f72..238890ae 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart @@ -45,6 +45,8 @@ class SendElectronicKeyState { SendElectronicKeyState() { Map map = Get.arguments; - keyInfo.value = map["keyInfo"]; + if ((map["keyInfo"] != null)) { + keyInfo.value = map["keyInfo"]; + } } } diff --git a/star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_state.dart b/star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_state.dart index af8012c8..8fdf8d73 100644 --- a/star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_state.dart +++ b/star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_state.dart @@ -25,18 +25,20 @@ class FingerprintDetailState{ final isStressFingerprint = false.obs; FingerprintDetailState() { Map map = Get.arguments; - fingerprintItemData.value = map["fingerprintItemData"]; - keyId.value = fingerprintItemData.value.fingerprintId!; - typeNumber.value = fingerprintItemData.value.fingerprintNumber!; - typeName.value = fingerprintItemData.value.fingerprintName!; - changeNameController.text = typeName.value; - effectiveDateTime.value = fingerprintItemData.value.startDate!; - failureDateTime.value = fingerprintItemData.value.endDate!; - keyType.value = fingerprintItemData.value.fingerprintType!; - adder.value = fingerprintItemData.value.senderUsername!; - addTime.value = fingerprintItemData.value.createDate!; - isStressFingerprint.value = fingerprintItemData.value.isCoerced! == 2 ? true : false; - weekDay.value = fingerprintItemData.value.weekDay!; - + if ((map["keyInfo"] != null)) { + fingerprintItemData.value = map["fingerprintItemData"]; + keyId.value = fingerprintItemData.value.fingerprintId!; + typeNumber.value = fingerprintItemData.value.fingerprintNumber!; + typeName.value = fingerprintItemData.value.fingerprintName!; + changeNameController.text = typeName.value; + effectiveDateTime.value = fingerprintItemData.value.startDate!; + failureDateTime.value = fingerprintItemData.value.endDate!; + keyType.value = fingerprintItemData.value.fingerprintType!; + adder.value = fingerprintItemData.value.senderUsername!; + addTime.value = fingerprintItemData.value.createDate!; + isStressFingerprint.value = + fingerprintItemData.value.isCoerced! == 2 ? true : false; + weekDay.value = fingerprintItemData.value.weekDay!; + } } } \ No newline at end of file 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 dc8618c1..b2644969 100644 --- a/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart +++ b/star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart @@ -270,7 +270,7 @@ class _DemoModeLockDetailPageState extends State { TranslationLoader.lanKeys!.fingerprint!.tr, () { // gotoLogin(); - Get.toNamed(Routers.fingerprintDetailPage, + Get.toNamed(Routers.fingerprintListPage, arguments: {"lockId": 1, "fromType": 1}); }), @@ -290,11 +290,11 @@ class _DemoModeLockDetailPageState extends State { //可视对讲门锁新增->人脸 showWidgetArr.add( bottomItem('images/main/icon_face.png', '人脸', () { - gotoLogin(); + // gotoLogin(); - // Navigator.pushNamed(context, Routers.otherTypeKeyListPage, - // arguments: 1); - // Toast.show(msg: "功能暂未开放"); + Get.toNamed(Routers.faceList, arguments: { + "lockId": 1, + }); }), ); diff --git a/star_lock/lib/mine/about/about_page.dart b/star_lock/lib/mine/about/about_page.dart index 3c50d465..9590c423 100644 --- a/star_lock/lib/mine/about/about_page.dart +++ b/star_lock/lib/mine/about/about_page.dart @@ -39,7 +39,7 @@ class _AboutPageState extends State { ), SizedBox(height: 20.h), Text( - "${F.title} 1.0.0.10(preRelease-20240201)", + "${F.title} 1.0.0.11(preRelease-20240301)", style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor), ), SizedBox(height: 20.h), diff --git a/star_lock/pubspec.yaml b/star_lock/pubspec.yaml index 1975a452..89eae071 100644 --- a/star_lock/pubspec.yaml +++ b/star_lock/pubspec.yaml @@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.0+10 +version: 1.0.0+11 environment: sdk: '>=2.12.0 <3.0.0'