diff --git a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_state.dart b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_state.dart index 326592cc..caa9da92 100644 --- a/star_lock/lib/main/lockDetail/card/addCardType/addCardType_state.dart +++ b/star_lock/lib/main/lockDetail/card/addCardType/addCardType_state.dart @@ -19,7 +19,7 @@ class AddCardTypeState{ var weekdaysList = [].obs; final TextEditingController nameController = TextEditingController(); - AddCardState() { + AddCardTypeState() { // Map map = Get.arguments; // lockId.value = map["lockId"]; // fromType.value = map["fromType"]; diff --git a/star_lock/lib/main/lockDetail/card/addICCard/addICCard_logic.dart b/star_lock/lib/main/lockDetail/card/addICCard/addICCard_logic.dart index 56f1813f..f0ba5332 100644 --- a/star_lock/lib/main/lockDetail/card/addICCard/addICCard_logic.dart +++ b/star_lock/lib/main/lockDetail/card/addICCard/addICCard_logic.dart @@ -295,6 +295,13 @@ class AddICCardLogic extends BaseGetXController{ ); if (entity.errorCode!.codeIsSuccessful) { Toast.show(msg: "添加成功"); + if(state.fromType.value == 2){ + // 回调指纹号 + eventBus.fire(ChickInAddStaffCardAndFingerprintBlockNumberEvent(entity.data!.cardId.toString())); + }else if(state.fromType.value == 1){ + eventBus.fire(OtherTypeRefreshListEvent()); + } + Get.close(2); updateIdCardUserNoLoadData(entity.data!.cardId.toString()); } } @@ -306,14 +313,14 @@ class AddICCardLogic extends BaseGetXController{ cardUserNo: state.cardNumber.value, ); if(entity.errorCode!.codeIsSuccessful){ - Toast.show(msg: "添加成功"); - if(state.fromType.value == 2){ - // 回调指纹号 - eventBus.fire(ChickInAddStaffCardAndFingerprintBlockNumberEvent(cardId)); - }else if(state.fromType.value == 1){ - eventBus.fire(OtherTypeRefreshListEvent()); - } - Get.close(2); + // Toast.show(msg: "添加成功"); + // if(state.fromType.value == 2){ + // // 回调指纹号 + // eventBus.fire(ChickInAddStaffCardAndFingerprintBlockNumberEvent(cardId)); + // }else if(state.fromType.value == 1){ + // eventBus.fire(OtherTypeRefreshListEvent()); + // } + // Get.close(2); } } diff --git a/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart b/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart index a778b5aa..dd8af270 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart @@ -48,9 +48,9 @@ class _LockSetPageState extends State with RouteAware { body: Column( children: [ Expanded( - child: ListView( + child: Obx(() => ListView( children: getListWidget(), - ), + )), ), ], ) @@ -59,6 +59,8 @@ class _LockSetPageState extends State with RouteAware { // 根据权限显示不同的列表 List getListWidget(){ + + print("state.lockBasicInfo.value.isLockOwner:${state.lockBasicInfo.value.isLockOwner} state.lockBasicInfo.value.keyRight:${state.lockBasicInfo.value.keyRight}"); if(state.lockBasicInfo.value.isLockOwner == 1 || state.lockBasicInfo.value.keyRight == 1){ // 超级管理员、授权管理员 return getAllWidget(); diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index c88ea485..7c94d88a 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -506,7 +506,7 @@ class LockDetailLogic extends BaseGetXController{ token: getTokenList ); } - }); + }, isShowLoading: false); } void startScanAction(){ @@ -617,6 +617,7 @@ class LockDetailLogic extends BaseGetXController{ // TODO: implement onReady super.onReady(); print("onReady()"); + _initReplySubscription(); initLockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceAction(); diff --git a/star_lock/lib/mine/about/about_page.dart b/star_lock/lib/mine/about/about_page.dart index 960de892..50c7bc18 100644 --- a/star_lock/lib/mine/about/about_page.dart +++ b/star_lock/lib/mine/about/about_page.dart @@ -38,7 +38,7 @@ class _AbountPageState extends State { ), SizedBox(height: 20.h), Text( - "星锁 1.0.0.02(preRelease-20231124)", + "星锁 1.0.0.03(preRelease-20231216)", style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor), ), SizedBox( diff --git a/star_lock/lib/network/api_provider.dart b/star_lock/lib/network/api_provider.dart index d727c5b6..af5e9971 100644 --- a/star_lock/lib/network/api_provider.dart +++ b/star_lock/lib/network/api_provider.dart @@ -345,7 +345,7 @@ class ApiProvider extends BaseProvider { // 删除拥有的当前钥匙 Future deletOwnerKeyInfo(String lockId, String keyId) => post( - deletLockURL.toUrl, + deleteElectronicKeyURL.toUrl, jsonEncode({ 'lockId': lockId, 'keyId': keyId