sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock

Browse Source
This commit is contained in:
魏少阳 2024-04-03 11:47:05 +08:00
commit 87aa689380
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
star_lock/lib/app.dart
View File

@ -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);
}

12
star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
View File

@ -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();
}
}