From 8964c1173c276baad30ca1e6519a8cbd9de1ea3d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com> Date: Fri, 13 Jun 2025 02:18:42 +0000 Subject: [PATCH] Merge #1816 into sdk602patch0911 from refs/changes/1816/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 袁清梦 * refs/changes/1816/head: (2 commits squashed) - 修复N9电池文本显示 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1816 --- .../wearable/fd230app/nativeui/clock/src/MainClockView.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp index f8bec7554..623cce3e0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp @@ -568,8 +568,10 @@ namespace OHOS datelabel->SetText(dateStr.c_str()); // Update battery status + #if !defined(BOARD_W9) // N9需要显示电池 if (batterySetting == BATTERY_DISPLAY_NONE) return; + #endif UpdateBatteryColor(); -- 2.17.1