diff --git a/ios/.DS_Store b/ios/.DS_Store index 80df6dcc..bc9ad5a5 100755 Binary files a/ios/.DS_Store and b/ios/.DS_Store differ diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart index d1ee9dc2..2fa7974c 100755 --- a/lib/main/lockMian/lockMain/lockMain_logic.dart +++ b/lib/main/lockMian/lockMain/lockMain_logic.dart @@ -36,7 +36,7 @@ class LockMainLogic extends BaseGetXController { isUnShowLoading: isUnShowLoading, ); if (entity.errorCode!.codeIsSuccessful) { - await loadMainDataLogic(entity.data!); + await loadMainDataLogic(entity.data!); } return entity; } @@ -149,7 +149,8 @@ class LockMainLogic extends BaseGetXController { final LockListInfoEntity entity = await ApiRepository.to.getStarLockInfo( keyId: keyId, ); - if (entity.errorCode!.codeIsSuccessful) { + if (entity.errorCode!.codeIsSuccessful && + (entity.data?.groupList ?? []).isNotEmpty) { state.lockListInfoGroupEntity.value.groupList ??= []; final GroupList list = entity.data!.groupList!.first; final LockListInfoItemEntity listItem = diff --git a/lib/tools/push/message_management.dart b/lib/tools/push/message_management.dart index df2f6c01..429dcc36 100644 --- a/lib/tools/push/message_management.dart +++ b/lib/tools/push/message_management.dart @@ -74,15 +74,13 @@ class MessageManagement { case MessageConstant.lockSetChange: final int keyId = data['keyId']; final int lockId = data['lockId']; - final Map extra = data['updateFieldList']; - if (extra['appUnlockOnline'] != null) { - final String appUnlockOnline = extra['appUnlockOnline']; - eventBus.fire( - LockSetChangeSetRefreshLockDetailWithType(1, appUnlockOnline)); - eventBus.fire(RefreshLockInfoDataEvent(keyId: keyId, lockId: lockId)); - } + // 暂时只用刷新 + // final Map extra = data['updateFieldList']; + // if (extra['appUnlockOnline'] != null) { + // final String appUnlockOnline = extra['appUnlockOnline']!.toString(); + // } + eventBus.fire(RefreshLockInfoDataEvent(keyId: keyId, lockId: lockId)); break; - default: throw Exception('无法识别eventNo 参数:$eventNo'); }