diff --git a/star_lock/ios/Runner/AppDelegate.m b/star_lock/ios/Runner/AppDelegate.m index 557f519a..236ad0e6 100644 --- a/star_lock/ios/Runner/AppDelegate.m +++ b/star_lock/ios/Runner/AppDelegate.m @@ -40,6 +40,16 @@ return YES; } +- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary *)options { + // 判断是否是你的应用程序的 URL Scheme + if ([url.scheme isEqualToString:@"skysmartlock"]) { + // 处理被唤起的逻辑,可以根据 URL 中的其他信息来执行相应的操作 + return YES; + } + return NO; +} + + - (void)initCloudPush { // SDK初始化 [CloudPushSDK asyncInit:@"334068745" appSecret:@"bee9c200835e4951a85dc8709c319560" callback:^(CloudPushCallbackResult *res) { diff --git a/star_lock/ios/Runner/Info.plist b/star_lock/ios/Runner/Info.plist index 5e71ecba..eb56ccf1 100644 --- a/star_lock/ios/Runner/Info.plist +++ b/star_lock/ios/Runner/Info.plist @@ -86,6 +86,21 @@ UIViewControllerBasedStatusBarAppearance + CFBundleURLTypes + + + CFBundleURLName + com.sky.smartlock + CFBundleURLSchemes + + skysmartlock + + CFBundleURLIconFile + + CFBundleTypeRole + None + + io.flutter.embedded_views_preview diff --git a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart index f7b515ab..7d2754ba 100644 --- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_logic.dart @@ -13,25 +13,27 @@ class CatEyeCustomModeLogic extends BaseGetXController { ); if (entity.errorCode!.codeIsSuccessful) { state.lockSetInfoData.value = entity.data!; - state.catEyeConfigData.value = - entity.data!.lockSettingInfo!.catEyeConfig![0]; + if (entity.data!.lockSettingInfo!.catEyeConfig!.isNotEmpty) { + state.catEyeConfigData.value = + entity.data!.lockSettingInfo!.catEyeConfig![0]; - if (state.catEyeConfigData.value.catEyeModeConfig != null) { - if (state.catEyeConfigData.value.catEyeModeConfig!.recordMode == 1) { - state.selectVideoSlot.value = '自定义时段'; - } else { - state.selectVideoSlot.value = '全天'; + if (state.catEyeConfigData.value.catEyeModeConfig != null) { + if (state.catEyeConfigData.value.catEyeModeConfig!.recordMode == 1) { + state.selectVideoSlot.value = '自定义时段'; + } else { + state.selectVideoSlot.value = '全天'; + } + + state.recordTime.value = + state.catEyeConfigData.value.catEyeModeConfig!.recordTime ?? ''; + state.detectionDistance.value = state + .catEyeConfigData.value.catEyeModeConfig!.detectionDistance ?? + ''; + state.realTimeMode.value = + state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode == 0 + ? '发生事件时查看' + : '实时查看'; } - - state.recordTime.value = - state.catEyeConfigData.value.catEyeModeConfig!.recordTime ?? ''; - state.detectionDistance.value = - state.catEyeConfigData.value.catEyeModeConfig!.detectionDistance ?? - ''; - state.realTimeMode.value = - state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode == 0 - ? '发生事件时查看' - : '实时查看'; } } return entity; diff --git a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart index e49a91bf..b56eabfd 100644 --- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart @@ -78,22 +78,25 @@ class CatEyeSetLogic extends BaseGetXController { // selectCatEyeWorkMode.value = catEyeConfigData.value.catEyeMode!; - if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] - .catEyeMode == - XSConstantMacro.catEyeWorkModePowerSaving) { - state.selectCatEyeWorkMode.value = '省电模式'; - } else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] - .catEyeMode == - XSConstantMacro.catEyeWorkModeStayCapture) { - state.selectCatEyeWorkMode.value = '逗留抓拍模式'; - } else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] - .catEyeMode == - XSConstantMacro.catEyeWorkModeRealTimeMonitoring) { - state.selectCatEyeWorkMode.value = '实时监控模式'; - } else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] - .catEyeMode == - XSConstantMacro.catEyeWorkModeCustom) { - state.selectCatEyeWorkMode.value = '自定义模式'; + if (state + .lockSetInfoData.value.lockSettingInfo!.catEyeConfig!.isNotEmpty) { + if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] + .catEyeMode == + XSConstantMacro.catEyeWorkModePowerSaving) { + state.selectCatEyeWorkMode.value = '省电模式'; + } else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] + .catEyeMode == + XSConstantMacro.catEyeWorkModeStayCapture) { + state.selectCatEyeWorkMode.value = '逗留抓拍模式'; + } else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] + .catEyeMode == + XSConstantMacro.catEyeWorkModeRealTimeMonitoring) { + state.selectCatEyeWorkMode.value = '实时监控模式'; + } else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] + .catEyeMode == + XSConstantMacro.catEyeWorkModeCustom) { + state.selectCatEyeWorkMode.value = '自定义模式'; + } } } return entity; diff --git a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart index a2a5b013..e4ac0d6c 100644 --- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart +++ b/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': - state.catEyeConfigData.value.catEyeModeConfig!.recordMode, - 'recordStartTime': - state.catEyeConfigData.value.catEyeModeConfig!.recordStartTime, - 'recordEndTime': - state.catEyeConfigData.value.catEyeModeConfig!.recordEndTime, - 'recordTime': - state.catEyeConfigData.value.catEyeModeConfig!.recordTime, - 'detectionDistance': state - .catEyeConfigData.value.catEyeModeConfig!.detectionDistance, - 'realTimeMode': - state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode!, + 'recordMode': state.lockSetInfoData.value.lockSettingInfo! + .catEyeConfig!.isNotEmpty + ? state.catEyeConfigData.value.catEyeModeConfig?.recordMode + : 0, + 'recordStartTime': state.lockSetInfoData.value.lockSettingInfo! + .catEyeConfig!.isNotEmpty + ? state.catEyeConfigData.value.catEyeModeConfig?.recordStartTime + : 0, + 'recordEndTime': state.lockSetInfoData.value.lockSettingInfo! + .catEyeConfig!.isNotEmpty + ? state.catEyeConfigData.value.catEyeModeConfig?.recordEndTime + : 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,30 +59,32 @@ class CatEyeWorkModeLogic extends BaseGetXController { if (entity.errorCode!.codeIsSuccessful) { state.lockSetInfoData.value = entity.data!; - state.catEyeConfigData.value = - entity.data!.lockSettingInfo!.catEyeConfig![0]; + if (entity.data!.lockSettingInfo!.catEyeConfig!.isNotEmpty) { + state.catEyeConfigData.value = + entity.data!.lockSettingInfo!.catEyeConfig![0]; - // state.selectCatEyeWorkMode.value = - // state.catEyeConfigData.value.catEyeMode!; + // state.selectCatEyeWorkMode.value = + // state.catEyeConfigData.value.catEyeMode!; - // print('得到了选中哪个模式:${state.catEyeConfigData.value.catEyeMode}'); + // print('得到了选中哪个模式:${state.catEyeConfigData.value.catEyeMode}'); - if (state.catEyeConfigData.value.catEyeMode == - XSConstantMacro.catEyeWorkModePowerSaving) { - // state.boolList.value[0] = true; - state.boolList.value = [true, false, false, false]; - } else if (state.catEyeConfigData.value.catEyeMode == - XSConstantMacro.catEyeWorkModeStayCapture) { - // state.boolList.value[1] = true; - state.boolList.value = [false, true, false, false]; - } else if (state.catEyeConfigData.value.catEyeMode == - XSConstantMacro.catEyeWorkModeRealTimeMonitoring) { - // state.boolList.value[2] = true; - state.boolList.value = [false, false, true, false]; - } else if (state.catEyeConfigData.value.catEyeMode == - XSConstantMacro.catEyeWorkModeCustom) { - // state.boolList.value[3] = true; - state.boolList.value = [false, false, false, true]; + if (state.catEyeConfigData.value.catEyeMode == + XSConstantMacro.catEyeWorkModePowerSaving) { + // state.boolList.value[0] = true; + state.boolList.value = [true, false, false, false]; + } else if (state.catEyeConfigData.value.catEyeMode == + XSConstantMacro.catEyeWorkModeStayCapture) { + // state.boolList.value[1] = true; + state.boolList.value = [false, true, false, false]; + } else if (state.catEyeConfigData.value.catEyeMode == + XSConstantMacro.catEyeWorkModeRealTimeMonitoring) { + // state.boolList.value[2] = true; + state.boolList.value = [false, false, true, false]; + } else if (state.catEyeConfigData.value.catEyeMode == + XSConstantMacro.catEyeWorkModeCustom) { + // state.boolList.value[3] = true; + state.boolList.value = [false, false, false, true]; + } } } } diff --git a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart index e746a4f5..b52a8b2c 100644 --- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart @@ -15,22 +15,24 @@ class VideoSlotLogic extends BaseGetXController { ); if (entity.errorCode!.codeIsSuccessful) { state.lockSetInfoData.value = entity.data!; - state.catEyeConfigData.value = - entity.data!.lockSettingInfo!.catEyeConfig![0]; + if (entity.data!.lockSettingInfo!.catEyeConfig!.isNotEmpty) { + state.catEyeConfigData.value = + entity.data!.lockSettingInfo!.catEyeConfig![0]; - if (state.catEyeConfigData.value.catEyeModeConfig != null) { - if (state.catEyeConfigData.value.catEyeModeConfig!.recordMode == 1) { - state.isCustom.value = true; - } else { - state.isCustom.value = false; + if (state.catEyeConfigData.value.catEyeModeConfig != null) { + if (state.catEyeConfigData.value.catEyeModeConfig!.recordMode == 1) { + state.isCustom.value = true; + } else { + state.isCustom.value = false; + } + + state.startDate.value = DateTool().dateToHNString(state + .catEyeConfigData.value.catEyeModeConfig!.recordStartTime! + .toString()); + state.endDate.value = DateTool().dateToHNString(state + .catEyeConfigData.value.catEyeModeConfig!.recordEndTime! + .toString()); } - - state.startDate.value = DateTool().dateToHNString(state - .catEyeConfigData.value.catEyeModeConfig!.recordStartTime! - .toString()); - state.endDate.value = DateTool().dateToHNString(state - .catEyeConfigData.value.catEyeModeConfig!.recordEndTime! - .toString()); } } return entity; diff --git a/star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart b/star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart index 151564d4..f827690c 100644 --- a/star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/liveVideo/liveVideo_logic.dart @@ -14,16 +14,19 @@ class LiveVideoLogic extends BaseGetXController { ); if (entity.errorCode!.codeIsSuccessful) { state.lockSetInfoData.value = entity.data!; - state.catEyeConfigData.value = - entity.data!.lockSettingInfo!.catEyeConfig![0]; + 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) { - state.isLiveView.value = true; - } else { - state.isLiveView.value = false; + if (state.catEyeConfigData.value.catEyeModeConfig != null) { + state.realTimeMode.value = + state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode!; + if (state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode == + 1) { + state.isLiveView.value = true; + } else { + state.isLiveView.value = false; + } } } }