diff --git a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart index 5fa6bac4..1719a67f 100755 --- a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart +++ b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart @@ -120,10 +120,10 @@ class AuthorizedAdminLogic extends BaseGetXController { showToast('请输入接收者账号'); return; } - if (state.keyNameController.text.isEmpty) { - showToast('请输入接收者姓名'); - return; - } + // if (state.keyNameController.text.isEmpty) { + // showToast('请输入接收者姓名'); + // return; + // } String startDate = '0'; String endDate = '0'; diff --git a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart index bb24a222..5394afba 100755 --- a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart +++ b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart @@ -63,6 +63,11 @@ 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 caa423e7..bde6db3b 100755 --- a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart +++ b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart @@ -217,7 +217,7 @@ class _ElectronicKeyDetailPageState extends State { isHaveRightWidget: true, isHaveLine: true, rightWidget: SizedBox( - width: 60.w, child: _onlyManageYouCreatesUserSwitch())), + width: 60.w, child: Obx(_onlyManageYouCreatesUserSwitch))), ), Obx( () => Visibility( @@ -334,7 +334,7 @@ class _ElectronicKeyDetailPageState extends State { thumbColor: CupertinoColors.white, value: state.isRemoteUnlock.value, onChanged: (bool value) { - state.isRemoteUnlock.value = !state.isRemoteUnlock.value; + // state.isRemoteUnlock.value = !state.isRemoteUnlock.value; logic.updateKeyDateRequest(2); }, ); @@ -347,11 +347,9 @@ class _ElectronicKeyDetailPageState extends State { thumbColor: CupertinoColors.white, value: state.onlyManageYouCreatesUser.value, onChanged: (bool value) { - setState(() { - state.onlyManageYouCreatesUser.value = - !state.onlyManageYouCreatesUser.value; + // setState(() { logic.updateKeyDateRequest(1); - }); + // }); }, ); } diff --git a/lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart b/lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart index 30ce4543..d80e2c0e 100755 --- a/lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart +++ b/lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart @@ -95,9 +95,7 @@ class _HideInvalidUnlockPermissionsPageState padding: EdgeInsets.only(top: 20.w, bottom: 20.w), onClick: () { _isFirst = false; - setState(() { - _isOn = !_isOn; - }); + _isOn = !_isOn; changeSettingsRequest(); }), ], @@ -110,6 +108,7 @@ class _HideInvalidUnlockPermissionsPageState ExpireLockListEntity entity = await ApiRepository.to.changeSettings(_isOn == true ? '1' : '2', '2'); if (entity.errorCode!.codeIsSuccessful) { + setState(() {}); EasyLoading.showToast("操作成功",duration: 2000.milliseconds); } } diff --git a/pubspec.yaml b/pubspec.yaml index d2cc8821..7dbfcc9c 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -83,8 +83,10 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # 1.0.71+2024072902:xhj 线上环境,提交测试:回归 bug # 1.0.72+2024080501:xhj 预发布环境,提交测试:回归 bug # 1.0.73+2024080801:xhj 预发布环境,提交测试:回归 Tapd优2优及测试部门8月8号之前bug +# 1.0.74+2024080901:xhj 预发布环境,提交测试:回归 8月9号之前bug +# 1.0.75+2024081001:xhj 预发布环境,提交测试:回归 8月9号之前bug -version: 1.0.73+2024080801 +version: 1.0.74+2024080901 environment: sdk: '>=2.12.0 <3.0.0'