From a4e93f7794a604ad258fd3175e22355339f47bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Wed, 24 Jul 2024 11:45:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E4=BA=91?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=97=B6=E5=8C=BA=E5=81=8F=E7=A7=BB=E4=B8=8E?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/app.dart | 3 ++- lib/main/lockMian/lockList/lockList_logic.dart | 2 +- lib/main/lockMian/lockMain/lockMain_logic.dart | 17 ++++++++++++++++- lib/network/api.dart | 2 ++ lib/network/api_provider.dart | 13 +++++++++++++ lib/network/api_repository.dart | 12 ++++++++++++ pre_build.sh | 4 ++-- pubspec.yaml | 3 ++- 8 files changed, 50 insertions(+), 6 deletions(-) diff --git a/lib/app.dart b/lib/app.dart index 52b87631..f4140a03 100755 --- a/lib/app.dart +++ b/lib/app.dart @@ -136,6 +136,7 @@ class _MyAppState extends State with WidgetsBindingObserver, BaseWidget { @override void didChangeAppLifecycleState(AppLifecycleState state) { super.didChangeAppLifecycleState(state); + // AppLog.log('App--->state：$state'); switch (state) { case AppLifecycleState.inactive: // AppLog.log('App--->进入非活动状态'); @@ -148,7 +149,7 @@ class _MyAppState extends State with WidgetsBindingObserver, BaseWidget { // AppLog.log('App--->进入前台'); if (Get.isRegistered()) { //进入前台刷新如果存在锁列表则刷新，顺便判断 token 是否过期 - Get.find().getStarLockInfo(isUnShowLoading: true); + Get.find().updateZoneOffsetsAndLanguages(); } break; case AppLifecycleState.detached: diff --git a/lib/main/lockMian/lockList/lockList_logic.dart b/lib/main/lockMian/lockList/lockList_logic.dart index b95a4763..2ae26de4 100755 --- a/lib/main/lockMian/lockList/lockList_logic.dart +++ b/lib/main/lockMian/lockList/lockList_logic.dart @@ -52,7 +52,7 @@ class LockListLogic extends BaseGetXController { _groupDataList = []; } _groupDataList.addAll(entity.groupList!); - AppLog.log('_groupDataList[0].lockList!.length:${_groupDataList[0].lockList!.length}'); + // AppLog.log('_groupDataList[0].lockList!.length:${_groupDataList[0].lockList!.length}'); update(); } diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart index 1b6eb452..28c01899 100755 --- a/lib/main/lockMian/lockMain/lockMain_logic.dart +++ b/lib/main/lockMian/lockMain/lockMain_logic.dart @@ -8,6 +8,7 @@ import 'package:get/get.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:star_lock/appRouters.dart'; import 'package:star_lock/flavors.dart'; +import 'package:star_lock/login/login/entity/LoginEntity.dart'; import 'package:star_lock/main/lockDetail/lockDetail/lockDetail_logic.dart'; import 'package:star_lock/main/lockMian/lockList/lockList_logic.dart'; import 'package:star_lock/tools/eventBusEventManage.dart'; @@ -43,6 +44,17 @@ class LockMainLogic extends BaseGetXController { return entity; } + Future updateZoneOffsetsAndLanguages() async { + final LoginEntity entity = await ApiRepository.to.updateZoneOffsetsAndLanguages( + timezoneOffset: DateTime.now().timeZoneOffset.inSeconds, + // language: '' + ); + if (entity.errorCode!.codeIsSuccessful) { + + } + return entity; + } + Future loadMainDataLogic(LockListInfoGroupEntity entity) async { final bool every = entity.groupList?.every((GroupList list) => (list.lockList ?? []).isEmpty) ?? @@ -60,7 +72,7 @@ class LockMainLogic extends BaseGetXController { state.dataLength.value = 2; } state.lockListInfoGroupEntity.value = entity; - AppLog.log('entity:$entity state.lockListInfoGroupEntity.value.groupList!.length:${state.lockListInfoGroupEntity.value.groupList![0].lockList!.length}'); + // AppLog.log('entity:$entity state.lockListInfoGroupEntity.value.groupList!.length:${state.lockListInfoGroupEntity.value.groupList![0].lockList!.length}'); //检测控制器是否存在 if (Get.isRegistered()) { //设置控制器数据并刷新 @@ -287,6 +299,9 @@ class LockMainLogic extends BaseGetXController { checkWhetherPushIsEnabled(); _initSubscription(); connectListener(); + + // AppLog.log('onInit() updateZoneOffsetsAndLanguages'); + updateZoneOffsetsAndLanguages(); } @override diff --git a/lib/network/api.dart b/lib/network/api.dart index 53c9e081..0d8a9c2b 100755 --- a/lib/network/api.dart +++ b/lib/network/api.dart @@ -265,4 +265,6 @@ abstract class Api { final String keyNoticeSubmitURL = '/v2/key/noticeSubmit'; //发送短信、邮件通知 final String lockUpdateLockInfo = '/lock/updateLockInfo'; //更新锁固件版本 final String exportLockRecordsURL = '/lockRecords/export'; //导出锁操作记录 + + final String updateZoneOffsetsAndLanguagesURL = '/cloudUser/updateSettings'; //更新云用户时区偏移与语言 } diff --git a/lib/network/api_provider.dart b/lib/network/api_provider.dart index f6bc9df6..8640fdd2 100755 --- a/lib/network/api_provider.dart +++ b/lib/network/api_provider.dart @@ -2479,6 +2479,19 @@ class ApiProvider extends BaseProvider { 'endDate': endDate, }), ); + + // 获取锁信息列表 + Future updateZoneOffsetsAndLanguages( + int timezoneOffset, + // String language + ) => + post( + updateZoneOffsetsAndLanguagesURL.toUrl, + jsonEncode({ + 'timezone_offset': timezoneOffset, + // 'language': language, + }), + isUnShowLoading: true); } extension ExtensionString on String { diff --git a/lib/network/api_repository.dart b/lib/network/api_repository.dart index ee5e211c..c2f7ce4a 100755 --- a/lib/network/api_repository.dart +++ b/lib/network/api_repository.dart @@ -2473,4 +2473,16 @@ class ApiRepository { await apiProvider.batchExportLockRecords(lockIds, startDate, endDate); return ExportRecordEntity.fromJson(res.body); } + + // 更新云用户时区偏移与语言 + Future updateZoneOffsetsAndLanguages( + { + required int timezoneOffset, + // required String language + }) async { + final res = await apiProvider.updateZoneOffsetsAndLanguages(timezoneOffset, + // language + ); + return LoginEntity.fromJson(res.body); + } } diff --git a/pre_build.sh b/pre_build.sh index c3d3b3af..95cc11b7 100755 --- a/pre_build.sh +++ b/pre_build.sh @@ -25,11 +25,11 @@ case $environment in api_prefix='https://pre.lock.star-lock.cn' ;; sky) - main_file="lib/main_sky.dart" + main_file="lib/main_sky_full.dart" api_prefix='https://lock.skychip.top' ;; xhj) - main_file="lib/main_xhj.dart" + main_file="lib/main_xhj_full.dart" api_prefix='https://lock.xhjcn.ltd' ;; local) diff --git a/pubspec.yaml b/pubspec.yaml index f2a66206..a2f8c037 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -77,8 +77,9 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # 1.0.67+2024062501：xhj 线上环境，提交测试:回归 测试部门bug # 1.0.69+2024070301：xhj 线上环境，提交测试:周常 bug 修复 # 1.0.69+2024070302：xhj 线上环境，提交测试:周常 bug 修复 +# 1.0.70+2024072401：xhj 线上环境，提交测试:周常 bug 修复 -version: 1.0.70+2024072401 +version: 1.0.70+2024072402 environment: sdk: '>=2.12.0 <3.0.0'