From 179f2a52df290af2a66af1215c0cedabdf7bdf91 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Sat, 19 Oct 2024 19:11:40 +0800
Subject: [PATCH] =?utf8?q?#105=205=E6=89=8B=E8=A1=A8=E5=BC=80=E5=90=AF?=
 =?utf8?q?=E5=8B=BF=E6=89=B0=E6=A8=A1=E5=BC=8F=E8=A1=A8=E7=9B=98=E7=95=8C?=
 =?utf8?q?=E9=9D=A2=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=8B=BF=E6=89=B0=E5=9B=BE?=
 =?utf8?q?=E6=A0=87=EF=BC=8C=E9=87=8D=E5=90=AF=E5=90=8E=E8=A1=A8=E7=9B=98?=
 =?utf8?q?=E5=8B=BF=E6=89=B0=E5=9B=BE=E6=A0=87=E6=B6=88=E5=A4=B1=EF=BC=88?=
 =?utf8?q?=E5=AE=9E=E9=99=85=E8=BF=98=E6=98=AF=E5=8B=BF=E6=89=B0=E7=8A=B6?=
 =?utf8?q?=E6=80=81=EF=BC=8C=E4=B8=8B=E6=8B=89=E7=8A=B6=E6=80=81=E6=A0=8F?=
 =?utf8?q?=E7=9A=84=E5=8B=BF=E6=89=B0=E5=9B=BE=E6=A0=87=E6=98=AF=E9=AB=98?=
 =?utf8?q?=E4=BA=AE=E7=9A=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativelauncher/src/NativeLauncher.cpp     | 16 ++-----------
 .../nativeui/main/include/MainModel.h         |  1 +
 .../fd230app/nativeui/main/src/MainModel.cpp  | 24 +++++++++++++++++++
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 4a88ed348..693efba74 100644
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -553,20 +553,8 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadMessagesFromStorage failed!");
             }
 
-            /*开机检查如果设置了密码锁，进行锁屏*/
-            int lockstate = OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH);  
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "lockstate = %d", lockstate);  
-            // 打印锁定状态判断  
-            if (lockstate == 1)  
-            {  
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Device is locked (lock state == 1)");
-                if (uapi_dev_runtime_get_lock_status() == 0)  
-                {  
-                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Device is unlocked (lock status == 0)");  
-                    uapi_dev_runtime_set_lock_status(1); // 上锁  
-                    OHOS::MainModel::GetInstance().setDialState(OHOS::DialState::LOCK, true);  
-                }  
-            }
+            //更新主表盘配置
+            MainModel::GetInstance().InitDialState();
 
             // 开机增加震动 页面启动震动一次
             ui_api_vibrate_once_func();
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h
index cc26587e9..a5781cdb4 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h
@@ -82,6 +82,7 @@ namespace OHOS
         bool getMessageActiveState();
         void printDialStates();
         void UpdateDialState();
+        void InitDialState();
 
     private:
         void InitDialSettingDefault(int Id);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
index 3a4e3e877..ae2677280 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -16,6 +16,11 @@
 #include "MainViewSample.h"
 #include "ui_service.h"
 #include "SetDialModel.h"
+#include "dnotdisturb/include/DnotDisturbModel.h"
+#include "custom_utils.h"
+
+extern "C" void uapi_dev_runtime_set_lock_status(uint8_t status);
+
 namespace OHOS
 {
     static const int CARD_SETTING_VALUE_LEN = 32;
@@ -525,6 +530,25 @@ namespace OHOS
         管理状态：勿扰 睡眠 密码锁
     */
 
+    // 开机读取手表配置  
+    void MainModel::InitDialState(void) {  
+        // 获取加锁状态  
+        int lockstate = OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH);  
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "lockstate = %d", lockstate);  
+
+        // 判断加锁状态  
+        if (lockstate == 1) {  
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Device is locked (lock state == 1)");  
+            uapi_dev_runtime_set_lock_status(1); // 上锁  
+            dialstateInfo[static_cast<int>(DialState::LOCK)].active = true; // 设置锁定状态为真  
+        }  
+
+        // 判断勿扰模式  
+        dialstateInfo[static_cast<int>(DialState::DO_NOT_DISTURB)].active = DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled();  
+
+        // 判断睡眠状态 
+    }
+
     // 接口 1: 设置某个状态的属性
     void MainModel::setDialState(DialState state, bool value)
     {
-- 
2.17.1