From 5ffa8b2b163b99e1aac00bda082bcb5eb1d3f603 Mon Sep 17 00:00:00 2001
From: Daisy <>
Date: Wed, 3 Apr 2024 10:57:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=94=81=E8=AF=A6=E6=83=85=E7=9A=84?=
 =?UTF-8?q?=E9=97=A8=E9=94=81=E6=97=A5=E5=BF=97=E6=A0=B9=E6=8D=AE=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
index 6a821205..f8cf19fb 100644
--- a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
+++ b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
@@ -198,9 +198,8 @@ class DoorLockLogLogic extends BaseGetXController {
         startDate: state.startDate.value,
         endDate: state.endDate.value);
 
-    if (state.lockLogEntity.value.errorCode!.codeIsSuccessful) {
-      print("操作记录列表成功:${state.lockLogEntity.value.data?.itemList}");
-      state.lockLogItemList.value = state.lockLogEntity.value.data!.itemList!;
+    if (entity.errorCode!.codeIsSuccessful) {
+      state.lockLogItemList.value = entity.data!.itemList!;
     } else {}
   }
 

From 09f2b2b9eda88931327a7b1848263e7647d35379 Mon Sep 17 00:00:00 2001
From: Daisy <>
Date: Wed, 3 Apr 2024 11:07:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=97=A8=E9=94=81?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=97=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9B=B8=E5=BA=94=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
index f8cf19fb..9cfaa892 100644
--- a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
+++ b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
@@ -265,8 +265,8 @@ class DoorLockLogLogic extends BaseGetXController {
     if (isDemoMode == false) {
       // _initReplySubscription();
 
-      // mockNetworkDataRequest();
-      // _getDoorLockLogListRefreshUIAction();
+      mockNetworkDataRequest();
+      _getDoorLockLogListRefreshUIAction();
     }
   }
 
@@ -280,9 +280,6 @@ class DoorLockLogLogic extends BaseGetXController {
       getLockRecordLastUploadDataTime();
       // senderReferEventRecordTime();
       // senderReferEventRecordNumber();
-
-      // testReadJsonData();
-      mockNetworkDataRequest();
     }
   }
 

From 90777d28ec11c509d19af0641dd6432851f39533 Mon Sep 17 00:00:00 2001
From: Daisy <>
Date: Wed, 3 Apr 2024 11:16:34 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E6=89=93=E5=BC=80app=20?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E8=B0=83=E7=94=A8=E7=BB=91=E5=AE=9A=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_lock/lib/app.dart | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/star_lock/lib/app.dart b/star_lock/lib/app.dart
index 598bf513..331ad5a6 100644
--- a/star_lock/lib/app.dart
+++ b/star_lock/lib/app.dart
@@ -49,7 +49,8 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver, BaseWidget {
       ],
       localeResolutionCallback: (locale, supportedLocales) {
         if (!supportedLocales.contains(locale)) {
-          int idx = appSupportedLocales.indexWhere((element) => element.languageCode == locale!.languageCode);
+          int idx = appSupportedLocales.indexWhere(
+              (element) => element.languageCode == locale!.languageCode);
           if (idx != -1) {
             locale = appSupportedLocales[idx];
           } else {
@@ -57,10 +58,16 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver, BaseWidget {
           }
         }
         // print("localelocalelocalelocalelocale locale:${locale} locale.languageCode:${locale.languageCode} locale.countryCode:${locale.countryCode} supportedLocales:${supportedLocales}");
-        AppManager().setLanCode(code: '${locale!.languageCode}_${locale.countryCode}');
+        AppManager()
+            .setLanCode(code: '${locale!.languageCode}_${locale.countryCode}');
         return locale;
       },
-      locale: StoreService.to.getLanguageCode()!.isNotEmpty ? appDept.deptSupportedLocales.where((element) => element.languageCode == StoreService.to.getLanguageCode()).first : Get.deviceLocale,
+      locale: StoreService.to.getLanguageCode()!.isNotEmpty
+          ? appDept.deptSupportedLocales
+              .where((element) =>
+                  element.languageCode == StoreService.to.getLanguageCode())
+              .first
+          : Get.deviceLocale,
       // locale: Get.deviceLocale,
       fallbackLocale: const Locale('zh', 'CN'),
       theme: ThemeData(
@@ -100,7 +107,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver, BaseWidget {
     super.initState();
     WidgetsBinding.instance.addObserver(this);
 
-    XSJPushProvider().initJPushService();
+    // XSJPushProvider().initJPushService();
     XSJPushProvider().initLocalNotification(false);
   }