From d963b4d64aee521ecea8d7e7970a9688cac67d5a Mon Sep 17 00:00:00 2001 From: Caisking Date: Fri, 1 Aug 2025 11:38:40 +0800 Subject: [PATCH] =?utf8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84?= =?utf8?q?=E7=94=B5=E9=87=8F=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230/nativeapp/nativeui/clock/src/MainClockView.cpp | 1 - .../nativeapp/nativeui/main/src/MainPresenterSample.cpp | 1 - .../nativeui/main/src/dial/DialBoxProgressModel.cpp | 1 - .../nativeapp/nativeui/main/src/dial/DialModelPower.cpp | 7 ++++--- .../nativeui/main/src/dial/DialModelPowerMapper.cpp | 7 ++++--- .../nativeui/main/src/dial/DialModelPowerStandby.cpp | 6 ++++-- .../nativeapp/nativeui/main/src/dial/DialModelPowerStr.cpp | 5 ++--- .../nativeui/safemodemanager/src/SafeModeManagerModel.cpp | 6 ++++-- .../nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp | 1 - 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp index 0f8b47ae9..dd2b957e0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp @@ -36,7 +36,6 @@ #include #ifdef SUPPORT_BATTERY_SERVICE #include "battery_hal.h" -extern uint8_t battery_get_voltage(float *voltage); #endif #define TIMEVIEW_UP 0 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp index 41f21eec9..a218fb800 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp @@ -58,7 +58,6 @@ extern "C" { #ifdef SUPPORT_BATTERY_SERVICE #include "battery_hal.h" -extern uint8_t battery_get_voltage(float *voltage); #endif } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressModel.cpp index 40ad29d2c..cfb25cc3c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressModel.cpp @@ -5,7 +5,6 @@ #ifdef SUPPORT_BATTERY_SERVICE #include "battery_hal.h" #endif -extern uint8_t battery_get_voltage(float *voltage); // 定义电量宏 #define BATTERY_LOW_THRESHOLD 10 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPower.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPower.cpp index cb32145c7..92ecdb3c0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPower.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPower.cpp @@ -28,7 +28,6 @@ #ifdef SUPPORT_BATTERY_SERVICE #include "battery_hal.h" #endif -extern uint8_t battery_get_voltage(float *voltage); REGIST_DIAL_MODULE(OHOS::DialDataType::BATTERY, OHOS::DialModelPower::GetInstance()); @@ -40,9 +39,9 @@ namespace OHOS float voltage = 0.0F; power_ = 0; - #ifdef SUPPORT_BATTERY_SERVICE + #ifdef SUPPORT_BATTERY_SERVICE power_ = battery_get_voltage(&voltage); - #endif + #endif out = static_cast(power_); return true; } @@ -50,7 +49,9 @@ namespace OHOS void DialModelPower::UpdatePower() { float voltage = 0.0F; + #ifdef SUPPORT_BATTERY_SERVICE power_ = battery_get_voltage(&voltage); + #endif if (power_ == 0) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to get battery voltage"); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerMapper.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerMapper.cpp index 80044c328..52fdddb04 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerMapper.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerMapper.cpp @@ -9,7 +9,6 @@ #ifdef SUPPORT_BATTERY_SERVICE #include "battery_hal.h" #endif -extern uint8_t battery_get_voltage(float *voltage); REGIST_DIAL_MODULE(OHOS::DialDataType::BATTERY_LEVEL, OHOS::DialModelPowerMapper::GetInstance()); @@ -19,9 +18,9 @@ bool DialModelPowerMapper::GetDialFloatData(DialDataType &type, float &out) { (void)type; float voltage = 0.0F; powermapper_ = 0; - #ifdef SUPPORT_BATTERY_SERVICE +#ifdef SUPPORT_BATTERY_SERVICE powermapper_ = battery_get_voltage(&voltage); - #endif +#endif //电量0~100 //映射0~1 powermapper_ = static_cast(powermapper_) / 100.0f; @@ -31,7 +30,9 @@ bool DialModelPowerMapper::GetDialFloatData(DialDataType &type, float &out) { void DialModelPowerMapper::UpdatePowerMapper() { float voltage = 0.0F; +#ifdef SUPPORT_BATTERY_SERVICE powermapper_ = battery_get_voltage(&voltage); +#endif if (powermapper_ == 0) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to get battery voltage"); return; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStandby.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStandby.cpp index 9046431f8..fa4070635 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStandby.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStandby.cpp @@ -12,7 +12,6 @@ #include "battery_hal.h" #endif -extern uint8_t battery_get_voltage(float *voltage); REGIST_DIAL_MODULE(OHOS::DialDataType::POWER_STANDBY, OHOS::DialModelPowerStanby::GetInstance()); @@ -57,7 +56,9 @@ bool DialModelPowerStanby::GetDialFloatData(DialDataType &type, float &out) { #else (void)type; float voltage = 0.0F; + #ifdef SUPPORT_BATTERY_SERVICE power_ = battery_get_voltage(&voltage); + #endif out = static_cast(power_); #endif @@ -66,8 +67,9 @@ bool DialModelPowerStanby::GetDialFloatData(DialDataType &type, float &out) { void DialModelPowerStanby::UpdatePowerStanby() { float voltage = 0.0F; +#ifdef SUPPORT_BATTERY_SERVICE PowerStanby_ = battery_get_voltage(&voltage); - +#endif if (PowerStanby_ == 0) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Failed to get battery voltage"); return; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStr.cpp index 0f858b7ef..f3eff6c96 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStr.cpp @@ -4,7 +4,6 @@ #ifdef SUPPORT_BATTERY_SERVICE #include "battery_hal.h" #endif -extern uint8_t battery_get_voltage(float *voltage); namespace OHOS { @@ -15,9 +14,9 @@ namespace OHOS (void)type; float voltage = 0.0F; uint8_t power_ = 0; - #ifdef SUPPORT_BATTERY_SERVICE + #ifdef SUPPORT_BATTERY_SERVICE power_ = battery_get_voltage(&voltage); - #endif + #endif dialPowerStr_ = std::to_string(power_) + "%"; out = &dialPowerStr_; strNum = 1; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/src/SafeModeManagerModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/src/SafeModeManagerModel.cpp index b2fe68ab9..d49bed5d7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/src/SafeModeManagerModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/src/SafeModeManagerModel.cpp @@ -43,7 +43,6 @@ extern "C" { // const char *get_version_string(void); #include "build_version.h" -extern uint8_t battery_get_voltage(float *voltage); // const char *get_version_string(void); bool resfile_checksum_thread(void); @@ -433,7 +432,10 @@ void SafeModeManagerModel::UpdateSginOperate() { std::string SafeModeManagerModel::get_voltage_and_version_string(void) { // 电量 float voltage = 0.0F; - uint8_t value = battery_get_voltage(&voltage); + uint8_t value = 0; +#ifdef SUPPORT_BATTERY_SERVICE + value = battery_get_voltage(&voltage); +#endif WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "battery_get_voltage = %d", value); // 版本号 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp index 9a1a6479c..4185b3ee7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp @@ -66,7 +66,6 @@ namespace OHOS #ifdef SUPPORT_BATTERY_SERVICE #include "build_version.h" #include "battery_hal.h" - extern uint8_t battery_get_voltage(float *voltage); const char *get_version_string(void); #endif } -- 2.17.1