Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
This commit is contained in:
commit
6a9830378d
@ -40,6 +40,16 @@
|
|||||||
return YES;
|
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 {
|
- (void)initCloudPush {
|
||||||
// SDK初始化
|
// SDK初始化
|
||||||
[CloudPushSDK asyncInit:@"334068745" appSecret:@"bee9c200835e4951a85dc8709c319560" callback:^(CloudPushCallbackResult *res) {
|
[CloudPushSDK asyncInit:@"334068745" appSecret:@"bee9c200835e4951a85dc8709c319560" callback:^(CloudPushCallbackResult *res) {
|
||||||
|
|||||||
@ -86,6 +86,21 @@
|
|||||||
</array>
|
</array>
|
||||||
<key>UIViewControllerBasedStatusBarAppearance</key>
|
<key>UIViewControllerBasedStatusBarAppearance</key>
|
||||||
<false/>
|
<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>
|
<key>io.flutter.embedded_views_preview</key>
|
||||||
<true/>
|
<true/>
|
||||||
</dict>
|
</dict>
|
||||||
|
|||||||
@ -13,25 +13,27 @@ class CatEyeCustomModeLogic extends BaseGetXController {
|
|||||||
);
|
);
|
||||||
if (entity.errorCode!.codeIsSuccessful) {
|
if (entity.errorCode!.codeIsSuccessful) {
|
||||||
state.lockSetInfoData.value = entity.data!;
|
state.lockSetInfoData.value = entity.data!;
|
||||||
state.catEyeConfigData.value =
|
if (entity.data!.lockSettingInfo!.catEyeConfig!.isNotEmpty) {
|
||||||
entity.data!.lockSettingInfo!.catEyeConfig![0];
|
state.catEyeConfigData.value =
|
||||||
|
entity.data!.lockSettingInfo!.catEyeConfig![0];
|
||||||
|
|
||||||
if (state.catEyeConfigData.value.catEyeModeConfig != null) {
|
if (state.catEyeConfigData.value.catEyeModeConfig != null) {
|
||||||
if (state.catEyeConfigData.value.catEyeModeConfig!.recordMode == 1) {
|
if (state.catEyeConfigData.value.catEyeModeConfig!.recordMode == 1) {
|
||||||
state.selectVideoSlot.value = '自定义时段';
|
state.selectVideoSlot.value = '自定义时段';
|
||||||
} else {
|
} else {
|
||||||
state.selectVideoSlot.value = '全天';
|
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;
|
return entity;
|
||||||
|
|||||||
@ -78,22 +78,25 @@ class CatEyeSetLogic extends BaseGetXController {
|
|||||||
|
|
||||||
// selectCatEyeWorkMode.value = catEyeConfigData.value.catEyeMode!;
|
// selectCatEyeWorkMode.value = catEyeConfigData.value.catEyeMode!;
|
||||||
|
|
||||||
if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0]
|
if (state
|
||||||
.catEyeMode ==
|
.lockSetInfoData.value.lockSettingInfo!.catEyeConfig!.isNotEmpty) {
|
||||||
XSConstantMacro.catEyeWorkModePowerSaving) {
|
if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0]
|
||||||
state.selectCatEyeWorkMode.value = '省电模式';
|
.catEyeMode ==
|
||||||
} else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0]
|
XSConstantMacro.catEyeWorkModePowerSaving) {
|
||||||
.catEyeMode ==
|
state.selectCatEyeWorkMode.value = '省电模式';
|
||||||
XSConstantMacro.catEyeWorkModeStayCapture) {
|
} else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0]
|
||||||
state.selectCatEyeWorkMode.value = '逗留抓拍模式';
|
.catEyeMode ==
|
||||||
} else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0]
|
XSConstantMacro.catEyeWorkModeStayCapture) {
|
||||||
.catEyeMode ==
|
state.selectCatEyeWorkMode.value = '逗留抓拍模式';
|
||||||
XSConstantMacro.catEyeWorkModeRealTimeMonitoring) {
|
} else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0]
|
||||||
state.selectCatEyeWorkMode.value = '实时监控模式';
|
.catEyeMode ==
|
||||||
} else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0]
|
XSConstantMacro.catEyeWorkModeRealTimeMonitoring) {
|
||||||
.catEyeMode ==
|
state.selectCatEyeWorkMode.value = '实时监控模式';
|
||||||
XSConstantMacro.catEyeWorkModeCustom) {
|
} else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0]
|
||||||
state.selectCatEyeWorkMode.value = '自定义模式';
|
.catEyeMode ==
|
||||||
|
XSConstantMacro.catEyeWorkModeCustom) {
|
||||||
|
state.selectCatEyeWorkMode.value = '自定义模式';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return entity;
|
return entity;
|
||||||
|
|||||||
@ -16,18 +16,31 @@ class CatEyeWorkModeLogic extends BaseGetXController {
|
|||||||
'catEyeMode':
|
'catEyeMode':
|
||||||
state.boolList.value.indexWhere((element) => element == true) + 1,
|
state.boolList.value.indexWhere((element) => element == true) + 1,
|
||||||
'catEyeModeConfig': {
|
'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,30 +59,32 @@ class CatEyeWorkModeLogic extends BaseGetXController {
|
|||||||
if (entity.errorCode!.codeIsSuccessful) {
|
if (entity.errorCode!.codeIsSuccessful) {
|
||||||
state.lockSetInfoData.value = entity.data!;
|
state.lockSetInfoData.value = entity.data!;
|
||||||
|
|
||||||
state.catEyeConfigData.value =
|
if (entity.data!.lockSettingInfo!.catEyeConfig!.isNotEmpty) {
|
||||||
entity.data!.lockSettingInfo!.catEyeConfig![0];
|
state.catEyeConfigData.value =
|
||||||
|
entity.data!.lockSettingInfo!.catEyeConfig![0];
|
||||||
|
|
||||||
// state.selectCatEyeWorkMode.value =
|
// state.selectCatEyeWorkMode.value =
|
||||||
// state.catEyeConfigData.value.catEyeMode!;
|
// state.catEyeConfigData.value.catEyeMode!;
|
||||||
|
|
||||||
// print('得到了选中哪个模式:${state.catEyeConfigData.value.catEyeMode}');
|
// print('得到了选中哪个模式:${state.catEyeConfigData.value.catEyeMode}');
|
||||||
|
|
||||||
if (state.catEyeConfigData.value.catEyeMode ==
|
if (state.catEyeConfigData.value.catEyeMode ==
|
||||||
XSConstantMacro.catEyeWorkModePowerSaving) {
|
XSConstantMacro.catEyeWorkModePowerSaving) {
|
||||||
// state.boolList.value[0] = true;
|
// state.boolList.value[0] = true;
|
||||||
state.boolList.value = [true, false, false, false];
|
state.boolList.value = [true, false, false, false];
|
||||||
} else if (state.catEyeConfigData.value.catEyeMode ==
|
} else if (state.catEyeConfigData.value.catEyeMode ==
|
||||||
XSConstantMacro.catEyeWorkModeStayCapture) {
|
XSConstantMacro.catEyeWorkModeStayCapture) {
|
||||||
// state.boolList.value[1] = true;
|
// state.boolList.value[1] = true;
|
||||||
state.boolList.value = [false, true, false, false];
|
state.boolList.value = [false, true, false, false];
|
||||||
} else if (state.catEyeConfigData.value.catEyeMode ==
|
} else if (state.catEyeConfigData.value.catEyeMode ==
|
||||||
XSConstantMacro.catEyeWorkModeRealTimeMonitoring) {
|
XSConstantMacro.catEyeWorkModeRealTimeMonitoring) {
|
||||||
// state.boolList.value[2] = true;
|
// state.boolList.value[2] = true;
|
||||||
state.boolList.value = [false, false, true, false];
|
state.boolList.value = [false, false, true, false];
|
||||||
} else if (state.catEyeConfigData.value.catEyeMode ==
|
} else if (state.catEyeConfigData.value.catEyeMode ==
|
||||||
XSConstantMacro.catEyeWorkModeCustom) {
|
XSConstantMacro.catEyeWorkModeCustom) {
|
||||||
// state.boolList.value[3] = true;
|
// state.boolList.value[3] = true;
|
||||||
state.boolList.value = [false, false, false, true];
|
state.boolList.value = [false, false, false, true];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -15,22 +15,24 @@ class VideoSlotLogic extends BaseGetXController {
|
|||||||
);
|
);
|
||||||
if (entity.errorCode!.codeIsSuccessful) {
|
if (entity.errorCode!.codeIsSuccessful) {
|
||||||
state.lockSetInfoData.value = entity.data!;
|
state.lockSetInfoData.value = entity.data!;
|
||||||
state.catEyeConfigData.value =
|
if (entity.data!.lockSettingInfo!.catEyeConfig!.isNotEmpty) {
|
||||||
entity.data!.lockSettingInfo!.catEyeConfig![0];
|
state.catEyeConfigData.value =
|
||||||
|
entity.data!.lockSettingInfo!.catEyeConfig![0];
|
||||||
|
|
||||||
if (state.catEyeConfigData.value.catEyeModeConfig != null) {
|
if (state.catEyeConfigData.value.catEyeModeConfig != null) {
|
||||||
if (state.catEyeConfigData.value.catEyeModeConfig!.recordMode == 1) {
|
if (state.catEyeConfigData.value.catEyeModeConfig!.recordMode == 1) {
|
||||||
state.isCustom.value = true;
|
state.isCustom.value = true;
|
||||||
} else {
|
} else {
|
||||||
state.isCustom.value = false;
|
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;
|
return entity;
|
||||||
|
|||||||
@ -14,16 +14,19 @@ class LiveVideoLogic extends BaseGetXController {
|
|||||||
);
|
);
|
||||||
if (entity.errorCode!.codeIsSuccessful) {
|
if (entity.errorCode!.codeIsSuccessful) {
|
||||||
state.lockSetInfoData.value = entity.data!;
|
state.lockSetInfoData.value = entity.data!;
|
||||||
state.catEyeConfigData.value =
|
if (entity.data!.lockSettingInfo!.catEyeConfig!.isNotEmpty) {
|
||||||
entity.data!.lockSettingInfo!.catEyeConfig![0];
|
state.catEyeConfigData.value =
|
||||||
|
entity.data!.lockSettingInfo!.catEyeConfig![0];
|
||||||
|
|
||||||
if (state.catEyeConfigData.value.catEyeModeConfig != null) {
|
if (state.catEyeConfigData.value.catEyeModeConfig != null) {
|
||||||
state.realTimeMode.value =
|
state.realTimeMode.value =
|
||||||
state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode!;
|
state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode!;
|
||||||
if (state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode == 1) {
|
if (state.catEyeConfigData.value.catEyeModeConfig!.realTimeMode ==
|
||||||
state.isLiveView.value = true;
|
1) {
|
||||||
} else {
|
state.isLiveView.value = true;
|
||||||
state.isLiveView.value = false;
|
} else {
|
||||||
|
state.isLiveView.value = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user