From 8d2ea427882d570913162bf7c7385efbb455230f Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Fri, 23 Aug 2024 15:37:23 +0800 Subject: [PATCH] =?utf8?q?=E8=BF=9B=E5=85=A5=E5=AF=86=E7=A0=81=E9=94=81?= =?utf8?q?=E7=95=8C=E9=9D=A2=E5=90=8E=E6=8C=89=E6=8C=89=E9=94=AE=E6=8B=A6?= =?utf8?q?=E6=88=AA=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../src/RebootAndShutdownModel.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) 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; } } -- 2.17.1