修复同步实时运动数据存在的BUG

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 4c527ad..d017903 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -460,7 +460,7 @@ void sendtraningdata(msg_get_train_data_info_t *data)
     \r
     printf("发送训练实时数据 %d %s\n", data_len, jsonString);\r
     ble_data_type type={0x01,0x0f,data_len,1,1};\r
-    send_big_data(type,data,data_len);\r
+    send_big_data(type,jsonString,data_len);\r
     //send_big_data(0, jsonString, data_len, data_len, 1, 1, 0x0f, 1);\r
     \r
     cJSON_free(jsonString);\r
@@ -2677,6 +2677,47 @@ void APP_send_schedule_Cmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *tota
     } \r
 }\r
 \r
+bool bin_Check_sos(uint8_t *data,uint16_t len)\r
+{\r
+    return true;\r
+}\r
+\r
+void APP_send_sos_Cmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,uint8_t crcvalue)\r
+{\r
+    uint32_t tmp = 1;\r
+    uint16_t tmp_data = 1;\r
+    uint8_t sendBuf[19];\r
+    memset(sendBuf,0,19);\r
+    sendBuf[0] = 0x72;\r
+    sendBuf[1] = 0x02;\r
+    sendBuf[2] = 0x25;\r
+    memcpy(sendBuf+3,&tmp,4);\r
+    memcpy(sendBuf+7,&tmp,4);\r
+    memcpy(sendBuf+11,&tmp,4);\r
+    memcpy(sendBuf+15,&tmp_data,2);\r
+\r
+       if(Check_CRC(data,len,crcvalue))\r
+       {\r
+        \r
+        \r
+        if(bin_Check_sos(data,len))\r
+        {\r
+            sendBuf[17] = 1;\r
+        }\r
+        else\r
+        {\r
+            sendBuf[17] = 2;\r
+        }\r
+        sendBuf[18] = Calculate_CRC(sendBuf,18);\r
+        sendBleData(sendBuf,19);\r
+    }\r
+       else\r
+       {\r
+               sendBuf[17] = 0;\r
+        sendBuf[18] = Calculate_CRC(sendBuf,18);\r
+        sendBleData(sendBuf,19);\r
+    } \r
+}\r
 \r
 \r
 void GetGPSCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,uint8_t crcvalue)\r
@@ -2976,6 +3017,9 @@ void type2AE4Data(ble_read_data *buffer_handle,uint8_t *buf_cmd,uint8_t *data,ui
          case SYN_APP_SCHEDULE_DATA_CMD:\r
             APP_send_schedule_Cmd(typeID,data,datalen,totalData,crcvalue);\r
             break;\r
+         case APP_SEND_SOS_DATA_CMD:\r
+            APP_send_sos_Cmd(typeID,data,datalen,totalData,crcvalue);\r
+            break;\r
         \r
 \r
         default:\r
@@ -4646,7 +4690,11 @@ static void GetAiRecordCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *tota
     }\r
 }\r
 \r
-\r
+static void GetSOSDataCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totaldata,uint8_t crcvalue)\r
+{\r
+    ble_data_type type_={0x01,0x36,0,1,1};\r
+    send_big_data(type_,NULL,0);\r
+}\r
 //AI录音已经就绪\r
 static void AiIsReadyCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totaldata,uint8_t crcvalue)\r
 {\r
@@ -5290,6 +5338,10 @@ void type2AE3Data(ble_read_data *buffer_handle,uint8_t *cmd_buf ,uint8_t *data,u
         case APP_GET_AI_PCM_DATA_CMD:\r
             GetAiRecordCmd(cmd,data,datalen,totaldata,crcvalue);\r
             break;\r
+        case APP_GET_SOS_DATA_CMD:\r
+            GetSOSDataCmd(cmd,data,datalen,totaldata,crcvalue);\r
+            break;\r
+        \r
         case GET_SPECIF_TYPE_FILE_CMD://获取指定类型文件目录 \r
         case AI_IS_READ_DATA_CMD:\r
         case SYN_HEART_HISTORY_DATA_CMD://同步心率历史数据\r

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
index c6220eb..f2e2cae 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
@@ -96,10 +96,11 @@ void cameram_send_data(void);
 #define SYN_SLEEP_HISTORY_DATA_CMD 0x014B //同步睡眠历史数据
 #define SYN_GET_MSG_CONFIG_CMD 0x0133 //获取消息开关
 #define APP_GET_AI_PCM_DATA_CMD 0x0134 //APP获取录音文件
+#define APP_GET_SOS_DATA_CMD 0x0136 //APP获取SOS信息
 #define AI_IS_READ_DATA_CMD 0x0505 //AI准备就绪
 
-#define SET_DMP_MODE_CMD 0x0135
-#define GET_DMP_MODE_CMD 0x0136
+#define SET_DMP_MODE_CMD 0x0137
+#define GET_DMP_MODE_CMD 0x0138
 
 #define FIND_PHONE_CMD 0x0501
 
@@ -641,6 +642,7 @@ TYPE:02
 #define SYN_BASIC_REAL_HEATR_CMD 0x024B //同步基础训练试试心率记录
 #define APP_SEND_CHATGPT_KEY_CMD 0x0223 //APP发送chatGPT key
 #define SYN_APP_SCHEDULE_DATA_CMD 0x0224 //同步schedule信息
+#define APP_SEND_SOS_DATA_CMD 0x0225 //APP发送sos信息
 #define SYN_TODAY_BASIC_TRAIN_TXT_CMD 0x024D //同步当天任意时间之后的基础训练记录
 #define APP_SEND_AI_KEY_IS_AVAILABLE_CMD  0x0506 //查询AI是否可用，APP 回复