修复设备训练目标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 4eefcfb..b8997df 100644 (file)
--- 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 9ea002e..cee04da 100644 (file)
--- 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 819ae42..167fa60 100644 (file)
--- 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 187d7ef..deed5f7 100644 (file)
--- 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)
     \r
     uint32_t data_len=strlen(jsonString);\r
     printf("发送训练实时数据%d %s\r\n",data_len,jsonString);\r
-    send_big_data(0,jsonString,data_len,data_len,1,1,0x15,1);\r
+    send_big_data(0,jsonString,data_len,data_len,1,1,0x0f,1);\r
     cJSON_free(jsonString);\r
     cJSON_Delete(dataJSON);\r
 }\r
@@ -1280,18 +1280,15 @@ static uint8_t jsonCheck_targetparam(uint8_t *buf)//训练目标参数
         training_ble_data.controlmd=SETGOAL;\r
         //CustomEventPublish(TOPIC_EVENT_BLE_TRAINING,(uint8_t*)&training_ble_data,sizeof(training_ble));\r
     }\r
-\r
+    \r
     cJSON* di = cJSON_GetObjectItem(root, "di");//目标距离\r
     if (cJSON_IsNumber(di)) {\r
         printf("di: %d\n", di->valueint);\r
         training_ble_data.sportTag=di->valueint;\r
-\r
         CustomEventPublish(TOPIC_EVENT_BLE_TRAINING,(uint8_t*)&training_ble_data,sizeof(training_ble));\r
-        \r
-        \r
     }\r
     cJSON* ca = cJSON_GetObjectItem(root, "ca");//目标卡路里\r
-    if (cJSON_IsNumber(di)) {\r
+    if (cJSON_IsNumber(ca)) {\r
         printf("ca: %d\n", ca->valueint);\r
         training_ble_data.sportTag=ca->valueint;\r
          CustomEventPublish(TOPIC_EVENT_BLE_TRAINING,(uint8_t*)&training_ble_data,sizeof(training_ble));\r
@@ -2568,53 +2565,36 @@ static void SetRTDataFreCmd(uint16_t cmd,uint8_t *crcnum,uint16_t len,uint8_t *t
     }\r
 }\r
 //获取实时训练数据\r
-void getSportData(char *buf)\r
-{\r
-    cJSON *dataJSON = cJSON_CreateObject();\r
-    cJSON_AddNumberToObject(dataJSON,"st",1637825067);\r
-    cJSON_AddNumberToObject(dataJSON,"hr",120);\r
-    cJSON_AddNumberToObject(dataJSON,"ca",3657);\r
-    cJSON_AddNumberToObject(dataJSON,"di",5274);\r
-    cJSON_AddNumberToObject(dataJSON,"stp",1234);\r
-    cJSON_AddNumberToObject(dataJSON,"ti",3);\r
-    char *json_format = cJSON_PrintUnformatted(dataJSON);\r
-    printf("%s",json_format);\r
-    cJSON_Delete(dataJSON);\r
-    int dataLen = strlen(json_format);\r
-    memcpy(buf,json_format,dataLen);\r
-    return;\r
-\r
-}\r
+// void getSportData(char *buf)\r
+// {\r
+//     cJSON *dataJSON = cJSON_CreateObject();\r
+//     cJSON_AddNumberToObject(dataJSON,"st",1637825067);\r
+//     cJSON_AddNumberToObject(dataJSON,"hr",120);\r
+//     cJSON_AddNumberToObject(dataJSON,"ca",3657);\r
+//     cJSON_AddNumberToObject(dataJSON,"di",5274);\r
+//     cJSON_AddNumberToObject(dataJSON,"stp",1234);\r
+//     cJSON_AddNumberToObject(dataJSON,"ti",3);\r
+//     char *json_format = cJSON_PrintUnformatted(dataJSON);\r
+//     printf("%s",json_format);\r
+//     cJSON_Delete(dataJSON);\r
+//     int dataLen = strlen(json_format);\r
+//     memcpy(buf,json_format,dataLen);\r
+//     return;\r
+// }\r
 void sendRealTimeDataToAPP(uint8_t flag)\r
 {\r
-    uint8_t value[128];\r
-    memset(value,0,128);\r
-    \r
-    value[0] = 0x72;\r
-    value[1] = 0x01;\r
-    value[2] = 0x0f;\r
-    char buf[128];\r
-    memset(buf,0,128);\r
-    getSportData(&buf);\r
-    uint32_t tmp = 1;\r
-    uint32_t datalen = 1;\r
-    uint16_t tmp_data = 1;\r
-    datalen = strlen(buf);\r
-    tmp_data = datalen;\r
-    memcpy(value+3,&tmp,4);\r
-    memcpy(value+7,&datalen,4);\r
-    memcpy(value+11,&tmp,4);\r
-    memcpy(value+15,&tmp_data,2);\r
     if(flag != 0)//校验失败\r
     {\r
-        memcpy(&value[17],buf,strlen(buf));\r
-        value[strlen(buf)+17] = Calculate_CRC(value,17+strlen(buf));\r
-        sendBleData(value,strlen(buf)+17+1);\r
+        send_big_data(0,NULL,1,data_len,1,1,0x0f,1);\r
+\r
     }else\r
     {\r
-        value[17] = 0;\r
-        value[18] = Calculate_CRC(value,18);\r
-        sendBleData(value,19);\r
+        training_ble_data.sportType= 4;//运动类型 0 健走 1跑步 2骑行 3\r
+        training_ble_data.controlmd= SENDDATA;\r
+        printf("发送运动实时数据\r\n");\r
+\r
+        CustomEventPublish(TOPIC_EVENT_BLE_TRAINING,(uint8_t*)&training_ble_data,sizeof(training_ble));\r
+        \r
     }\r
     \r
 }\r