暂时屏蔽dial的进度条颜色变化功能

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 ad5ee87..4138c95 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,8 @@
  #include <time.h>
  #include <unistd.h>
  
-//  extern uint8_t battery_get_voltage(float *voltage);
+ #include "battery_hal.h"
+ extern uint8_t battery_get_voltage(float *voltage);
  
  #define TIMEVIEW_UP 0
  #define TIMEVIEW_DOWN 1
@@ -579,8 +580,7 @@
          UpdateBatteryColor();  
  
          float voltage = 0.0F;  
-        //  int power = battery_get_voltage(&voltage);  
-        int power = 100;
+         int power = battery_get_voltage(&voltage);  
          if (power == power_)  
              return;  
  

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 34cf628..7a36adf 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
@@ -253,7 +253,7 @@ if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) {
             // else
             // {
                 /*进入表盘设置*/
-                // NativeAbility::GetInstance().ChangeSlice(VIEW_SET_DIAL);
+                NativeAbility::GetInstance().ChangeSlice(VIEW_SET_DIAL);
             // }
         }
         return true;

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressView.cpp
index aacccb8..f1846ec 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressView.cpp
@@ -1,8 +1,8 @@
 #include "DialBoxProgressView.h"
 #include "wearable_log.h"
 
-// #include "battery_hal.h"
-// extern uint8_t battery_get_voltage(float *voltage);
+#include "battery_hal.h"
+extern uint8_t battery_get_voltage(float *voltage);
 
 // 定义电量宏
 #define BATTERY_LOW_THRESHOLD 10
@@ -54,7 +54,7 @@ void DialBoxProgressView::HandleFloatData(float data) {
   // 获取数据类型
   datatype_ = ExtractDataType(data); //类型为前4位
   float value = ExtractValue(data);  //数值为后28位
-  WEARABLE_LOGD("DialBoxProgressView", "HandleFloatData: %d %f", datatype_,
+  WEARABLE_LOGE("DialBoxProgressView", "HandleFloatData: %d %f", datatype_,
                 value);
 
   if (datatype_ == BATTERY_LEVEL) {
@@ -69,8 +69,7 @@ void DialBoxProgressView::HandleFloatData(float data) {
 }
 
 void DialBoxProgressView::UpdateBatteryColor() {
-  // bool isCharging = get_charge_stat(); // 获取充电状态
-  bool isCharging  = false;
+  bool isCharging = get_charge_stat(); // 获取充电状态
 
   if (isCharging) {
     SetViewColor(Color::Green().full); // 充电状态为绿色

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 4997b99..057afe7 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
@@ -25,8 +25,8 @@
 #include <string>
 #include "wearable_log.h"
 
-// #include "battery_hal.h"
-// extern uint8_t battery_get_voltage(float *voltage);
+#include "battery_hal.h"
+extern uint8_t battery_get_voltage(float *voltage);
 
 REGIST_DIAL_MODULE(OHOS::DialDataType::BATTERY, OHOS::DialModelPower::GetInstance());
 
@@ -37,23 +37,22 @@ namespace OHOS
         (void)type;
 
         float voltage = 0.0F;
-        // power_ = battery_get_voltage(&voltage);
-        // out = static_cast<float>(power_);
-        out = 0;
+        power_ = battery_get_voltage(&voltage);
+        out = static_cast<float>(power_);
         return true;
     }
 
     void DialModelPower::UpdatePower()
     {
-        // float voltage = 0.0F;
-        // power_ = battery_get_voltage(&voltage);
-        // if (power_ == 0)
-        // {
-        //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to get battery voltage");
-        //     return;
-        // }
-        // powerUpdated_ = true;
-        // NotifyPowerUpdate();
+        float voltage = 0.0F;
+        power_ = battery_get_voltage(&voltage);
+        if (power_ == 0)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to get battery voltage");
+            return;
+        }
+        powerUpdated_ = true;
+        NotifyPowerUpdate();
     }
 
     void DialModelPower::NotifyPowerUpdate() {

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 bc6da4a..c939320 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
@@ -6,7 +6,6 @@
 #include "wearable_log.h"
 #include <string>
 
-
 #include "battery_hal.h"
 extern uint8_t battery_get_voltage(float *voltage);
 
@@ -21,7 +20,7 @@ bool DialModelPowerStanby::GetDialFloatData(DialDataType &type, float &out) {
   float voltage = 0.0F;
   PowerStanby_ = battery_get_voltage(&voltage);
 
-  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Battery voltage obtained: %.2f",
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Battery voltage obtained: %.2f",
                 voltage);
 
   // 计算映射值
@@ -45,7 +44,7 @@ bool DialModelPowerStanby::GetDialFloatData(DialDataType &type, float &out) {
   out = DialBoxProgressView::GetInstance()->ConvertToRequiredFormat(
       DialBoxDataType::BATTERY_LEVEL, PowerStanby_);
 
-  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Mapped value sent to caller: %.2f",
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Mapped value sent to caller: %.2f",
                 out);
 
   return true;
@@ -68,8 +67,8 @@ void DialModelPowerStanby::NotifyPowerStanbyUpdate() {
     onChangeListener_ = new OnDialDataUpdateListener();
   }
   if (onChangeListener_ != nullptr) {
-    onChangeListener_->OnDialFloatDataUpdate(
-        OHOS::DialDataType::POWER_STANDBY, PowerStanby_);
+    onChangeListener_->OnDialFloatDataUpdate(OHOS::DialDataType::POWER_STANDBY,
+                                             PowerStanby_);
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[UpdatePowerStanby!]\r\n");
   }
 }

diff --git a/code/sdk/zhihui/drivers/ppg/hal/ppg_hal.c b/code/sdk/zhihui/drivers/ppg/hal/ppg_hal.c
index a123a3a..0884b8c 100644 (file)
--- a/code/sdk/zhihui/drivers/ppg/hal/ppg_hal.c
+++ b/code/sdk/zhihui/drivers/ppg/hal/ppg_hal.c
@@ -64,7 +64,7 @@ void ppg_power_off(void)
     LOS_Mdelay(50);
 #endif
 }
-
+/*获取心率值*/
 uint8_t ppg_get_hrs(void)
 {
     uint8_t hrs = 0;
@@ -74,7 +74,7 @@ uint8_t ppg_get_hrs(void)
 #endif
     return hrs;
 }
-
+/*获取spo2*/
 uint8_t ppg_get_spo2(void)
 {
     uint8_t spo2 = 0;
@@ -83,7 +83,7 @@ uint8_t ppg_get_spo2(void)
 #endif
     return spo2;
 }
-
+/*获取配置状态*/
 uint8_t ppg_get_wear_status(void)
 {
     uint8_t wear_status = 0;