From: hcj <1224667075@qq.com>
Date: Thu, 25 Apr 2024 09:48:17 +0000 (+0800)
Subject: 修复设备训练目标BUG
X-Git-Tag: release_V1.2.70_20241020_135402~1126^2
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=refs%2Fchanges%2F84%2F1;p=mirrors%2FFD230.git

修复设备训练目标BUG
---

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 4eefcfb95..b8997df60 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
@@ -10,12 +10,12 @@
 #ifndef Traing_MODEL_H
 #define Traing_MODEL_H
 
-#include "BaseView.h"
-#include "View.h"
+//#include "BaseView.h"
+//#include "View.h"
 #include "string.h"
 #include "wearable_log.h"
 
-#include "traing/include/TraingModel.h"
+//#include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"
 #include "language/font/ui_resource_string.h"
 
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 9ea002e42..cee04da9f 100644
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -20,7 +20,7 @@
 #include "LanguageInit.h"
 #include "ConfigModel.h" 
 // #include "TraingCardPresenter.h"
-//#include "TraingModel.h"
+#include "TraingModel.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -53,7 +53,10 @@ extern "C" {
 #include "bletest.h"
 
 
-
+char *  struct_to_json_buf_malloc_()
+{
+    cJSON *data;
+}
 
 void add_addressbookToRead(char *data)//转化用于·c文件
 {
diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
index 819ae4276..167fa60f0 100644
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
@@ -60,6 +60,7 @@ enum TRANING
     STOP,
     RECOVER,
     SETGOAL,
+    SENDDATA,
 };
 
 typedef struct
diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 187d7efd4..deed5f76a 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -332,7 +332,7 @@ void sendtraningdata(msg_get_train_data_info_t *data)
     
     uint32_t data_len=strlen(jsonString);
     printf("发送训练实时数据%d %s\r\n",data_len,jsonString);
-    send_big_data(0,jsonString,data_len,data_len,1,1,0x15,1);
+    send_big_data(0,jsonString,data_len,data_len,1,1,0x0f,1);
     cJSON_free(jsonString);
     cJSON_Delete(dataJSON);
 }
@@ -1280,18 +1280,15 @@ static uint8_t jsonCheck_targetparam(uint8_t *buf)//训练目标参数
         training_ble_data.controlmd=SETGOAL;
         //CustomEventPublish(TOPIC_EVENT_BLE_TRAINING,(uint8_t*)&training_ble_data,sizeof(training_ble));
     }
-
+    
     cJSON* di = cJSON_GetObjectItem(root, "di");//目标距离
     if (cJSON_IsNumber(di)) {
         printf("di: %d\n", di->valueint);
         training_ble_data.sportTag=di->valueint;
-
         CustomEventPublish(TOPIC_EVENT_BLE_TRAINING,(uint8_t*)&training_ble_data,sizeof(training_ble));
-        
-        
     }
     cJSON* ca = cJSON_GetObjectItem(root, "ca");//目标卡路里
-    if (cJSON_IsNumber(di)) {
+    if (cJSON_IsNumber(ca)) {
         printf("ca: %d\n", ca->valueint);
         training_ble_data.sportTag=ca->valueint;
          CustomEventPublish(TOPIC_EVENT_BLE_TRAINING,(uint8_t*)&training_ble_data,sizeof(training_ble));
@@ -2568,53 +2565,36 @@ static void SetRTDataFreCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *t
     }
 }
 //获取实时训练数据
-void getSportData(char *buf)
-{
-    cJSON *dataJSON = cJSON_CreateObject();
-    cJSON_AddNumberToObject(dataJSON,"st",1637825067);
-    cJSON_AddNumberToObject(dataJSON,"hr",120);
-    cJSON_AddNumberToObject(dataJSON,"ca",3657);
-    cJSON_AddNumberToObject(dataJSON,"di",5274);
-    cJSON_AddNumberToObject(dataJSON,"stp",1234);
-    cJSON_AddNumberToObject(dataJSON,"ti",3);
-    char *json_format = cJSON_PrintUnformatted(dataJSON);
-    printf("%s",json_format);
-    cJSON_Delete(dataJSON);
-    int dataLen = strlen(json_format);
-    memcpy(buf,json_format,dataLen);
-    return;
-
-}
+// void getSportData(char *buf)
+// {
+//     cJSON *dataJSON = cJSON_CreateObject();
+//     cJSON_AddNumberToObject(dataJSON,"st",1637825067);
+//     cJSON_AddNumberToObject(dataJSON,"hr",120);
+//     cJSON_AddNumberToObject(dataJSON,"ca",3657);
+//     cJSON_AddNumberToObject(dataJSON,"di",5274);
+//     cJSON_AddNumberToObject(dataJSON,"stp",1234);
+//     cJSON_AddNumberToObject(dataJSON,"ti",3);
+//     char *json_format = cJSON_PrintUnformatted(dataJSON);
+//     printf("%s",json_format);
+//     cJSON_Delete(dataJSON);
+//     int dataLen = strlen(json_format);
+//     memcpy(buf,json_format,dataLen);
+//     return;
+// }
 void sendRealTimeDataToAPP(uint8_t flag)
 {
-    uint8_t value[128];
-    memset(value,0,128);
-    
-    value[0] = 0x72;
-    value[1] = 0x01;
-    value[2] = 0x0f;
-    char buf[128];
-    memset(buf,0,128);
-    getSportData(&buf);
-    uint32_t tmp = 1;
-    uint32_t datalen = 1;
-    uint16_t tmp_data = 1;
-    datalen = strlen(buf);
-    tmp_data = datalen;
-    memcpy(value+3,&tmp,4);
-    memcpy(value+7,&datalen,4);
-    memcpy(value+11,&tmp,4);
-    memcpy(value+15,&tmp_data,2);
     if(flag != 0)//校验失败
     {
-        memcpy(&value[17],buf,strlen(buf));
-        value[strlen(buf)+17] = Calculate_CRC(value,17+strlen(buf));
-        sendBleData(value,strlen(buf)+17+1);
+        send_big_data(0,NULL,1,data_len,1,1,0x0f,1);
+
     }else
     {
-        value[17] = 0;
-        value[18] = Calculate_CRC(value,18);
-        sendBleData(value,19);
+        training_ble_data.sportType= 4;//运动类型 0 健走 1跑步 2骑行 3
+        training_ble_data.controlmd= SENDDATA;
+        printf("发送运动实时数据\r\n");
+
+        CustomEventPublish(TOPIC_EVENT_BLE_TRAINING,(uint8_t*)&training_ble_data,sizeof(training_ble));
+        
     }
     
 }