fix: 有锁的账号退出，再用一键登录会闪过之前账号的锁列表

2025-04-23 14:04:50 +08:00 · 2025-04-23 14:04:50 +08:00 · 5313c6ecea
commit 5313c6ecea
parent c3e7998146
4 changed files with 41 additions and 30 deletions
--- a/android/app/src/xhj_pre/google-services.json
+++ b/android/app/src/xhj_pre/google-services.json
@ -9,7 +9,7 @@
      "client_info": {
        "mobilesdk_app_id": "1:281500445726:android:ddf52ac7b7f83cf5c4todo",
        "android_client_info": {
-          "package_name": "com.xhjcn.lock"
+          "package_name": "com.xhjcn.lock.pre"
        }
      },
      "oauth_client": [],
@ -28,7 +28,7 @@
      "client_info": {
        "mobilesdk_app_id": "1:281500445726:android:468195b9cc68dd6cc4todo",
        "android_client_info": {
-          "package_name": "com.xhjcn.lock.local"
+          "package_name": "com.xhjcn.lock.pre"
        }
      },
      "oauth_client": [],
--- a/lib/main/lockMian/lockList/lockList_page.dart
+++ b/lib/main/lockMian/lockList/lockList_page.dart
@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
@ -31,7 +30,9 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
  void initState() {
    super.initState();
    logic = Get.put(LockListLogic(widget.lockListInfoGroupEntity));
-    state = Get.find<LockListLogic>().state;
+    state = Get
+        .find<LockListLogic>()
+        .state;
  }

  @override
@ -57,15 +58,14 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
  }

  //设备多层级列表
-  Widget _buildLockExpandedList(
-      BuildContext context, int index, GroupList itemData) {
+  Widget _buildLockExpandedList(BuildContext context, int index,
+      GroupList itemData) {
    final List<LockListInfoItemEntity> lockItemList =
        itemData.lockList ?? <LockListInfoItemEntity>[];
    return LockListGroupView(
      onTap: () {
        //是否选中组
-        if (itemData.isChecked) {
-        } else {}
+        if (itemData.isChecked) {} else {}
        setState(() {});
      },
      typeImgList: const <dynamic>[],
@ -104,21 +104,21 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
              ),
              child: lockInfoListItem(keyInfo, isLast, () {
                if ((keyInfo.keyType == XSConstantMacro.keyTypeTime ||
-                        keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
+                    keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
                    (keyInfo.keyStatus ==
                        XSConstantMacro.keyStatusWaitIneffective)) {
                  logic.showToast('您的钥匙未生效'.tr);
                  return;
                }
                if ((keyInfo.keyType == XSConstantMacro.keyTypeTime ||
-                        keyInfo.keyType == XSConstantMacro.keyTypeLong ||
-                        keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
+                    keyInfo.keyType == XSConstantMacro.keyTypeLong ||
+                    keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
                    (keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen)) {
                  logic.showToast('您的钥匙已冻结'.tr);
                  return;
                }
                if ((keyInfo.keyType == XSConstantMacro.keyTypeTime ||
-                        keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
+                    keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
                    (keyInfo.keyStatus == XSConstantMacro.keyStatusExpired)) {
                  logic.showToast('您的钥匙已过期'.tr);
                  return;
@ -135,8 +135,8 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
    );
  }

-  Widget lockInfoListItem(
-      LockListInfoItemEntity keyInfo, bool isLast, Function() action) {
+  Widget lockInfoListItem(LockListInfoItemEntity keyInfo, bool isLast,
+      Function() action) {
    return GestureDetector(
      onTap: action,
      child: Container(
@ -146,15 +146,15 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
            : EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w),
        decoration: BoxDecoration(
          color: (((keyInfo.keyType == XSConstantMacro.keyTypeTime ||
-                          keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
-                      (keyInfo.keyStatus ==
-                              XSConstantMacro.keyStatusWaitIneffective ||
-                          keyInfo.keyStatus ==
-                              XSConstantMacro.keyStatusFrozen ||
-                          keyInfo.keyStatus ==
-                              XSConstantMacro.keyStatusExpired)) ||
-                  (keyInfo.keyType == XSConstantMacro.keyTypeLong &&
-                      keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen))
+              keyInfo.keyType == XSConstantMacro.keyTypeLoop) &&
+              (keyInfo.keyStatus ==
+                  XSConstantMacro.keyStatusWaitIneffective ||
+                  keyInfo.keyStatus ==
+                      XSConstantMacro.keyStatusFrozen ||
+                  keyInfo.keyStatus ==
+                      XSConstantMacro.keyStatusExpired)) ||
+              (keyInfo.keyType == XSConstantMacro.keyTypeLong &&
+                  keyInfo.keyStatus == XSConstantMacro.keyStatusFrozen))
              ? AppColors.greyBackgroundColor
              : Colors.white,
          borderRadius: BorderRadius.circular(20.w),
@ -243,14 +243,14 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
                      decoration: BoxDecoration(
                        borderRadius: BorderRadius.circular(5.w),
                        color:
-                            DateTool().compareTimeIsOvertime(keyInfo.endDate!)
-                                ? AppColors.listTimeYellowColor
-                                : AppColors.mainColor,
+                        DateTool().compareTimeIsOvertime(keyInfo.endDate!)
+                            ? AppColors.listTimeYellowColor
+                            : AppColors.mainColor,
                      ),
                      child: Text(logic.getKeyEffective(keyInfo),
                          style: TextStyle(fontSize: 18.sp, color: Colors.white)
-                          // child: Text(logic.compareTimeIsOvertime(keyInfo.endDate!) ? "已过期" : "余${logic.compareTimeGetDaysFromNow(keyInfo.endDate!)}天", style: TextStyle(fontSize: 18.sp, color: Colors.white)
-                          ),
+                        // child: Text(logic.compareTimeIsOvertime(keyInfo.endDate!) ? "已过期" : "余${logic.compareTimeGetDaysFromNow(keyInfo.endDate!)}天", style: TextStyle(fontSize: 18.sp, color: Colors.white)
+                      ),
                    ),
                  ],
                )),
@ -259,7 +259,11 @@ class _LockListPageState extends State<LockListPage> with RouteAware {
              children: <Widget>[
                SizedBox(width: 30.w),
                Text(
-                  "${logic.getUseKeyTypeStr(keyInfo.startDate, keyInfo.endDate, keyInfo.keyType)}/${keyInfo.isLockOwner == 1 ? '超级管理员'.tr : (keyInfo.keyRight == 1 ? "授权管理员".tr : "普通用户".tr)}",
+                  "${logic.getUseKeyTypeStr(keyInfo.startDate, keyInfo.endDate,
+                      keyInfo.keyType)}/${keyInfo.isLockOwner == 1
+                      ? '超级管理员'.tr
+                      : (keyInfo.keyRight == 1 ? "授权管理员".tr : "普通用户"
+                      .tr)}",
                  style: TextStyle(
                      fontSize: 18.sp, color: AppColors.darkGrayTextColor),
                ),
@ -282,9 +286,14 @@ class _LockListPageState extends State<LockListPage> with RouteAware {

  @override
  void dispose() {
+    Get.delete<LockListLogic>();
    /// 取消路由订阅
    AppRouteObserver().routeObserver.unsubscribe(this);
-    super.dispose();
+    super
+    .
+    dispose
+    (
+    );
  }

  /// 从上级界面进入 当前界面即将出现
--- a/lib/main/lockMian/lockMain/lockMain_page.dart
+++ b/lib/main/lockMian/lockMain/lockMain_page.dart
@ -344,6 +344,7 @@ class _StarLockMainPageState extends State<StarLockMainPage>
  @override
  void dispose() {
    super.dispose();
+    Get.delete<LockMainLogic>();
    _teamEvent.cancel();
  }

--- a/lib/tools/storage.dart
+++ b/lib/tools/storage.dart
@ -154,6 +154,7 @@ class Storage {
  static Future<void> clearAll() async {
    final SharedPreferences sp = await SharedPreferences.getInstance();
    // sp.clear();
+    sp.remove(saveLockMainListData);
    sp.remove(saveUserLoginData);
    // 重新设置需要保留的数据
    //退出登录不清除隐私协议同意状态