Merge #1816 into sdk602patch0911 from refs/changes/1816/head

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 <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1816

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 f8bec75..623cce3 100644 (file)
--- 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();