sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、修改电子钥匙详情修改仅管理自己创建的用户、远程开锁不成功问题

Browse Source 
2、修改同一把锁重置之后重新添加之后详情不刷新功能
This commit is contained in:
魏少阳 2024-08-19 18:22:11 +08:00
parent 9d00deb505
commit 001cff8bc5
4 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart
View File

@ -63,11 +63,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());

24
lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart
View File

@ -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<ElectronicKeyDetailPage> {
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<ElectronicKeyDetailPage> {
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<ElectronicKeyDetailPage> {
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<ElectronicKeyDetailPage> {
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);
},
);
}

23
lib/main/lockMian/lockMain/lockMain_logic.dart
View File

@ -29,10 +29,8 @@ class LockMainLogic extends BaseGetXController {
final List<StreamSubscription<void>> _subscriptions =
<StreamSubscription<void>>[];
Future<LockListInfoEntity> getStarLockInfo(
{bool isUnShowLoading = false}) async {
final LockListInfoEntity entity =
await ApiRepository.to.getStarLockListInfo(
Future<LockListInfoEntity> getStarLockInfo({bool isUnShowLoading = false}) async {
final LockListInfoEntity entity = await ApiRepository.to.getStarLockListInfo(
pageNo: pageNo,
pageSize: 50,
isUnShowLoading: isUnShowLoading,
@ -89,6 +87,23 @@ class LockMainLogic extends BaseGetXController {
}
});
}
if(state.dataLength.value == 1){
if (Get.isRegistered<LockDetailLogic>()) {
//设置控制器数据并刷新
// AppLog.log('检测控制器是否存 调用了 setLockListInfoGroupEntity');
Get.find<LockDetailLogic>().loadData(lockListInfoItemEntity: entity.groupList![0].lockList![0], isOnlyOneData: true);
} else {
//延迟加载
Future<dynamic>.delayed(200.milliseconds, () {
if (Get.isRegistered<LockDetailLogic>()) {
//设置控制器数据并刷新
// AppLog.log('检测控制器是否存 延迟调用了 setLockListInfoGroupEntity');
Get.find<LockDetailLogic>().loadData(lockListInfoItemEntity: entity.groupList![0].lockList![0], isOnlyOneData: true);
}
});
}
}
await Storage.saveMainListData(entity);
}

3
pubspec.yaml
View File

@ -86,8 +86,9 @@ 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.77+2024081901：锁定版本，上架商城
version: 1.0.76+2024081201
version: 1.0.77+2024081201
environment:
sdk: '>=2.12.0 <3.0.0'