diff --git a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart index 79a31881..f611e416 100755 --- a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart +++ b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart @@ -64,11 +64,6 @@ class ElectronicKeyDetailLogic extends BaseGetXController { state.onlyManageYouCreatesUser.value == true ? 1 : 0, remoteEnable: state.isRemoteUnlock.value == true ? 1 : 2); if (entity.errorCode!.codeIsSuccessful) { - if(updateType == 1){ - state.onlyManageYouCreatesUser.value = !state.onlyManageYouCreatesUser.value; - }else if(updateType == 2){ - state.isRemoteUnlock.value = !state.isRemoteUnlock.value; - } showToast('修改成功'.tr, something: () { eventBus.fire(ElectronicKeyListRefreshUI()); eventBus.fire(AuthorizedAdminPageRefreshUI()); diff --git a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart index bde6db3b..8b4d1fac 100755 --- a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart +++ b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart @@ -16,6 +16,7 @@ import '../../../../../tools/dateTool.dart'; import '../../../../../tools/showTFView.dart'; import '../../../../../tools/submitBtn.dart'; import '../../../../../tools/titleAppBar.dart'; +import '../../../../lockMian/lockMain/lockMain_logic.dart'; enum ShowAlertEnum { name, realName, idCardNumber } @@ -209,7 +210,7 @@ class _ElectronicKeyDetailPageState extends State { rightTitle: DateTool() .dateToYMDHNString(state.itemData.value.sendDate.toString())), Container(height: 10.h), - Visibility( + Obx(() => Visibility( visible: state.itemData.value.keyRight == 1 ? true : false, child: CommonItem( leftTitel: '仅管理自己创建的用户'.tr, @@ -218,7 +219,7 @@ class _ElectronicKeyDetailPageState extends State { isHaveLine: true, rightWidget: SizedBox( width: 60.w, child: Obx(_onlyManageYouCreatesUserSwitch))), - ), + )), Obx( () => Visibility( // (state.keyInfo.value.lockSetting!.remoteUnlock == 1 ? true : false @@ -333,8 +334,12 @@ class _ElectronicKeyDetailPageState extends State { trackColor: CupertinoColors.systemGrey5, thumbColor: CupertinoColors.white, value: state.isRemoteUnlock.value, - onChanged: (bool value) { - // state.isRemoteUnlock.value = !state.isRemoteUnlock.value; + onChanged: (bool value) async { + final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } + state.isRemoteUnlock.value = !state.isRemoteUnlock.value; logic.updateKeyDateRequest(2); }, ); @@ -346,10 +351,13 @@ class _ElectronicKeyDetailPageState extends State { trackColor: CupertinoColors.systemGrey5, thumbColor: CupertinoColors.white, value: state.onlyManageYouCreatesUser.value, - onChanged: (bool value) { - // setState(() { - logic.updateKeyDateRequest(1); - // }); + onChanged: (bool value) async { + final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } + state.onlyManageYouCreatesUser.value = !state.onlyManageYouCreatesUser.value; + logic.updateKeyDateRequest(1); }, ); } diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart index 5aabde5a..71e960e2 100755 --- a/lib/main/lockMian/lockMain/lockMain_logic.dart +++ b/lib/main/lockMian/lockMain/lockMain_logic.dart @@ -30,10 +30,8 @@ class LockMainLogic extends BaseGetXController { final List> _subscriptions = >[]; - Future getStarLockInfo( - {bool isUnShowLoading = false}) async { - final LockListInfoEntity entity = - await ApiRepository.to.getStarLockListInfo( + Future getStarLockInfo({bool isUnShowLoading = false}) async { + final LockListInfoEntity entity = await ApiRepository.to.getStarLockListInfo( pageNo: pageNo, pageSize: 50, isUnShowLoading: isUnShowLoading, @@ -90,6 +88,23 @@ class LockMainLogic extends BaseGetXController { } }); } + + if(state.dataLength.value == 1){ + if (Get.isRegistered()) { + //设置控制器数据并刷新 + // AppLog.log('检测控制器是否存 调用了 setLockListInfoGroupEntity'); + Get.find().loadData(lockListInfoItemEntity: entity.groupList![0].lockList![0], isOnlyOneData: true); + } else { + //延迟加载 + Future.delayed(200.milliseconds, () { + if (Get.isRegistered()) { + //设置控制器数据并刷新 + // AppLog.log('检测控制器是否存 延迟调用了 setLockListInfoGroupEntity'); + Get.find().loadData(lockListInfoItemEntity: entity.groupList![0].lockList![0], isOnlyOneData: true); + } + }); + } + } await Storage.saveMainListData(entity); } diff --git a/pubspec.yaml b/pubspec.yaml index 3dd564bb..31cd0c60 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -86,6 +86,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # 1.0.74+2024080901:xhj 预发布环境,提交测试:回归 8月9号之前bug # 1.0.75+2024081001:锁定版本,上架商城 # 1.0.76+2024081201:锁定版本,上架商城--最新版本 +# 1.0.76+2024081201:锁定版本,上架商城--最新版本(SKY上架苹果) +# 1.0.76+2024082001:锁定版本,上架商城(SKY上架国内应用商城) # 1.0.78+2024082701:测试国际化功能 # 1.0.79+2024083001:测试所有国家国际化功能 # 1.0.79+2024083001:测试开完锁数据上传功能