diff --git a/star_lock/images/main/icon_addIris_step1.png b/star_lock/images/main/icon_addIris_step1.png new file mode 100644 index 00000000..408ac263 Binary files /dev/null and b/star_lock/images/main/icon_addIris_step1.png differ diff --git a/star_lock/images/main/icon_addPalm_step1.png b/star_lock/images/main/icon_addPalm_step1.png new file mode 100644 index 00000000..ca952068 Binary files /dev/null and b/star_lock/images/main/icon_addPalm_step1.png differ diff --git a/star_lock/images/main/icon_iris.png b/star_lock/images/main/icon_iris.png index 84a7c706..32272c8a 100644 Binary files a/star_lock/images/main/icon_iris.png and b/star_lock/images/main/icon_iris.png differ diff --git a/star_lock/images/main/icon_palm.png b/star_lock/images/main/icon_palm.png index 100b1a9e..704186c3 100644 Binary files a/star_lock/images/main/icon_palm.png and b/star_lock/images/main/icon_palm.png differ diff --git a/star_lock/lib/main/lockDetail/iris/addIris/addIris_page.dart b/star_lock/lib/main/lockDetail/iris/addIris/addIris_page.dart index 187566b3..21709faa 100644 --- a/star_lock/lib/main/lockDetail/iris/addIris/addIris_page.dart +++ b/star_lock/lib/main/lockDetail/iris/addIris/addIris_page.dart @@ -34,8 +34,8 @@ class _AddIrisPageState extends State { ), Obx(() => Image.asset( state.isClickAddFace.value == false - ? 'images/main/icon_addFace_step1.png' - : 'images/main/icon_addFace_step2.png', + ? 'images/main/icon_addIris_step1.png' + : 'images/main/icon_addIris_step1.png', width: 100.w, height: 457.h, fit: BoxFit.fitHeight, diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 6b6fe11b..0dece880 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -33,7 +33,8 @@ class LockDetailPage extends StatefulWidget { State createState() => _LockDetailPageState(); } -class _LockDetailPageState extends State with TickerProviderStateMixin, RouteAware { +class _LockDetailPageState extends State + with TickerProviderStateMixin, RouteAware { // with RouteAware final logic = Get.put(LockDetailLogic()); final state = Get.find().state; @@ -121,7 +122,8 @@ class _LockDetailPageState extends State with TickerProviderStat Storage.setStringList(saveBluePrivateKey, savePrivateKeyList); // signKey - List signKeyData = state.keyInfos.value.bluetooth!.signKey!.cast(); + List signKeyData = + state.keyInfos.value.bluetooth!.signKey!.cast(); var saveSignKeyList = changeIntListToStringList(signKeyData); Storage.setStringList(saveBlueSignKey, saveSignKeyList); @@ -676,27 +678,27 @@ class _LockDetailPageState extends State with TickerProviderStat ); } - if (state.keyInfos.value.lockFeature!.isSupportIris == 1) { - showWidgetArr.add( - bottomItem('images/main/icon_iris.png', '虹膜'.tr, - state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () { - Get.toNamed(Routers.irisListPage, arguments: { - "lockId": state.keyInfos.value.lockId, - }); - }), - ); - } + // if (state.keyInfos.value.lockFeature!.isSupportIris == 1) { + showWidgetArr.add( + bottomItem('images/main/icon_iris.png', '虹膜'.tr, + state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () { + Get.toNamed(Routers.irisListPage, arguments: { + "lockId": state.keyInfos.value.lockId, + }); + }), + ); + // } - if (state.keyInfos.value.lockFeature!.palmVein == 1) { - showWidgetArr.add( - bottomItem('images/main/icon_palm.png', '手掌'.tr, - state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () { - Get.toNamed(Routers.palmListPage, arguments: { - "lockId": state.keyInfos.value.lockId, - }); - }), - ); - } + // if (state.keyInfos.value.lockFeature!.palmVein == 1) { + showWidgetArr.add( + bottomItem('images/main/icon_palm.png', '手掌'.tr, + state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () { + Get.toNamed(Routers.palmListPage, arguments: { + "lockId": state.keyInfos.value.lockId, + }); + }), + ); + // } //可视对讲门锁新增->监控 if (state.keyInfos.value.lockFeature!.videoIntercom == 1) { @@ -805,15 +807,17 @@ class _LockDetailPageState extends State with TickerProviderStat SizedBox( width: width, height: height, - child: Image.asset(iconUrl, - width: width, - height: height, - color: openDoorBtnisUneable - ? (bottomBtnisEable - ? AppColors.mainColor - : AppColors.lockDetailBottomBtnUneable) - : AppColors.lockDetailBottomBtnUneable, - fit: BoxFit.fitWidth), + child: Image.asset( + iconUrl, + width: width, + height: height, + color: openDoorBtnisUneable + ? (bottomBtnisEable + ? AppColors.mainColor + : AppColors.lockDetailBottomBtnUneable) + : AppColors.lockDetailBottomBtnUneable, + // fit: BoxFit.fitWidth + ), ), SizedBox(height: 10.w), Expanded( diff --git a/star_lock/lib/main/lockDetail/palm/addPalm/addPalm_page.dart b/star_lock/lib/main/lockDetail/palm/addPalm/addPalm_page.dart index c89687c6..c29345da 100644 --- a/star_lock/lib/main/lockDetail/palm/addPalm/addPalm_page.dart +++ b/star_lock/lib/main/lockDetail/palm/addPalm/addPalm_page.dart @@ -34,8 +34,8 @@ class _AddPalmPageState extends State { ), Obx(() => Image.asset( state.isClickAddFace.value == false - ? 'images/main/icon_addFace_step1.png' - : 'images/main/icon_addFace_step2.png', + ? 'images/main/icon_addPalm_step1.png' + : 'images/main/icon_addPalm_step1.png', width: 100.w, height: 457.h, fit: BoxFit.fitHeight, @@ -50,7 +50,7 @@ class _AddPalmPageState extends State { children: [ Expanded( child: Text( - "请单人正对门锁,距离一个成年人手臂长度\n(约0.6米)。\n保持脸部无遮挡,露出五官。", + "请自然张开手掌,掌心正对摄像头,距离约一个成年\n人手掌宽度(约10厘米)。", textAlign: TextAlign.left, maxLines: null, style: diff --git a/star_lock/lib/main/lockDetail/palm/palmList/palmList_logic.dart b/star_lock/lib/main/lockDetail/palm/palmList/palmList_logic.dart index c5a1b957..7188ac16 100644 --- a/star_lock/lib/main/lockDetail/palm/palmList/palmList_logic.dart +++ b/star_lock/lib/main/lockDetail/palm/palmList/palmList_logic.dart @@ -438,7 +438,7 @@ class PalmListLogic extends BaseGetXController { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - _replySubscription.cancel(); + // _replySubscription.cancel(); _teamEvent.cancel(); } }