增加动态心率数据

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 64bd565..b7bfcd0 100644 (file)
--- 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 84fe198..6039afc 100644 (file)
--- 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>\r
 #include <sstream>\r
 \r
-extern "C" void do_cywee_service_check_msg(int cmd,int data[]);\r
+extern "C" void do_cywee_service_check_msg(int cmd, int data[]);\r
 \r
 extern "C"\r
 {\r
@@ -111,26 +111,26 @@ namespace OHOS
     {\r
         // 根据不同的运动项目进行不同的运动\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingCardPresenter::OpenSensor!!");\r
-        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_EXIT,NULL);\r
+        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_EXIT, NULL);\r
         switch (type)\r
         {\r
         case ExerciseClass::NORMAL:\r
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE,NULL);\r
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NORMAL_MODE, NULL);\r
             break;\r
         case ExerciseClass::TREADMILL:\r
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_TREADMILL_MODE,NULL);\r
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_TREADMILL_MODE, NULL);\r
             break;\r
         case ExerciseClass::OUTDOOR:\r
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_OUTDOOR_RUNNING_MODE,NULL);\r
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_OUTDOOR_RUNNING_MODE, NULL);\r
             break;\r
         case ExerciseClass::INDOOR:\r
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_INDOOR_RUNNING_MODE,NULL);\r
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_INDOOR_RUNNING_MODE, NULL);\r
             break;\r
         case ExerciseClass::FITNESS_PEDOMETER:\r
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FITNESS_PEDOMETER_MODE,NULL);\r
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FITNESS_PEDOMETER_MODE, NULL);\r
             break;\r
         case ExerciseClass::FREE_TRAINING:\r
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FREE_TRAINING_MODE,NULL);\r
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_FREE_TRAINING_MODE, NULL);\r
             break;\r
         default:\r
             break;\r
@@ -149,10 +149,10 @@ namespace OHOS
             OpenSensor(ExerciseClass::NORMAL);\r
             break;\r
         case ExerciseState::Pause:\r
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_PAUSE,0);\r
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_PAUSE, 0);\r
             break;\r
         case ExerciseState::Continue:\r
-            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_RESUME,0);\r
+            do_cywee_service_check_msg(CYWEE_SERVICE_CMD_RESUME, 0);\r
             break;\r
         default:\r
             break;\r
@@ -184,10 +184,11 @@ namespace OHOS
         }\r
 \r
         std::string durationStr = std::to_string(sportdata->duration);\r
+        std::string heartStr = (sportdata->heart != 0) ? std::to_string(sportdata->heart) : "--";\r
         std::string stepsStr = (sportdata->steps != 0) ? std::to_string(sportdata->steps) : "--";\r
         std::string calorieStr = (sportdata->calories != 0) ? std::to_string(sportdata->calories) : "--";\r
 \r
-        TrainingDataView::GetInstance()->GetHeartLabel()->SetText("--");\r
+        TrainingDataView::GetInstance()->GetHeartLabel()->SetText(hal_gpio_ctrl_id_t.c_str());\r
 \r
         TrainingDetailView::GetInstance()->GetCalorieLabel()->SetText(calorieStr.c_str());\r
         TrainingDetailView::GetInstance()->GetMileLabel()->SetText(distanceStr.c_str());\r
@@ -252,7 +253,7 @@ namespace OHOS
             ControlSensor(ExerciseState::End);\r
             if (TraingCardView::GetInstance()->RefreshEndView())\r
             {\r
-                //进行存储操作？\r
+                // 进行存储操作？\r
                 NativeAbility::GetInstance().EnterSlice(VIEW_TRAININGWIN);\r
             }\r
             else\r