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

star_lock/ios/Runner/AppDelegate.m

@@ -40,6 +40,16 @@
     return YES;
 }
 
+- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
+    // 判断是否是你的应用程序的 URL Scheme
+    if ([url.scheme isEqualToString:@"skysmartlock"]) {
+        // 处理被唤起的逻辑，可以根据 URL 中的其他信息来执行相应的操作
+        return YES;
+    }
+    return NO;
+}
+
+
 - (void)initCloudPush {
     // SDK初始化
     [CloudPushSDK asyncInit:@"334068745" appSecret:@"bee9c200835e4951a85dc8709c319560" callback:^(CloudPushCallbackResult *res) {

star_lock/ios/Runner/Info.plist

@@ -86,6 +86,21 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>com.sky.smartlock</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>skysmartlock</string>
+			</array>
+			<key>CFBundleURLIconFile</key>
+			<string></string>
+			<key>CFBundleTypeRole</key>
+			<string>None</string>
+		</dict>
+	</array>
 	<key>io.flutter.embedded_views_preview</key>
 	<true/>
 </dict>

star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart

@@ -13,6 +13,7 @@ class CatEyeCustomModeLogic extends BaseGetXController {
     );
     if (entity.errorCode!.codeIsSuccessful) {
       state.lockSetInfoData.value = entity.data!;
+      if (entity.data!.lockSettingInfo!.catEyeConfig!.isNotEmpty) {
         state.catEyeConfigData.value =
             entity.data!.lockSettingInfo!.catEyeConfig![0];
 
@@ -25,8 +26,8 @@ class CatEyeCustomModeLogic extends BaseGetXController {
 
           state.recordTime.value =
               state.catEyeConfigData.value.catEyeModeConfig!.recordTime ?? '';
-        state.detectionDistance.value =
+          state.detectionDistance.value = state
-            state.catEyeConfigData.value.catEyeModeConfig!.detectionDistance ??
+                  .catEyeConfigData.value.catEyeModeConfig!.detectionDistance ??
               '';
           state.realTimeMode.value =
               state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode == 0
@@ -34,6 +35,7 @@ class CatEyeCustomModeLogic extends BaseGetXController {
                   : '实时查看';
         }
       }
+    }
     return entity;
   }
 

star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart

@@ -78,6 +78,8 @@ class CatEyeSetLogic extends BaseGetXController {
 
       // selectCatEyeWorkMode.value = catEyeConfigData.value.catEyeMode!;
 
+      if (state
+          .lockSetInfoData.value.lockSettingInfo!.catEyeConfig!.isNotEmpty) {
         if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0]
                 .catEyeMode ==
             XSConstantMacro.catEyeWorkModePowerSaving) {
@@ -96,6 +98,7 @@ class CatEyeSetLogic extends BaseGetXController {
           state.selectCatEyeWorkMode.value = '自定义模式';
         }
       }
+    }
     return entity;
   }
 }

star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart

@@ -16,18 +16,31 @@ class CatEyeWorkModeLogic extends BaseGetXController {
           'catEyeMode':
               state.boolList.value.indexWhere((element) => element == true) + 1,
           'catEyeModeConfig': {
-            'recordMode':
+            'recordMode': state.lockSetInfoData.value.lockSettingInfo!
-                state.catEyeConfigData.value.catEyeModeConfig!.recordMode,
+                    .catEyeConfig!.isNotEmpty
-            'recordStartTime':
+                ? state.catEyeConfigData.value.catEyeModeConfig?.recordMode
-                state.catEyeConfigData.value.catEyeModeConfig!.recordStartTime,
+                : 0,
-            'recordEndTime':
+            'recordStartTime': state.lockSetInfoData.value.lockSettingInfo!
-                state.catEyeConfigData.value.catEyeModeConfig!.recordEndTime,
+                    .catEyeConfig!.isNotEmpty
-            'recordTime':
+                ? state.catEyeConfigData.value.catEyeModeConfig?.recordStartTime
-                state.catEyeConfigData.value.catEyeModeConfig!.recordTime,
+                : 0,
-            'detectionDistance': state
+            'recordEndTime': state.lockSetInfoData.value.lockSettingInfo!
-                .catEyeConfigData.value.catEyeModeConfig!.detectionDistance,
+                    .catEyeConfig!.isNotEmpty
-            'realTimeMode':
+                ? state.catEyeConfigData.value.catEyeModeConfig?.recordEndTime
-                state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode!,
+                : 0,
+            'recordTime': state.lockSetInfoData.value.lockSettingInfo!
+                    .catEyeConfig!.isNotEmpty
+                ? state.catEyeConfigData.value.catEyeModeConfig?.recordTime
+                : '',
+            'detectionDistance': state.lockSetInfoData.value.lockSettingInfo!
+                    .catEyeConfig!.isNotEmpty
+                ? state
+                    .catEyeConfigData.value.catEyeModeConfig?.detectionDistance
+                : '',
+            'realTimeMode': state.lockSetInfoData.value.lockSettingInfo!
+                    .catEyeConfig!.isNotEmpty
+                ? state.catEyeConfigData.value.catEyeModeConfig?.realTimeMode!
+                : 0,
           }
         }
       ],
@@ -46,6 +59,7 @@ class CatEyeWorkModeLogic extends BaseGetXController {
     if (entity.errorCode!.codeIsSuccessful) {
       state.lockSetInfoData.value = entity.data!;
 
+      if (entity.data!.lockSettingInfo!.catEyeConfig!.isNotEmpty) {
         state.catEyeConfigData.value =
             entity.data!.lockSettingInfo!.catEyeConfig![0];
 
@@ -74,3 +88,4 @@ class CatEyeWorkModeLogic extends BaseGetXController {
       }
     }
   }
+}

star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart

@@ -15,6 +15,7 @@ class VideoSlotLogic extends BaseGetXController {
     );
     if (entity.errorCode!.codeIsSuccessful) {
       state.lockSetInfoData.value = entity.data!;
+      if (entity.data!.lockSettingInfo!.catEyeConfig!.isNotEmpty) {
         state.catEyeConfigData.value =
             entity.data!.lockSettingInfo!.catEyeConfig![0];
 
@@ -33,6 +34,7 @@ class VideoSlotLogic extends BaseGetXController {
               .toString());
         }
       }
+    }
     return entity;
   }
 

star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart

@@ -14,19 +14,22 @@ class LiveVideoLogic extends BaseGetXController {
     );
     if (entity.errorCode!.codeIsSuccessful) {
       state.lockSetInfoData.value = entity.data!;
+      if (entity.data!.lockSettingInfo!.catEyeConfig!.isNotEmpty) {
         state.catEyeConfigData.value =
             entity.data!.lockSettingInfo!.catEyeConfig![0];
 
         if (state.catEyeConfigData.value.catEyeModeConfig != null) {
           state.realTimeMode.value =
               state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode!;
-        if (state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode == 1) {
+          if (state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode ==
+              1) {
             state.isLiveView.value = true;
           } else {
             state.isLiveView.value = false;
           }
         }
       }
+    }
     return entity;
   }