From: luozheng <1732036298@qq.com> Date: Thu, 15 Aug 2024 08:27:58 +0000 (+0800) Subject: 功能键优化,修复在进入AI模型界面中切换模型时候屏幕息屏 X-Git-Tag: release_V1.2.70_20241020_135402~638^2~5^2~13 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=02a6e29d0e3b851750e8938b703368791d2a34de;p=mirrors%2FFD230.git 功能键优化,修复在进入AI模型界面中切换模型时候屏幕息屏 --- 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语音界面不做切换