From: luozheng <1732036298@qq.com>
Date: Fri, 23 Aug 2024 07:37:23 +0000 (+0800)
Subject: 进入密码锁界面后按按键拦截再次进入
X-Git-Tag: release_V1.2.70_20241020_135402~549^2~36
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8d2ea427882d570913162bf7c7385efbb455230f;p=mirrors%2FFD230.git

进入密码锁界面后按按键拦截再次进入
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
index d5646ec32..056b1e367 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-07-18 14:55:27
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-21 18:02:08
+ * @LastEditTime: 2024-08-22 20:02:18
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
  */
 
@@ -239,7 +239,10 @@ namespace OHOS
                 /*被锁*/
                 if (uapi_dev_runtime_get_lock_status())
                 {
-                    NativeAbility::GetInstance().EnterSlice(VIEW_CODED_LOCK);
+                    if (curSliceId != VIEW_CODED_LOCK)
+                    {
+                        NativeAbility::GetInstance().EnterSlice(VIEW_CODED_LOCK);
+                    }
                     return;
                 }
             }
@@ -307,7 +310,10 @@ namespace OHOS
                 /*被锁*/
                 if (uapi_dev_runtime_get_lock_status())
                 {
-                    NativeAbility::GetInstance().EnterSlice(VIEW_CODED_LOCK);
+                    if (curSliceId != VIEW_CODED_LOCK)
+                    {
+                        NativeAbility::GetInstance().EnterSlice(VIEW_CODED_LOCK);
+                    }
                     return;
                 }
             }
@@ -318,7 +324,7 @@ namespace OHOS
             }
             else
             {
-                NativeAbility::GetInstance().EnterSlice(VIEW_AI_VOICE);// 切换到Ai语音界面
+                NativeAbility::GetInstance().EnterSlice(VIEW_AI_VOICE); // 切换到Ai语音界面
             }
         }
         else
@@ -376,7 +382,10 @@ namespace OHOS
                 /*被锁*/
                 if (uapi_dev_runtime_get_lock_status())
                 {
-                    NativeAbility::GetInstance().EnterSlice(VIEW_CODED_LOCK);
+                    if (curSliceId != VIEW_CODED_LOCK)
+                    {
+                        NativeAbility::GetInstance().EnterSlice(VIEW_CODED_LOCK);
+                    }
                     return;
                 }
             }