From fe14cb102a4cf18c06a3ecc734f9c0250a133822 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=A8=8B=E7=BE=BD=E9=A3=9E?= <2393524978@qq.com> Date: Tue, 30 Jul 2024 12:02:41 +0000 Subject: [PATCH] Merge #613 into sdk602patch0626 from refs/changes/613/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 首次开机，优化功能键触发条件 * refs/changes/613/head: (1 commits squashed) - 首次开机，优化功能键触发条件 Signed-off-by: dingtalk_kaxuzp <2393524978@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/613 --- .../src/RebootAndShutdownModel.cpp | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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 227c699be..e2733bff9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp @@ -165,6 +165,13 @@ namespace OHOS static void HandFuncKeyOnLongPress(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HandFuncKeyOnLongPress"); + + if(true == ConfigModel::GetInstance()->GetisFirstTimeStart()) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandFuncKeyOnLongPress: first time power on"); + return; + } + const power_display_svr_api_t *display_api = power_display_svr_get_api(); if (!display_api) { @@ -206,6 +213,12 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HandleFuncKeyOnClick"); + if(true == ConfigModel::GetInstance()->GetisFirstTimeStart()) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleFuncKeyOnClick: first time power on"); + return; + } + const power_display_svr_api_t *display_api = power_display_svr_get_api(); if (!display_api) { @@ -243,6 +256,13 @@ namespace OHOS static void HandleFuncKeyDoubleClick(void) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleFuncKeyDoubleClick"); + + if(true == ConfigModel::GetInstance()->GetisFirstTimeStart()) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleFuncKeyDoubleClick: first time power on"); + return; + } + const power_display_svr_api_t *display_api = power_display_svr_get_api(); if (!display_api) { -- 2.17.1