删除多余的电量函数

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 0f8b47a..dd2b957 100644 (file)
--- 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 <unistd.h>
 #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 41f21ee..a218fb8 100644 (file)
--- 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 40ad29d..cfb25cc 100644 (file)
--- 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 cb32145..92ecdb3 100644 (file)
--- 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<float>(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 80044c3..52fdddb 100644 (file)
--- 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<float>(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 9046431..fa40706 100644 (file)
--- 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<float>(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 0f858b7..f3eff6c 100644 (file)
--- 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 b2fe68a..d49bed5 100644 (file)
--- 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 9a1a647..4185b3e 100644 (file)
--- 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
     }