From: Caisking <3449750381@qq.com>
Date: Thu, 22 Aug 2024 13:00:05 +0000 (+0800)
Subject: 密码锁死机优化待测试
X-Git-Tag: release_V1.2.70_20241020_135402~589^2~10
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=789cb52d7f1d42f3f47059b5d2637dcd9a7a5de9;p=mirrors%2FFD230.git

密码锁死机优化待测试
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp b/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
index deac43619..89f546478 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
@@ -48,8 +48,12 @@ extern "C"
                           sc->screen_off_time_interval);
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GetNativeAbilityState = %u",
                           OHOS::NativeAbility::GetInstance().GetNativeAbilityState());
+                               /*密码锁开关被打开*/
+        if (OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH))
+        {
             if (OHOS::NativeAbility::GetInstance().GetNativeAbilityState() == STATE_ACTIVE)
             {
+
 #if 0
                 if (current_slice_id != VIEW_MAIN)
                 {
@@ -65,16 +69,11 @@ extern "C"
                     }
                 }
 #endif
-                /*密码锁开关被打开*/
-                if (OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH))
-                {
                     /*如果是未上锁界面或者是密码锁界面*/
                     if (uapi_dev_runtime_get_lock_status() == 0)
                     {
                         /*重新进入一次主界面*/
                         OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
-                        // 切换回主表盘页面
-                        OHOS::MainViewSample::GetInstance()->SwitchToClockPage();
                         /*上锁*/
                         uapi_dev_runtime_set_lock_status(1);
                         /*设置表盘状态*/