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/ios/Runner.xcodeproj/project.pbxproj b/star_lock/ios/Runner.xcodeproj/project.pbxproj index 74d65209..8aada0f8 100644 --- a/star_lock/ios/Runner.xcodeproj/project.pbxproj +++ b/star_lock/ios/Runner.xcodeproj/project.pbxproj @@ -116,6 +116,20 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 04BFC44A2BCFE48600688FCA /* RunnerRelease-xhj.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerRelease-xhj.entitlements"; sourceTree = ""; }; + 04BFC44B2BD0B50A00688FCA /* RunnerProfile-xhj.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerProfile-xhj.entitlements"; sourceTree = ""; }; + 04BFC44C2BD0B51500688FCA /* RunnerDebug-xhj.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerDebug-xhj.entitlements"; sourceTree = ""; }; + 04BFC44D2BD0B51D00688FCA /* RunnerRelease-sky.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerRelease-sky.entitlements"; sourceTree = ""; }; + 04BFC44E2BD0B52300688FCA /* RunnerProfile-sky.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerProfile-sky.entitlements"; sourceTree = ""; }; + 04BFC44F2BD0B52C00688FCA /* RunnerDebug-sky.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerDebug-sky.entitlements"; sourceTree = ""; }; + 04BFC4502BD0B53400688FCA /* RunnerRelease-pre.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerRelease-pre.entitlements"; sourceTree = ""; }; + 04BFC4512BD0B53B00688FCA /* RunnerProfile-pre.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerProfile-pre.entitlements"; sourceTree = ""; }; + 04BFC4522BD0B54200688FCA /* RunnerDebug-pre.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerDebug-pre.entitlements"; sourceTree = ""; }; + 04BFC4532BD0B54900688FCA /* RunnerRelease-dev.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerRelease-dev.entitlements"; sourceTree = ""; }; + 04BFC4542BD0B55000688FCA /* RunnerProfile-dev.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerProfile-dev.entitlements"; sourceTree = ""; }; + 04BFC4552BD0B55600688FCA /* RunnerDebug-dev.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerDebug-dev.entitlements"; sourceTree = ""; }; + 04BFC4562BD0B55F00688FCA /* RunnerProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerProfile.entitlements; sourceTree = ""; }; + 04BFC4572BD0B56600688FCA /* RunnerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerRelease.entitlements; sourceTree = ""; }; 0BEB3ADCCEC961E2916B9004 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 0D02C18E16914A687A4A1AC2 /* devDebug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = devDebug.xcconfig; path = Flutter/devDebug.xcconfig; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; @@ -392,6 +406,20 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( + 04BFC4572BD0B56600688FCA /* RunnerRelease.entitlements */, + 04BFC4562BD0B55F00688FCA /* RunnerProfile.entitlements */, + 04BFC4552BD0B55600688FCA /* RunnerDebug-dev.entitlements */, + 04BFC4542BD0B55000688FCA /* RunnerProfile-dev.entitlements */, + 04BFC4532BD0B54900688FCA /* RunnerRelease-dev.entitlements */, + 04BFC4522BD0B54200688FCA /* RunnerDebug-pre.entitlements */, + 04BFC4512BD0B53B00688FCA /* RunnerProfile-pre.entitlements */, + 04BFC4502BD0B53400688FCA /* RunnerRelease-pre.entitlements */, + 04BFC44F2BD0B52C00688FCA /* RunnerDebug-sky.entitlements */, + 04BFC44E2BD0B52300688FCA /* RunnerProfile-sky.entitlements */, + 04BFC44D2BD0B51D00688FCA /* RunnerRelease-sky.entitlements */, + 04BFC44C2BD0B51500688FCA /* RunnerDebug-xhj.entitlements */, + 04BFC44B2BD0B50A00688FCA /* RunnerProfile-xhj.entitlements */, + 04BFC44A2BCFE48600688FCA /* RunnerRelease-xhj.entitlements */, 3364C3F32B0C902100AA5ABC /* lcokStarMain.png */, 82C026552AEB6C050011FE6A /* img */, 82C026532AE8AC6D0011FE6A /* AliyunEmasServices-Info.plist */, @@ -695,7 +723,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D28DFC3BEA6D46B5F5B5E55F /* Pods-Runner.debug-dev.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = "Runner/RunnerDebug-dev.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 7D53BZAN75; @@ -712,7 +740,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 6285D102821F3D2FB7B09E43 /* Pods-Runner.profile-dev.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = "Runner/RunnerProfile-dev.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -726,7 +754,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 295A8AFEEC4806105FAA13B5 /* Pods-Runner.release-dev.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-dev.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -740,7 +768,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 51086737647B9B5E510020C6 /* Pods-Runner.debug-pre.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = "Runner/RunnerDebug-pre.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -754,7 +782,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D001CDA3D7BF065A0C6E3B64 /* Pods-Runner.profile-pre.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = "Runner/RunnerProfile-pre.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -768,7 +796,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 68C41ACED6A779BAAA0A51A7 /* Pods-Runner.release-pre.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-pre.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -782,7 +810,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 4A63B2C308CB401731950EC8 /* Pods-Runner.debug-sky.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = "Runner/RunnerDebug-sky.entitlements"; DEVELOPMENT_TEAM = NAQ5PL2DYC; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -796,7 +824,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 8CD96970DEA44F6CC71DEECE /* Pods-Runner.profile-sky.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = "Runner/RunnerProfile-sky.entitlements"; DEVELOPMENT_TEAM = NAQ5PL2DYC; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -810,7 +838,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 16A83D21DFB231D8453DC681 /* Pods-Runner.release-sky.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-sky.entitlements"; DEVELOPMENT_TEAM = NAQ5PL2DYC; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -824,7 +852,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 22D858E988707FF26E068457 /* Pods-Runner.debug-xhj.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = "Runner/RunnerDebug-xhj.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -838,7 +866,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D62237D2D011BDC27FB2BC28 /* Pods-Runner.profile-xhj.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = "Runner/RunnerProfile-xhj.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -852,7 +880,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = CDC2B8ED804B514A774F187D /* Pods-Runner.release-xhj.xcconfig */; buildSettings = { - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = "Runner/RunnerRelease-xhj.entitlements"; DEVELOPMENT_TEAM = 7D53BZAN75; PRODUCT_NAME = Runner; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -989,7 +1017,7 @@ ALWAYS_SEARCH_USER_PATHS = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; @@ -1809,7 +1837,7 @@ ALWAYS_SEARCH_USER_PATHS = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; + CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; diff --git a/star_lock/ios/Runner/Info.plist b/star_lock/ios/Runner/Info.plist index eb56ccf1..e6fe82b8 100644 --- a/star_lock/ios/Runner/Info.plist +++ b/star_lock/ios/Runner/Info.plist @@ -90,10 +90,12 @@ CFBundleURLName - com.sky.smartlock + com.sky.skysmartlock CFBundleURLSchemes skysmartlock + + CFBundleURLIconFile diff --git a/star_lock/ios/Runner/Runner.entitlements b/star_lock/ios/Runner/Runner.entitlements index c6bac332..d7b50f42 100644 --- a/star_lock/ios/Runner/Runner.entitlements +++ b/star_lock/ios/Runner/Runner.entitlements @@ -5,7 +5,9 @@ aps-environment development com.apple.developer.associated-domains - + + applinks:lock.skychip.top + com.apple.external-accessory.wireless-configuration diff --git a/star_lock/ios/Runner/RunnerDebug-dev.entitlements b/star_lock/ios/Runner/RunnerDebug-dev.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerDebug-dev.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerDebug-pre.entitlements b/star_lock/ios/Runner/RunnerDebug-pre.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerDebug-pre.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerDebug-sky.entitlements b/star_lock/ios/Runner/RunnerDebug-sky.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerDebug-sky.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerDebug-xhj.entitlements b/star_lock/ios/Runner/RunnerDebug-xhj.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerDebug-xhj.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerProfile-dev.entitlements b/star_lock/ios/Runner/RunnerProfile-dev.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerProfile-dev.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerProfile-pre.entitlements b/star_lock/ios/Runner/RunnerProfile-pre.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerProfile-pre.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerProfile-sky.entitlements b/star_lock/ios/Runner/RunnerProfile-sky.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerProfile-sky.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerProfile-xhj.entitlements b/star_lock/ios/Runner/RunnerProfile-xhj.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerProfile-xhj.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerProfile.entitlements b/star_lock/ios/Runner/RunnerProfile.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerProfile.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerRelease-dev.entitlements b/star_lock/ios/Runner/RunnerRelease-dev.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerRelease-dev.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerRelease-pre.entitlements b/star_lock/ios/Runner/RunnerRelease-pre.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerRelease-pre.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerRelease-sky.entitlements b/star_lock/ios/Runner/RunnerRelease-sky.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerRelease-sky.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerRelease-xhj.entitlements b/star_lock/ios/Runner/RunnerRelease-xhj.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerRelease-xhj.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + diff --git a/star_lock/ios/Runner/RunnerRelease.entitlements b/star_lock/ios/Runner/RunnerRelease.entitlements new file mode 100644 index 00000000..d7b50f42 --- /dev/null +++ b/star_lock/ios/Runner/RunnerRelease.entitlements @@ -0,0 +1,14 @@ + + + + + aps-environment + development + com.apple.developer.associated-domains + + applinks:lock.skychip.top + + com.apple.external-accessory.wireless-configuration + + + 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(); } }