增加在密码锁界面回退到主界面

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 78165a0..eb3f05b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
@@ -67,14 +67,18 @@ extern "C"
                 /*密码锁开关被打开*/
                 if (OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH))
                 {
-                    /*重新进入一次主界面*/
-                    OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
-                    // 切换回主表盘页面
-                    OHOS::MainViewSample::GetInstance()->SwitchToClockPage();
-                    /*上锁*/
-                    uapi_dev_runtime_set_lock_status(1);
-                    /*设置表盘状态*/
-                    OHOS::MainModel::GetInstance().setDialState(OHOS::DialState::LOCK, true);
+                    /*如果是未上锁界面或者是密码锁界面*/
+                    if (uapi_dev_runtime_get_lock_status() == 0 || (current_slice_id == VIEW_CODED_LOCK))
+                    {
+                        /*重新进入一次主界面*/
+                        OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
+                        // 切换回主表盘页面
+                        OHOS::MainViewSample::GetInstance()->SwitchToClockPage();
+                        /*上锁*/
+                        uapi_dev_runtime_set_lock_status(1);
+                        /*设置表盘状态*/
+                        OHOS::MainModel::GetInstance().setDialState(OHOS::DialState::LOCK, true);
+                    }
                 }
             }
         }