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

# Conflicts:
#	star_lock/images/lan/lan_en.json
#	star_lock/images/lan/lan_keys.json
#	star_lock/images/lan/lan_zh.json
合并代码

star_lock/images/lan/lan_keys.json

@@ -807,5 +807,13 @@
   "该功能是高级功能，请开通后再使用":"该功能是高级功能，请开通后再使用",
   "常用程序":"常用程序",
   "该锁已被重置":"该锁已被重置",
+  "需要访问读写权限才能使用手动升级固件":"需要访问读写权限才能使用手动升级固件",
+  "错误D固件，请选择正确的文件":"错误固件，请选择正确的文件",
+  "非SYD固件，请选择正确的文件":"非SYD固件，请选择正确的文件",
+  "文件校验失败 0x01":"文件校验失败 0x01",
+  "解析元数据失败，请选择正确的文件":"解析元数据失败，请选择正确的文件",
+  "文件校验失败 0x02":"文件校验失败 0x02",
+  "文件校验失败 0x03":"文件校验失败 0x03",
+  "固件升级完成":"固件升级完成",
   "记录":"记录"
 }

star_lock/images/lan/lan_zh.json

@@ -810,5 +810,13 @@
   "该功能是高级功能，请开通后再使用":"该功能是高级功能，请开通后再使用",
   "常用程序":"常用程序",
   "该锁已被重置":"该锁已被重置",
-  "记录":"记录"
+  "记录":"记录",
+  "需要访问读写权限才能使用手动升级固件":"需要访问读写权限才能使用手动升级固件",
+  "错误D固件，请选择正确的文件":"错误固件，请选择正确的文件",
+  "非SYD固件，请选择正确的文件":"非SYD固件，请选择正确的文件",
+  "文件校验失败 0x01":"文件校验失败 0x01",
+  "解析元数据失败，请选择正确的文件":"解析元数据失败，请选择正确的文件",
+  "文件校验失败 0x02":"文件校验失败 0x02",
+  "文件校验失败 0x03":"文件校验失败 0x03",
+  "固件升级完成":"固件升级完成"
 }

star_lock/ios/Podfile.lock

@@ -316,7 +316,7 @@ SPEC CHECKSUMS:
   flutter_native_contact_picker: bd430ba0fbf82768bb50c2c52a69a65759a8f907
   flutter_pcm_sound: de0572ca4f99091cc2abfcc31601b8a4ddd33c0e
   flutter_voice_processor: 2b89b93d69b02227ae3fd58589ee0bcfa3ca2a82
-  fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
+  fluttertoast: 9f2f8e81bb5ce18facb9748d7855bf5a756fe3db
   fluwx: daa284756ce53442b3d0417ceeda66e981906811
   google_maps_flutter_ios: d1318b4ff711612cab16862d7a87e31a7403d458
   GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4

star_lock/lib/app.dart

@@ -4,6 +4,8 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:star_lock/app_settings/app_settings.dart';
+import 'package:star_lock/blue/blue_manage.dart';
 import 'package:star_lock/flavors.dart';
 import 'package:star_lock/tools/app_manager.dart';
 import 'package:star_lock/tools/bindings/app_binding.dart';
@@ -115,8 +117,30 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver, BaseWidget {
     WidgetsBinding.instance.removeObserver(this);
     super.dispose();
   }
-}
 
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    switch (state) {
+      case AppLifecycleState.inactive:
+        AppLog.log('App--->进入非活动状态');
+        break;
+      case AppLifecycleState.paused:
+        AppLog.log('App--->进入后台');
+        BlueManage().disconnect();
+        break;
+      case AppLifecycleState.resumed:
+        AppLog.log('App--->进入前台');
+        break;
+      case AppLifecycleState.detached:
+        AppLog.log('App--->挂起');
+        break;
+      case AppLifecycleState.hidden:
+        AppLog.log('App--->隐藏');
+        break;
+    }
+  }
+}
 
 Future<bool> getLoginStatus() async {
   final data = await Storage.getString(saveUserLoginData);

star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart

@@ -97,7 +97,7 @@ class DoorLockLogLogic extends BaseGetXController {
           }
           lockRecordUploadData(uploadList);
 
-          if(dataLength == 20){
+          if(dataLength == state.logCountPage){
             state.ifHaveNext = true;
           }
         }
@@ -179,7 +179,7 @@ class DoorLockLogLogic extends BaseGetXController {
         IoSenderManage.senderReferEventRecordTimeCommand(
           keyID: BlueManage().connectDeviceName,
           userID: await Storage.getUid(),
-          logsCount: int.parse(pageSize),
+          logsCount: state.logCountPage,
           // time:DateTime.now().millisecondsSinceEpoch~/1000,
           time: state.operateDate,
           token: getTokenList,
@@ -203,7 +203,7 @@ class DoorLockLogLogic extends BaseGetXController {
         lockId: state.keyInfos.value.lockId!,
         lockEventType: state.dropdownValue.value,
         pageNo: 1,
-        pageSize: 20,
+        pageSize: int.parse(pageSize),
         startDate: state.startDate.value,
         endDate: state.endDate.value);
 

star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_state.dart

@@ -49,6 +49,7 @@ class DoorLockLogState {
   var ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示
   var operateDate = 0; // 按日期查询消息记录的时间戳
   var ifHaveNext = false; // 页码
+  var logCountPage = 10; // 蓝牙记录一页多少个
 
   DoorLockLogState() {
     keyInfos.value = Get.arguments["keyInfo"];

star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart

@@ -191,7 +191,7 @@ class LockDetailLogic extends BaseGetXController {
           }
           lockRecordUploadData(uploadList);
 
-          if(dataLength == 20){
+          if(dataLength == state.logCountPage){
             senderReferEventRecordTime();
           }else{
             await BlueManage().disconnect();
@@ -383,7 +383,7 @@ class LockDetailLogic extends BaseGetXController {
         IoSenderManage.senderReferEventRecordTimeCommand(
           keyID: BlueManage().connectDeviceName,
           userID: await Storage.getUid(),
-          logsCount: 20,
+          logsCount: state.logCountPage,
           // time:DateTime.now().millisecondsSinceEpoch~/1000,
           time: state.operateDate,
           token: getTokenList,

star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart

@@ -127,7 +127,7 @@ class _LockDetailPageState extends State<LockDetailPage>
     Storage.setStringList(saveBlueSignKey, saveSignKeyList);
 
     bool ifHaveKey = await Storage.ifHaveKey(saveBlueToken);
-    if(!ifHaveKey){
+    if (!ifHaveKey) {
       var saveTokenList = changeIntListToStringList([0, 0, 0, 0]);
       Storage.setStringList(saveBlueToken, saveTokenList);
     }
@@ -172,7 +172,7 @@ class _LockDetailPageState extends State<LockDetailPage>
       onTap: onTap,
       child: Container(
         margin: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 15.h),
-        padding: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 20.h),
+        padding: EdgeInsets.symmetric(horizontal: 0.05.sw, vertical: 30.h),
         decoration: BoxDecoration(
             color: Colors.white,
             borderRadius: BorderRadius.circular(16.r),
@@ -232,79 +232,78 @@ class _LockDetailPageState extends State<LockDetailPage>
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           const Spacer(),
-          Obx(() {
+          GestureDetector(
-            return GestureDetector(
+            onTap: state.openDoorBtnisUneable.value == true
-              onTap: state.openDoorBtnisUneable.value == true
+                ? () {
-                  ? () {
+                    setState(() {
-                      setState(() {
+                      startOpenLock();
-                        startOpenLock();
+                    });
-                      });
+                  }
-                    }
+                : null,
-                  : null,
+            onLongPressStart: state.openDoorBtnisUneable.value == true
-              onLongPressStart: state.openDoorBtnisUneable.value == true
+                ? (details) {
-                  ? (details) {
+                    setState(() {
-                      setState(() {
+                      startUnLock();
-                        startUnLock();
+                    });
-                      });
+                  }
-                    }
+                : null,
-                  : null,
+            child: Container(
-              child: Container(
+              width: 100.r,
-                decoration: BoxDecoration(
+              height: 100.r,
-                    color: Colors.white.withOpacity(0.9),
+              decoration: BoxDecoration(
-                    borderRadius: BorderRadius.circular(100.w),
+                  color: Colors.white.withOpacity(0.9),
-                    boxShadow: [
+                  borderRadius: BorderRadius.circular(100.w),
-                      BoxShadow(
+                  boxShadow: [
-                        color: Colors.black.withOpacity(0.3),
+                    BoxShadow(
-                        offset: Offset(0, 0),
+                      color: Colors.black.withOpacity(0.3),
-                        blurRadius: 10.r,
+                      offset: Offset(0, 0),
-                        spreadRadius: 0,
+                      blurRadius: 10.r,
-                      ),
+                      spreadRadius: 0,
-                    ]),
-                margin: EdgeInsets.only(left: 35.w, bottom: 15.h),
-                child: Stack(
-                  children: [
-                    FlavorsImg(
-                      child: Image.asset(
-                        state.openDoorBtnisUneable.value == false
-                            ? 'images/main/icon_main_openLockBtn_grey.png'
-                            : (state.isOpenPassageMode.value == 1
-                                ? 'images/main/icon_main_normallyOpenMode_center.png'
-                                : 'images/main/icon_main_openLockBtn_center.png'),
-                        width: 96.r,
-                        height: 96.r,
-                        // color: AppColors.primaryTopColor,
-                      ),
                     ),
-                    state.openDoorBtnisUneable.value == false
+                  ]),
-                        ? Positioned(
+              margin: EdgeInsets.only(left: 35.w, bottom: 15.h),
-                            child: FlavorsImg(
+              child: Stack(
+                alignment: AlignmentDirectional.center,
+                children: [
+                  state.openDoorBtnisUneable.value == false
+                      ? Icon(
+                          Icons.bluetooth_searching,
+                          size: 48.r,
+                          color: AppColors.mainColor,
+                        )
+                      : Image.asset(
+                          state.isOpenPassageMode.value == 1
+                              ? 'images/icon_lock_err.png'
+                              : 'images/icon_lock_fill.png',
+                          width: 38.r,
+                          height: 38.r,
+                          color: AppColors.mainColor,
+                        ),
+                  state.openDoorBtnisUneable.value == false
+                      ? Positioned(
+                          child: Icon(
+                            Icons.bluetooth_searching,
+                            size: 96.r,
+                          ),
+                        )
+                      : state.openLockBtnState.value == 1
+                          ? xhjBuildRotationTransition(
+                              width: 88.r,
+                              height: 88.r,
+                            )
+                          : Positioned(
                               child: Image.asset(
-                                'images/main/icon_main_openLockBtn_grey.png',
+                              'images/icon_circle_dotted.png',
-                                width: 96.r,
+                              width: 88.r,
-                                height: 96.r,
+                              height: 88.r,
-                              ),
+                              color: state.isOpenPassageMode.value == 1
-                            ),
+                                  ? Colors.red
-                          )
+                                  : AppColors.mainColor,
-                        : state.openLockBtnState.value == 1
+                            )),
-                            ? buildRotationTransition(
+                ],
-                                width: 96.r,
-                                height: 96.r,
-                              )
-                            : Positioned(
-                                child: FlavorsImg(
-                                child: Image.asset(
-                                  state.isOpenPassageMode.value == 1
-                                      ? 'images/main/icon_main_normallyOpenMode_circle.png'
-                                      : 'images/main/icon_main_openLockBtn_circle.png',
-                                  width: 96.r,
-                                  height: 96.r,
-                                ),
-                              )),
-                  ],
-                ),
               ),
-            );
+            ),
-          }),
+          ),
           Padding(
             padding: EdgeInsets.only(left: 15.w, right: 00.w, bottom: 15.h),
             child: Row(
@@ -735,6 +734,28 @@ class _LockDetailPageState extends State<LockDetailPage>
     );
   }
 
+  //旋转动画
+  Widget xhjBuildRotationTransition(
+      {required double width, required double height}) {
+    return Positioned(
+      child: RotationTransition(
+        //设置动画的旋转中心
+        alignment: Alignment.center,
+        //动画控制器
+        turns: state.animationController!,
+        //将要执行动画的子view
+        child: Image.asset(
+          'images/icon_circle_dotted.png',
+          width: width,
+          height: height,
+          color: state.isOpenPassageMode.value == 1
+              ? Colors.red
+              : AppColors.mainColor,
+        ),
+      ),
+    );
+  }
+
   //旋转动画
   Widget buildRotationTransition(
       {required double width, required double height}) {

star_lock/lib/main/lockDetail/lockDetail/lockDetail_state.dart

@@ -47,7 +47,7 @@ class LockDetailState {
   var currentPage = 0.obs;
 
   var operateDate = 0; // 按日期查询消息记录的时间戳
-
+  var logCountPage = 10; // 蓝牙记录一页多少个
   // LockDetailState() {
   //   Map map = Get.arguments;
   //   lockCount = map["lockCount"];

star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart

@@ -47,7 +47,7 @@ class LockEscalationLogic extends BaseGetXController {
   //手动升级
   Future<void> otaUpdate() async {
     var status = await PermissionDialog.request(
-        Permission.storage, '需要访问读写权限才能使用手动升级固件');
+        Permission.storage, '需要访问读写权限才能使用手动升级固件'.tr);
     if (status != true) {
       return;
     }
@@ -161,24 +161,52 @@ class LockEscalationLogic extends BaseGetXController {
 
 // 检查文件头
   Future<Map?> getHeadFile(Uint8List data) async {
+    if (data.length <= 16) {
+      showToast('错误固件，请选择正确的文件'.tr);
+      return null;
+    }
     // 检查文件头
-    String header = utf8.decode(data.sublist(0, 12));
+    String header;
+    try {
+      header = utf8.decode(data.sublist(0, 12));
+    } catch (e) {
+      showToast('非SYD固件，请选择正确的文件'.tr);
+      return null;
+    }
     if (header != 'SYD-BIN-DATA') {
-      showToast('非SYD固件，请选择正确的文件');
+      showToast('非SYD固件，请选择正确的文件'.tr);
       return null;
     }
     // 解析元数据长度
-    Uint8List metaLenList = data.sublist(12, 16);
+    Uint8List metaLenList;
-    int metaLen = ByteData.sublistView(metaLenList).getUint32(0);
+    int metaLen;
+    try {
+      metaLenList = data.sublist(12, 16);
+      metaLen = ByteData.sublistView(metaLenList).getUint32(0);
+    } catch (e) {
+      showToast('文件校验失败 0x01'.tr);
+      return null;
+    }
     if (metaLen < 2 || metaLen > 10240) {
-      showToast('文件校验失败 0x01');
+      showToast('文件校验失败 0x01'.tr);
       return null;
     }
     // 读取和解析元数据
-    Uint8List metaStrList = data.sublist(16, 16 + metaLen);
+    Uint8List metaStrList;
-    String metaStr = utf8.decode(metaStrList);
+    String metaStr;
+    try {
+      metaStrList = data.sublist(16, 16 + metaLen);
+      metaStr = utf8.decode(metaStrList);
+    } catch (e) {
+      showToast('解析元数据失败，请选择正确的文件'.tr);
+      return null;
+    }
     AppLog.log(metaStr);
     var meta = jsonDecode(metaStr);
+    if (meta is! Map) {
+      showToast('解析元数据失败，请选择正确的文件'.tr);
+      return null;
+    }
     return meta..['metaLen'] = metaLen;
   }
 
@@ -191,11 +219,11 @@ class LockEscalationLogic extends BaseGetXController {
     String md5Str = md5.convert(bin).toString().toUpperCase();
     AppLog.log('---> $md5Str ${meta['fwMd5']}');
     if (md5Str != meta['fwMd5']) {
-      showToast('文件校验失败 0x02');
+      showToast('文件校验失败 0x02'.tr);
       return null;
     }
     if (bin.length != meta['fwSize']) {
-      showToast('文件校验失败 0x03');
+      showToast('文件校验失败 0x03'.tr);
       return null;
     }
     return bin;
@@ -225,7 +253,7 @@ class LockEscalationLogic extends BaseGetXController {
         processOtaUpgrade();
       } else if (reply is ConfirmationOTAUpgradeReply && reply.status == 0x00) {
         closeOTADAta();
-        showToast('固件升级完成');
+        showToast('固件升级完成'.tr);
       }
     });
   }

star_lock/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart

@@ -86,7 +86,8 @@ class _StarLockMainXHJPageState extends State<StarLockMainXHJPage>
               ],
             ),
             bottomNavigationBar: Container(
-              padding: EdgeInsets.only(top: 20.h),
+              padding: EdgeInsets.only(
+                  top: 20.h, bottom: GetPlatform.isAndroid ? 20.h : 0),
               decoration: const BoxDecoration(
                 color: Colors.transparent,
                 border: Border(