From: Caisking <3449750381@qq.com>
Date: Wed, 17 Apr 2024 08:36:32 +0000 (+0800)
Subject: 增加动态心率数据
X-Git-Tag: release_V1.2.70_20241020_135402~1174^2~10
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=06ed58b2b813a1bdbeb25a07b05612a84a8dbc48;p=mirrors%2FFD230.git

增加动态心率数据
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
index 64bd565b6..b7bfcd065 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -387,6 +387,8 @@ namespace OHOS
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " AnalysisData %d", type);
         // 通用数据
         sportdata->calories = cyweeInfo->calories;
+        sportdata->heart = cyweeInfo->hrs;
+        sportdata->avgheart = CalculateAverageHeartRate(cyweeInfo->hrs); // 处理平均心率
         // sportdata->duration = cyweeInfo->duration;
         PRINT("normal sportdata->calories[%d],sportdata->duration[%d] \r\n", sportdata->calories, sportdata->duration);
         switch (type)
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index 84fe1985c..6039afc2d 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -14,7 +14,7 @@
 #include <iomanip>
 #include <sstream>
 
-extern "C" void do_cywee_service_check_msg(int cmd,int data[]);
+extern "C" void do_cywee_service_check_msg(int cmd, int data[]);
 
 extern "C"
 {
@@ -111,26 +111,26 @@ namespace OHOS
     {
         // 根据不同的运动项目进行不同的运动
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingCardPresenter::OpenSensor!!");
-        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_EXIT,NULL);
+        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_EXIT, NULL);
         switch (type)
         {
         case ExerciseClass::NORMAL:
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE,NULL);
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE, NULL);
             break;
         case ExerciseClass::TREADMILL:
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_TREADMILL_MODE,NULL);
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_TREADMILL_MODE, NULL);
             break;
         case ExerciseClass::OUTDOOR:
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_OUTDOOR_RUNNING_MODE,NULL);
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_OUTDOOR_RUNNING_MODE, NULL);
             break;
         case ExerciseClass::INDOOR:
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_INDOOR_RUNNING_MODE,NULL);
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_INDOOR_RUNNING_MODE, NULL);
             break;
         case ExerciseClass::FITNESS_PEDOMETER:
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FITNESS_PEDOMETER_MODE,NULL);
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FITNESS_PEDOMETER_MODE, NULL);
             break;
         case ExerciseClass::FREE_TRAINING:
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FREE_TRAINING_MODE,NULL);
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FREE_TRAINING_MODE, NULL);
             break;
         default:
             break;
@@ -149,10 +149,10 @@ namespace OHOS
             OpenSensor(ExerciseClass::NORMAL);
             break;
         case ExerciseState::Pause:
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_PAUSE,0);
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_PAUSE, 0);
             break;
         case ExerciseState::Continue:
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_RESUME,0);
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_RESUME, 0);
             break;
         default:
             break;
@@ -184,10 +184,11 @@ namespace OHOS
         }
 
         std::string durationStr = std::to_string(sportdata->duration);
+        std::string heartStr = (sportdata->heart != 0) ? std::to_string(sportdata->heart) : "--";
         std::string stepsStr = (sportdata->steps != 0) ? std::to_string(sportdata->steps) : "--";
         std::string calorieStr = (sportdata->calories != 0) ? std::to_string(sportdata->calories) : "--";
 
-        TrainingDataView::GetInstance()->GetHeartLabel()->SetText("--");
+        TrainingDataView::GetInstance()->GetHeartLabel()->SetText(hal_gpio_ctrl_id_t.c_str());
 
         TrainingDetailView::GetInstance()->GetCalorieLabel()->SetText(calorieStr.c_str());
         TrainingDetailView::GetInstance()->GetMileLabel()->SetText(distanceStr.c_str());
@@ -252,7 +253,7 @@ namespace OHOS
             ControlSensor(ExerciseState::End);
             if (TraingCardView::GetInstance()->RefreshEndView())
             {
-                //进行存储操作？
+                // 进行存储操作？
                 NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGWIN);
             }
             else