#1085 APP拉起手表室外行走运动联动，运动完成，手表端完练页配速与APP端完练页配速不一致

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 ad68fa4..61d41fc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -333,6 +333,7 @@ void TraingModel::IsSpecialSport(UIResourceTextId sportId_) {
     isspecialsport_ = false;
     break;
   }
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " 特殊训练 %d 训练项 %d", isspecialsport_,sportId_);
 }
 
 bool TraingModel::GetIsSpecial() { return isspecialsport_; }
@@ -833,7 +834,7 @@ int TraingModel::Averageheartrate(int newHeartRate) {
 }
 // 设置训练目标类型以及训练目标
 void TraingModel::SetSportTag(ExerciseTag tagtpye, int tag) {
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "tagtpye[%d] tag[%d]", tagtpye, tag);
+  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "设置目标 tagtpye[%d] tag[%d]", tagtpye, tag);
   sportTagType_ = tagtpye;
   sportTag_ = tag;
 }

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 0b1c7ef..9668d15 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -415,7 +415,8 @@ cJSON* ble_get_recs_data()
         cJSON* itemJSON = cJSON_CreateObject();
         if(data!=NULL)
         {
-            cJSON_AddNumberToObject(itemJSON,"src",data->src);
+            cJSON_AddNumberToObject(itemJSON, "src", data->src);
+            cJSON_AddNumberToObject(itemJSON,"bt",data->bt);
             cJSON_AddNumberToObject(itemJSON,"ty",data->ty);
             cJSON_AddNumberToObject(itemJSON,"st",data->st);
             cJSON_AddNumberToObject(itemJSON,"sp",data->sp);
@@ -429,7 +430,8 @@ cJSON* ble_get_recs_data()
             cJSON_AddNumberToObject(itemJSON,"stp",data->stp);
             cJSON_AddNumberToObject(itemJSON,"ti",data->ti);
             cJSON_AddNumberToObject(itemJSON,"cir",data->cir);
-            cJSON_AddNumberToObject(itemJSON,"alt",data->alt);
+            cJSON_AddNumberToObject(itemJSON, "alt", data->alt);
+            cJSON_AddNumberToObject(itemJSON,"apc",data->apc);
             cJSON_AddNumberToObject(itemJSON,"fpc",data->fpc);
             cJSON_AddNumberToObject(itemJSON,"spc",data->spc);
             cJSON_AddNumberToObject(itemJSON,"std",data->std);
@@ -476,8 +478,9 @@ cJSON* ble_get_Trainingdata_by_timetamp(uint32_t timetamp)
             if(time_error<=2)
             {
                 cJSON* itemJSON = cJSON_CreateObject();
-                
-                cJSON_AddNumberToObject(itemJSON,"src",data->src);
+
+                cJSON_AddNumberToObject(itemJSON, "src", data->src);
+                cJSON_AddNumberToObject(itemJSON,"bt",data->bt);
                 cJSON_AddNumberToObject(itemJSON,"ty",data->ty);
                 cJSON_AddNumberToObject(itemJSON,"st",data->st);
                 cJSON_AddNumberToObject(itemJSON,"sp",data->sp);
@@ -491,7 +494,8 @@ cJSON* ble_get_Trainingdata_by_timetamp(uint32_t timetamp)
                 cJSON_AddNumberToObject(itemJSON,"stp",data->stp);
                 cJSON_AddNumberToObject(itemJSON,"ti",data->ti);
                 cJSON_AddNumberToObject(itemJSON,"cir",data->cir);
-                cJSON_AddNumberToObject(itemJSON,"alt",data->alt);
+                cJSON_AddNumberToObject(itemJSON, "alt", data->alt);
+                cJSON_AddNumberToObject(itemJSON,"apc",data->apc);
                 cJSON_AddNumberToObject(itemJSON,"fpc",data->fpc);
                 cJSON_AddNumberToObject(itemJSON,"spc",data->spc);
                 cJSON_AddNumberToObject(itemJSON,"std",data->std);