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 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 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 with WidgetsBindingObserver, BaseWidget { super.initState(); WidgetsBinding.instance.addObserver(this); - XSJPushProvider().initJPushService(); + // XSJPushProvider().initJPushService(); XSJPushProvider().initLocalNotification(false); } diff --git a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart index 6a821205..9cfaa892 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 {} } @@ -266,8 +265,8 @@ class DoorLockLogLogic extends BaseGetXController { if (isDemoMode == false) { // _initReplySubscription(); - // mockNetworkDataRequest(); - // _getDoorLockLogListRefreshUIAction(); + mockNetworkDataRequest(); + _getDoorLockLogListRefreshUIAction(); } } @@ -281,9 +280,6 @@ class DoorLockLogLogic extends BaseGetXController { getLockRecordLastUploadDataTime(); // senderReferEventRecordTime(); // senderReferEventRecordNumber(); - - // testReadJsonData(); - mockNetworkDataRequest(); } }