From: Caisking <3449750381@qq.com> Date: Tue, 3 Sep 2024 01:58:04 +0000 (+0800) Subject: 修复下拉电池框与自定义表盘电池框显示 X-Git-Tag: release_V1.2.70_20241020_135402~540^2~2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F860%2F1;p=mirrors%2FFD230.git 修复下拉电池框与自定义表盘电池框显示 --- 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 698e7ff46..b940daefb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/clock/src/MainClockView.cpp @@ -37,7 +37,7 @@ extern uint8_t battery_get_voltage(float *voltage); std::string Enweekdays[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; std::string Cnweekdays[] = {"星期天", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"}; -static constexpr const char *CHAGE_BATTERY = "/user/res/Battery/Charge_Icon.bin"; +static constexpr const char *CHAGE_BATTERY = "/user/res/Battery/Icon.bin"; static constexpr const char *WHITE_BATTERY = "/user/res/Battery/Battery_White.bin"; static constexpr const char *BLACK_BATTERY = "/user/res/Battery/Battery_Black.bin"; diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp index 39c1b8af0..aba99e1cd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp @@ -461,7 +461,7 @@ namespace OHOS return; } batteryimage->SetPosition(HD->GetX() + HD->GetWidth() + 10, (group1->GetHeight() - 30) / 2, 48, 30); - std::string batteryimagesPath = "/user/res/Battery/Battery-E.bin"; + std::string batteryimagesPath = "/user/res/Battery/Battery_White.bin"; batteryimage->SetSrc(batteryimagesPath.c_str()); group1->Add(batteryimage); /* -------------------------------------------------------------------------- */