diff --git a/lib/blue/io_protocol/io_updataLockRemoteControlList.dart b/lib/blue/io_protocol/io_updataLockRemoteControlList.dart index 19cb5902..00b94ab8 100644 --- a/lib/blue/io_protocol/io_updataLockRemoteControlList.dart +++ b/lib/blue/io_protocol/io_updataLockRemoteControlList.dart @@ -34,7 +34,7 @@ class UpdataLockRemoteControlListCommand extends SenderProtocol { @override String toString() { - return 'UpdataLockCardListCommand{lockID: $lockID, keyID:$keyID userID: $userID, ' + return 'UpdataLockRemoteControlListCommand{lockID: $lockID, keyID:$keyID userID: $userID, ' 'page:$page countReq: $countReq, token: $token, ' 'signKey: $signKey, privateKey: $privateKey}'; } diff --git a/lib/blue/io_type.dart b/lib/blue/io_type.dart index 28780e82..8e21ec5b 100755 --- a/lib/blue/io_type.dart +++ b/lib/blue/io_type.dart @@ -131,6 +131,11 @@ extension ExtensionCommandType on CommandType { type = CommandType.updataLockPalmVeinList; } break; + case 0x3026: + { + type = CommandType.updataLockRemoteControlList; + } + break; case 0x302A: { type = CommandType.updataLockSet; @@ -233,6 +238,9 @@ extension ExtensionCommandType on CommandType { case CommandType.updataLockPalmVeinList: type = 0x3025; break; + case CommandType.updataLockRemoteControlList: + type = 0x3026; + break; case CommandType.updataLockSet: type = 0x302A; break; @@ -336,6 +344,9 @@ extension ExtensionCommandType on CommandType { case 0x3025: t = '上传数据获取锁掌静脉列表'; break; + case 0x3026: + t = '上传数据获取锁遥控列表'; + break; case 0x302A: t = '上传数据获取锁设置信息'; break; diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart index 81e7153f..182d3be7 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart @@ -34,7 +34,9 @@ class _LockSetPageState extends State Future getHttpData() async { logic.getLockSettingInfoData().then((LockSetInfoEntity value) { - setState(() {}); + if(mounted){ + setState(() {}); + } }); } diff --git a/lib/main/lockDetail/lockSet/uploadData/uploadData_page.dart b/lib/main/lockDetail/lockSet/uploadData/uploadData_page.dart index 45f7dad8..7426a9ef 100755 --- a/lib/main/lockDetail/lockSet/uploadData/uploadData_page.dart +++ b/lib/main/lockDetail/lockSet/uploadData/uploadData_page.dart @@ -38,7 +38,7 @@ class _UploadDataPageState extends State with RouteAware{ ], ), SizedBox(height: 30.h,), - Obx(() => SubmitBtn(btnName: state.indexCount.value == 0 ? TranslationLoader.lanKeys!.begin!.tr : '${TranslationLoader.lanKeys!.begin!.tr}(${state.indexCount.value}/6)', + Obx(() => SubmitBtn(btnName: state.indexCount.value == 0 ? TranslationLoader.lanKeys!.begin!.tr : '${TranslationLoader.lanKeys!.begin!.tr}(${state.indexCount.value}/7)', borderRadius: 20.w, fontSize: 24.sp, // margin: EdgeInsets.only(left: 03.w, right: 30.w, top: 20.w), diff --git a/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart b/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart index 15991d6a..949bd711 100755 --- a/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart +++ b/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart @@ -212,12 +212,12 @@ class _RemoteControlListPageState extends State with Rout Container( width: 60.w, height: 60.w, - padding: EdgeInsets.all(20.w), + // padding: EdgeInsets.all(15.w), decoration: BoxDecoration( borderRadius: BorderRadius.circular(30.w), color: AppColors.mainColor, ), - child: Image.asset(lockTypeIcon, ) + child: Image.asset(lockTypeIcon, width: 30.w, height: 30.w,) ), SizedBox(width: 20.w), Expanded(