1,更换手掌、虹膜部分图片

2,优化手掌、虹膜部分逻辑显示
This commit is contained in:
Daisy 2024-04-18 10:16:01 +08:00
parent 64e8c49e31
commit cd9d3d3136
8 changed files with 41 additions and 37 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 197 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@ -34,8 +34,8 @@ class _AddIrisPageState extends State<AddIrisPage> {
), ),
Obx(() => Image.asset( Obx(() => Image.asset(
state.isClickAddFace.value == false state.isClickAddFace.value == false
? 'images/main/icon_addFace_step1.png' ? 'images/main/icon_addIris_step1.png'
: 'images/main/icon_addFace_step2.png', : 'images/main/icon_addIris_step1.png',
width: 100.w, width: 100.w,
height: 457.h, height: 457.h,
fit: BoxFit.fitHeight, fit: BoxFit.fitHeight,

View File

@ -33,7 +33,8 @@ class LockDetailPage extends StatefulWidget {
State<LockDetailPage> createState() => _LockDetailPageState(); State<LockDetailPage> createState() => _LockDetailPageState();
} }
class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStateMixin, RouteAware { class _LockDetailPageState extends State<LockDetailPage>
with TickerProviderStateMixin, RouteAware {
// with RouteAware // with RouteAware
final logic = Get.put(LockDetailLogic()); final logic = Get.put(LockDetailLogic());
final state = Get.find<LockDetailLogic>().state; final state = Get.find<LockDetailLogic>().state;
@ -121,7 +122,8 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
Storage.setStringList(saveBluePrivateKey, savePrivateKeyList); Storage.setStringList(saveBluePrivateKey, savePrivateKeyList);
// signKey // signKey
List<int> signKeyData = state.keyInfos.value.bluetooth!.signKey!.cast<int>(); List<int> signKeyData =
state.keyInfos.value.bluetooth!.signKey!.cast<int>();
var saveSignKeyList = changeIntListToStringList(signKeyData); var saveSignKeyList = changeIntListToStringList(signKeyData);
Storage.setStringList(saveBlueSignKey, saveSignKeyList); Storage.setStringList(saveBlueSignKey, saveSignKeyList);
@ -676,27 +678,27 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
); );
} }
if (state.keyInfos.value.lockFeature!.isSupportIris == 1) { // if (state.keyInfos.value.lockFeature!.isSupportIris == 1) {
showWidgetArr.add( showWidgetArr.add(
bottomItem('images/main/icon_iris.png', '虹膜'.tr, bottomItem('images/main/icon_iris.png', '虹膜'.tr,
state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () { state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
Get.toNamed(Routers.irisListPage, arguments: { Get.toNamed(Routers.irisListPage, arguments: {
"lockId": state.keyInfos.value.lockId, "lockId": state.keyInfos.value.lockId,
}); });
}), }),
); );
} // }
if (state.keyInfos.value.lockFeature!.palmVein == 1) { // if (state.keyInfos.value.lockFeature!.palmVein == 1) {
showWidgetArr.add( showWidgetArr.add(
bottomItem('images/main/icon_palm.png', '手掌'.tr, bottomItem('images/main/icon_palm.png', '手掌'.tr,
state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () { state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
Get.toNamed(Routers.palmListPage, arguments: { Get.toNamed(Routers.palmListPage, arguments: {
"lockId": state.keyInfos.value.lockId, "lockId": state.keyInfos.value.lockId,
}); });
}), }),
); );
} // }
//-> //->
if (state.keyInfos.value.lockFeature!.videoIntercom == 1) { if (state.keyInfos.value.lockFeature!.videoIntercom == 1) {
@ -805,15 +807,17 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
SizedBox( SizedBox(
width: width, width: width,
height: height, height: height,
child: Image.asset(iconUrl, child: Image.asset(
width: width, iconUrl,
height: height, width: width,
color: openDoorBtnisUneable height: height,
? (bottomBtnisEable color: openDoorBtnisUneable
? AppColors.mainColor ? (bottomBtnisEable
: AppColors.lockDetailBottomBtnUneable) ? AppColors.mainColor
: AppColors.lockDetailBottomBtnUneable, : AppColors.lockDetailBottomBtnUneable)
fit: BoxFit.fitWidth), : AppColors.lockDetailBottomBtnUneable,
// fit: BoxFit.fitWidth
),
), ),
SizedBox(height: 10.w), SizedBox(height: 10.w),
Expanded( Expanded(

View File

@ -34,8 +34,8 @@ class _AddPalmPageState extends State<AddPalmPage> {
), ),
Obx(() => Image.asset( Obx(() => Image.asset(
state.isClickAddFace.value == false state.isClickAddFace.value == false
? 'images/main/icon_addFace_step1.png' ? 'images/main/icon_addPalm_step1.png'
: 'images/main/icon_addFace_step2.png', : 'images/main/icon_addPalm_step1.png',
width: 100.w, width: 100.w,
height: 457.h, height: 457.h,
fit: BoxFit.fitHeight, fit: BoxFit.fitHeight,
@ -50,7 +50,7 @@ class _AddPalmPageState extends State<AddPalmPage> {
children: [ children: [
Expanded( Expanded(
child: Text( child: Text(
"单人正对门锁,距离一个成年人手臂长度\n(约0.6米)。\n保持脸部无遮挡,露出五官", "自然张开手掌,掌心正对摄像头,距离约一个成年\n人手掌宽度(约10厘米)",
textAlign: TextAlign.left, textAlign: TextAlign.left,
maxLines: null, maxLines: null,
style: style:

View File

@ -438,7 +438,7 @@ class PalmListLogic extends BaseGetXController {
var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) { if (isDemoMode == false) {
_replySubscription.cancel(); // _replySubscription.cancel();
_teamEvent.cancel(); _teamEvent.cancel();
} }
} }