From 02a6e29d0e3b851750e8938b703368791d2a34de Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Thu, 15 Aug 2024 16:27:58 +0800 Subject: [PATCH] =?utf8?q?=E5=8A=9F=E8=83=BD=E9=94=AE=E4=BC=98=E5=8C=96?= =?utf8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=9C=A8=E8=BF=9B=E5=85=A5AI?= =?utf8?q?=E6=A8=A1=E5=9E=8B=E7=95=8C=E9=9D=A2=E4=B8=AD=E5=88=87=E6=8D=A2?= =?utf8?q?=E6=A8=A1=E5=9E=8B=E6=97=B6=E5=80=99=E5=B1=8F=E5=B9=95=E6=81=AF?= =?utf8?q?=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../rebootandshutdown/src/RebootAndShutdownModel.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 0a994a068..b258fd907 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-15 14:54:53 + * @LastEditTime: 2024-08-15 16:22:03 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp */ @@ -171,11 +171,10 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "power_display_svr_get_api returned nullptr"); return; } - if(display_api->get_screen_state() == SCREEN_OFF) - { - display_api->turn_on_screen(); - } - else + /* -------------------------------------------------------------------------- */ + display_api->turn_on_screen(); + /* -------------------------------------------------------------------------- */ + if(display_api->get_screen_state() == SCREEN_ON) { uint16_t curSliceId = NativeAbility::GetInstance().GetCurSliceId(); if (curSliceId == VIEW_AI_VOICE) // 如果当前已在ai语音界面不做切换 -- 2.17.1