From: Caisking <3449750381@qq.com>
Date: Mon, 28 Oct 2024 02:27:14 +0000 (+0800)
Subject: #110 3手表独立运动时还弹出app训练页设置的心率提醒
X-Git-Tag: fd230_release_V1.3.102~177^2~2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1272%2F2;p=mirrors%2FFD230.git

#110 3手表独立运动时还弹出app训练页设置的心率提醒
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
index 20d502958..41d2f9d9e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
@@ -345,6 +345,7 @@ public:
 
   //配置用户信息
   void SetUserSportdata();
+  void SetMaxHeart(int maxheart);
 
 private:
   TraingModel(const TraingModel &) = delete;
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 25c31fddc..ad68fa4bf 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -444,7 +444,7 @@ void TraingModel::AnalysisData(cywee_activity_result_t *cyweeInfo) {
   }
 
   // 心率提醒
-  if (sportdata->heart >= user_maxHeart) {
+  if (sportdata->heart >= user_maxHeart && user_maxHeart != 0) {
     uapi_set_screen_on_api(); // 亮屏检测
     if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() &&
         (!uapi_sleep_mode_flag_get())) {
@@ -1197,6 +1197,12 @@ void TraingModel::SetUserSportdata() {
   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "用户运动强度心率: %d",
                 user_Intensity);
 }
+//运动过程中更新心率配置
+void TraingModel::SetMaxHeart(int maxheart) {
+  // 获取用户运动数据配置
+  user_maxHeart = maxheart;
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "用户最高心率: %d", user_maxHeart);
+}
 /*配速表与心率表相关*/
 //清空心率表
 void TraingModel::ClearHeartTable() {
@@ -1419,7 +1425,7 @@ void TraingModel::SendLiveData() {
                 sportdata->starttime);
   data.st = sportdata->starttime;
   data.hr = sportdata->heart;
-  data.ca = sportdata->calories*10;//app端需要乘10
+  data.ca = sportdata->calories * 10; // app端需要乘10
   data.di = sportdata->distance;
   data.stp = sportdata->steps;
   data.ti = sportdata->intensity;
diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
index be1da0235..05d6bd5ad 100644
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -2113,10 +2113,11 @@ void set_traning_updata_freq(uint8_t freq)
     return;
 }
 
-
+/*设置最大心率提醒*/
 void set_traning_heart_max(uint8_t data)
 {
-    OHOS::ConfigModel *p_ConfigModel  =  OHOS::ConfigModel::GetInstance();
+    OHOS::ConfigModel *p_ConfigModel = OHOS::ConfigModel::GetInstance();
+    OHOS::TraingModel::GetInstance()->SetMaxHeart(data);
     p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_TRAINING_HEART_MAX,data);
     return;
 }