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

2024-04-03 16:50:46 +08:00 · 2024-04-03 16:50:46 +08:00 · 0ed1f579c7
commit 0ed1f579c7
parent 84f7c6f1bb 6553290a69
6 changed files with 79 additions and 38 deletions
--- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart
+++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart
@ -1,3 +1,4 @@
+import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';

@ -50,4 +51,30 @@ class CatEyeSetLogic extends BaseGetXController {
      showToast('设置成功');
    }
  }
+
+  // 获取锁设置信息
+  Future<LockSetInfoEntity> getLockSettingInfoData() async {
+    LockSetInfoEntity entity = await ApiRepository.to.getLockSettingInfoData(
+      lockId: state.lockSetInfoData.value.lockId.toString(),
+    );
+    if (entity.errorCode!.codeIsSuccessful) {
+      state.lockSetInfoData.value = entity.data!;
+      state.selectBrightDuration.value =
+          '${state.lockSetInfoData.value.lockSettingInfo!.autoLightScreenTime}秒'; //选中的亮屏持续时间
+      state.isAutoBright.value =
+          state.lockSetInfoData.value.lockSettingInfo!.autoLightScreen == 0
+              ? false
+              : true; //自动亮屏
+      state.isStayWarning.value =
+          state.lockSetInfoData.value.lockSettingInfo!.stayWarn == 0
+              ? false
+              : true; //逗留警告
+      state.isExceptionWarning.value =
+          state.lockSetInfoData.value.lockSettingInfo!.abnormalWarn == 0
+              ? false
+              : true; //异常警告
+      state.selectCatEyeWorkMode.value = ''; //猫眼工作模式
+    }
+    return entity;
+  }
 }
--- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart
+++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart
@ -21,6 +21,13 @@ class _CatEyeSetPageState extends State<CatEyeSetPage> {
  final logic = Get.put(CatEyeSetLogic());
  final state = Get.find<CatEyeSetLogic>().state;

+  @override
+  void initState() {
+    super.initState();
+
+    logic.getLockSettingInfoData();
+  }
+
  @override
  Widget build(BuildContext context) {
    return Scaffold(
@ -38,14 +45,16 @@ class _CatEyeSetPageState extends State<CatEyeSetPage> {
                isHaveLine: true,
                isHaveDirection: true,
                action: () {
-                  Get.toNamed(Routers.catEyeWorkModePage, arguments: {
-                    'lockSetInfoData': state.lockSetInfoData.value,
-                    'catEyeConfigata': state
-                        .lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0]
-                  })?.then((value) {
-                    if (value != null) {
-                      state.selectCatEyeWorkMode.value = value;
-                    }
+                  Navigator.pushNamed(context, Routers.catEyeWorkModePage,
+                      arguments: {
+                        'lockSetInfoData': state.lockSetInfoData.value,
+                        'catEyeConfigata': state.lockSetInfoData.value
+                                .lockSettingInfo!.catEyeConfig!.isNotEmpty
+                            ? state.lockSetInfoData.value.lockSettingInfo!
+                                .catEyeConfig![0]
+                            : null
+                      }).then((value) {
+                    logic.getLockSettingInfoData();
                  });
                }),
            Obx(() => CommonItem(
--- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart
+++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart
@ -27,10 +27,4 @@ class CatEyeWorkModeLogic extends BaseGetXController {
      showToast('设置成功');
    }
  }
-
-  @override
-  void onReady() {
-    // TODO: implement onReady
-    super.onReady();
-  }
 }
--- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart
+++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart
@ -26,29 +26,34 @@ class _CatEyeWorkModePageState extends State<CatEyeWorkModePage> {
        appBar: TitleAppBar(
            barTitle: '猫眼工作模式',
            haveBack: true,
+            backAction: () {
+              Navigator.pop(context, true);
+            },
            backgroundColor: AppColors.mainColor),
        body: Column(
          children: [
            SizedBox(
              height: 30.h,
            ),
-            _buildTipsView('省电模式：\n',
-                '适合门口较为安全的环境。\n仅发生特定事件才录像，并可查看实时画面。\n一般情况下，满电可使用7-8个月', 0),
+            Obx(
+              () => _buildTipsView('省电模式：\n',
+                  '适合门口较为安全的环境。\n仅发生特定事件才录像，并可查看实时画面。\n一般情况下，满电可使用7-8个月', 0),
+            ),
            SizedBox(
              height: 30.h,
            ),
-            _buildTipsView('逗留抓拍模式：\n',
-                '有人逗留或发生特定事件才录像，可随时查看\n实时画面。\n一般情况下，满电可使用5~6个月。', 1),
+            Obx(() => _buildTipsView('逗留抓拍模式：\n',
+                '有人逗留或发生特定事件才录像，可随时查看\n实时画面。\n一般情况下，满电可使用5~6个月。', 1)),
            SizedBox(
              height: 30.h,
            ),
-            _buildTipsView('实时监控模式：\n',
-                '适合门口人员复杂、较不安全的环境。\n有人出现就录像，可随时查看实时画面。\n一般情况下，满电可使用2~4个月。', 2),
+            Obx(() => _buildTipsView('实时监控模式：\n',
+                '适合门口人员复杂、较不安全的环境。\n有人出现就录像，可随时查看实时画面。\n一般情况下，满电可使用2~4个月。', 2)),
            SizedBox(
              height: 30.h,
            ),
-            _buildTipsView(
-                '自定义模式：\n', '根据您家门口实际情况设置录像和实时画面功能。\n可使用时长由具体设置决定。', 3)
+            Obx(() => _buildTipsView(
+                '自定义模式：\n', '根据您家门口实际情况设置录像和实时画面功能。\n可使用时长由具体设置决定。', 3))
          ],
        ));
  }
--- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_state.dart
+++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_state.dart
@ -18,21 +18,26 @@ class CatEyeWorkModeState {
  CatEyeWorkModeState() {
    Map map = Get.arguments;
    lockSetInfoData.value = map["lockSetInfoData"];
-    catEyeConfigData.value = map['catEyeConfigata'];
-    selectCatEyeWorkMode.value = catEyeConfigData.value.catEyeMode!;
+    if (map['catEyeConfigata'] != null) {
+      catEyeConfigData.value = map['catEyeConfigata'];
+      print('得到的猫眼配置数据是：${catEyeConfigData.value}');
+      selectCatEyeWorkMode.value = catEyeConfigData.value.catEyeMode!;

-    if (catEyeConfigData.value.catEyeMode ==
-        XSConstantMacro.catEyeWorkModePowerSaving) {
-      boolList[0] = true;
-    } else if (catEyeConfigData.value.catEyeMode ==
-        XSConstantMacro.catEyeWorkModeStayCapture) {
-      boolList[1] = true;
-    } else if (catEyeConfigData.value.catEyeMode ==
-        XSConstantMacro.catEyeWorkModeRealTimeMonitoring) {
-      boolList[2] = true;
-    } else if (catEyeConfigData.value.catEyeMode ==
-        XSConstantMacro.catEyeWorkModeCustom) {
-      boolList[3] = true;
+      if (catEyeConfigData.value.catEyeMode ==
+          XSConstantMacro.catEyeWorkModePowerSaving) {
+        boolList[0] = true;
+      } else if (catEyeConfigData.value.catEyeMode ==
+          XSConstantMacro.catEyeWorkModeStayCapture) {
+        boolList[1] = true;
+      } else if (catEyeConfigData.value.catEyeMode ==
+          XSConstantMacro.catEyeWorkModeRealTimeMonitoring) {
+        boolList[2] = true;
+      } else if (catEyeConfigData.value.catEyeMode ==
+          XSConstantMacro.catEyeWorkModeCustom) {
+        boolList[3] = true;
+      }
+    } else {
+      catEyeConfigData.value = CatEyeConfig();
    }
  }
 }
--- a/star_lock/lib/network/api.dart
+++ b/star_lock/lib/network/api.dart
@ -149,7 +149,8 @@ abstract class Api {
  final String expireLockListURL = '/keyUser/listExpireUser'; //即将到期的锁列表
  final String expirePasswordListURL = '/keyUser/listExpirePwd'; //即将到期的密码列表
  final String expireCardListURL = '/keyUser/listExpireCard'; //即将到期的卡列表
-  final String expireFingerprintListURL = '/keyUser/listExpireFingerprint'; //即将到期的指纹列表
+  final String expireFingerprintListURL =
+      '/keyUser/listExpireFingerprint'; //即将到期的指纹列表
  final String expireFaceListURL = '//keyUser/listExpireFace'; //即将到期的人脸列表
  final String userSettingsInfoURL = '/user/userSettingsInfo'; //个人设置信息
  final String setAlertModeURL = '/user/setAlertMode'; //提示音
@ -158,7 +159,7 @@ abstract class Api {
  final String selectLockListURL = '/room/listForTransfer'; //选择锁列表
  final String setAppUnlockMustOnlineURL =
      '/room/setAppUnlockMustOnline'; //APP开锁时需手机联网的锁
-  final String userLogoutURL = '/user/logout'; //退出登录
+  final String userLogoutURL = '/v2/user/logout'; //退出登录
  final String deleteAccountURL = '/user/delete'; //删除账号
  final String getUserInfoURL = '/user/getUserInfo'; //获取个人信息
  final String sendValidationCodeAuthURL =