From: SnickerSun <snickersun@163.com>
Date: Fri, 24 May 2024 12:35:08 +0000 (+0800)
Subject: 协议接收函数已经验证，取消以前的接收方案
X-Git-Tag: release_V1.2.70_20241020_135402~1107
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=effa6509de454833458541260bf9243762451928;p=mirrors%2FFD230.git

协议接收函数已经验证，取消以前的接收方案
---

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 36dd0d8e6..b8ac042ef 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -371,8 +371,6 @@ uint8_t cmd_data[17];
 uint8_t *recvData;
 #include "los_memory.h"
 
-
-#if USE_PROTOCOL_EN_DE_BY_SNICKER
 #define MAX_BLE_MSG_PACKAGE_LEN (1024*5)  //包缓存最大5k
 #define BLE_MSG_TMP_FILE_NAME "/user/userdata/ble_tmp_buf_%04X"
 typedef struct 
@@ -401,27 +399,6 @@ static ble_read_data handle_l[MAX_HANDLE_NUM]={0};
 errcode_t cancel_recv_file(ble_read_data *buffer_handle);
 
 
-#else
-
-typedef struct 
-{
-    uint8_t *data;
-    int handle;
-    int data_len ;
-    int totalDataLen;
-    uint8_t cmd_data[17];
-    uint8_t crcvalue;
-} ble_read_data;
-
-#define MAX_HANDLE_NUM 10
-//LITE_OS_SEC_TEXT_MINOR UINT32 LOS_MemInfoGet(VOID *pool, LOS_MEM_POOL_STATUS *poolStatus)
-//根据特征值分开组合读取的数据，并处理
-static ble_read_data handle_l[MAX_HANDLE_NUM]={0};
-
-#endif
-
-
-
 
 
 
@@ -1959,8 +1936,6 @@ void GetWeatherCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,ui
     
 }
 
-
-#if USE_PROTOCOL_EN_DE_BY_SNICKER
 void getUserInfo(ble_read_data *buffer_handle,uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//
 {
     
@@ -2011,67 +1986,7 @@ void getUserInfo(ble_read_data *buffer_handle,uint16_t cmd,uint8_t *data,uint16_
         ble_reply_cmd(USER_INFOR_CMD,0);//crc error
     }
 }
-#else
-//APP下发设置用户数据
-void getUserInfo(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//
-{
-    
-    // 用户数据同步死机，
-    uint8_t value[19];
-    memset(value,0,19);
-    uint32_t tmp = 1;
-    value[0] =0x72;
-    value[1] =0x02;
-    value[2] =0x01;
-    memcpy(value+3,&tmp,4);
-    memcpy(value+7,&tmp,4);
-    memcpy(value+11,&tmp,4);
-    memcpy(value+15,&tmp,2);
-    if(Check_CRC(data,len,crcvalue))
-    {
-        printf("getUserInfo:!!!!!!!!\r\n");
-        msg_user_info_t user_info={0};
-        ble_recv_msg_callback_t func = ble_recv_get_send_msg_callback_func();
-        memset(&user_info,0,sizeof(msg_user_info_t));
-        
-        for(uint8_t i = 0;i<len;i++)
-        {
-            printf("%x ",data[i]);
-        }
-        user_info.age = data[0];
-        user_info.gender = data[1];
-        user_info.height  = data[2];
-        printf("getUserInfo:!!!!!!!!5555\r\n");
-        memcpy(&user_info.weight,data+3,2);
-        //memcpy(data+3,&user_info.weight,2);
-        memcpy(&user_info.target_step,data+5,4);
-         printf("getUserInfo:!!!!!!!!666\r\n");
-        //memcpy(data+5,&user_info.target_step,4);
-        memcpy(&user_info.fat_time,data+9,2);
-        user_info.target_stand = data[11];
-        user_info.timeformat = data[12];
-        uint32_t target_kcal = 0;
-        memcpy(&target_kcal,data+13,2);
-        printf("getUserInfo:!!!!!!!!99\r\n");
-        set_goal_caloriescount(target_kcal);
-        printf("getUserInfo:!!!!!!!!22\r\n");
-        uint8_t target_km = data[15];
-        printf("getUserInfo:!!!!!!!!22\r\n");
-        set_goal_discount(target_km);
-        printf("getUserInfo:!!!!!!!!333\r\n",user_info.age,user_info.gender,user_info.height,user_info.weight,user_info.target_step,user_info.fat_time,user_info.target_stand,
-        user_info.timeformat,user_info.timeformat);
-        set_user_data(&user_info);
-        printf("getUserInfo:!!!!!!!!444\r\n");
-        value[17] = 0x01;
-        value[18] = Calculate_CRC(value,18);
-        sendBleData(value,19);
-    }else{
-        value[17] = 0x00;
-        value[18] = Calculate_CRC(value,18);
-        sendBleData(value,19);
-    }
-}
-#endif
+
 //APP下发快捷辅助功能参数
 void get_auxil_fun_parm(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,uint8_t crcvalue)//
 {
@@ -2207,23 +2122,15 @@ void getAPPaddressbook(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalDat
 
 }
 
-#if USE_PROTOCOL_EN_DE_BY_SNICKER
 //02 类型
 void type2AE4Data(ble_read_data *buffer_handle,uint8_t *buf_cmd,uint8_t *data,uint16_t datalen,uint8_t *totalData,uint8_t crcvalue)
-#else
-void type2AE4Data(uint8_t *buf_cmd,uint8_t *data,uint16_t datalen,uint8_t *totalData,uint8_t crcvalue)
-#endif
 {
     uint16_t typeID = buf_cmd[1]*256+buf_cmd[2];
     printf("type2AE4Data typeID:0x%x\r\n",typeID);
     switch (typeID) //ID
     {
         case USER_INFOR_CMD://app下发的获取用户信息
-        #if USE_PROTOCOL_EN_DE_BY_SNICKER
             getUserInfo(buffer_handle,typeID,data,datalen,totalData,crcvalue);
-        #else
-            getUserInfo(typeID,data,datalen,totalData,crcvalue);
-        #endif
             break;
         case SET_PHONE_INFOR_CMD://app下发的下发的手机信息
             getPhoneInfo(typeID,data,datalen,totalData,crcvalue);
@@ -2629,11 +2536,7 @@ static void GetSwitchMessCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *to
     }
 }
 //撤销当前文件传输 1 OTA 2MP3 3表盘 3天气 5闹钟
-#if USE_PROTOCOL_EN_DE_BY_SNICKER
 static void RemoveFileCmd(ble_read_data *buffer_handle,uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totaldata,uint8_t crcvalue)
-#else
-static void RemoveFileCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totaldata,uint8_t crcvalue)
-#endif
 {
     uint8_t value[19];
     memset(value,0,19);
@@ -2654,9 +2557,8 @@ static void RemoveFileCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *total
         value[18] = Calculate_CRC(value,18);
         sendBleData(value,19);
 
-        #if USE_PROTOCOL_EN_DE_BY_SNICKER
         cancel_recv_file(buffer_handle);
-        #endif        
+
     }else
     {
         value[17] = 0;
@@ -4062,11 +3964,7 @@ len 就是data的长度
 *totaldata:总的数据内容 包含包头和校验预览做接口是用  如果要计算totaldata的长度直接是len+17+1 就是加上包头和校验和
 crcvalue;数据的校验和 不包含包头和校验和的计算结果
 */
-#if USE_PROTOCOL_EN_DE_BY_SNICKER
 void type2AE3Data(ble_read_data *buffer_handle,uint8_t *cmd_buf ,uint8_t *data,uint16_t datalen,uint8_t *totaldata,uint8_t crcvalue)
-#else
-void type2AE3Data(uint8_t *cmd_buf ,uint8_t *data,uint16_t datalen,uint8_t *totaldata,uint8_t crcvalue)
-#endif
 {
     uint16_t cmd = cmd_buf[1]*256+cmd_buf[2];
     printf("typeHexOneData:0x%04X\r\n",cmd);
@@ -4098,9 +3996,7 @@ void type2AE3Data(uint8_t *cmd_buf ,uint8_t *data,uint16_t datalen,uint8_t *tota
             GetSwitchMessCmd(cmd,data,datalen,totaldata,crcvalue);
             break;
         case REVOKE_CURR_FILE_TRANS_CMD://撤销文件传输
-        #if USE_PROTOCOL_EN_DE_BY_SNICKER
             RemoveFileCmd(buffer_handle,cmd,data,datalen,totaldata,crcvalue);
-        #endif
             break;
         case GET_SPECIF_TYPE_FILE_CMD://获取指定类型文件目录 
             GetFileTypeCmd(data,datalen); //
@@ -4875,10 +4771,6 @@ void bleRecvANCSData(uint8_t *data, uint16_t data_size,uint8_t *buf_cmd,uint8_t
     }
 }
 
-
-#if USE_PROTOCOL_EN_DE_BY_SNICKER
-
-
 /**
  * less than 20bytes msg reply
 */
@@ -5487,177 +5379,6 @@ void bleDataRecv(uint8_t *totalData, uint16_t event_size,uint16_t handle)
     
 }
 
-void free_ble_data(void)//以防断开蓝牙没有释放数据类型
-{
-    return;
-    totalpack = 0;
-    muiltFlag = 0; 
-    packdataLen = 0;
-    totalDataLen = 0;
-    ANCSBigBufFlag = 0;
-    recvBigDataBufState = false;
-    sendbigDataBufState = false;
-    
-}
-#else 
-
-
-
-//长数据解析
-void bleLongRecvData(uint8_t *data, uint16_t data_size,uint8_t *buf_cmd,uint8_t *totalData,uint8_t crcvalue)//buf_cmd 指令前17个字节数据
-{
-    uint8_t type=buf_cmd[1];
-    printf("type:%d %d data_size:%d data:%x crcvalue:%x\r\n",buf_cmd[0],type,data_size,data,crcvalue);
-
-    switch (type)
-    {
-        case 0x02://获取手机信息
-            type2AE4Data(buf_cmd,data,data_size,totalData,crcvalue);
-            break;
-        case 0x01:
-            type2AE3Data(buf_cmd,data,data_size,totalData,crcvalue);
-            break;
-        case 0x03://
-            type2AE1Data(buf_cmd,data,data_size,totalData,crcvalue);
-            break;
-        case 0x04:
-            break;
-        default:
-            break;
-    }
-}
-
-
-void bleDataRecv(uint8_t *totalData, uint16_t event_size,uint16_t handle)
-{
-
-    if(sendbigDataBufState == true)//正在发送大数据不接收任何app指令下发的数据
-    {
-        return;
-    }
-    printf("bleDataRecv handle:%d\r\n",handle); 
-
-    if(sendbigDataBufState == true)//正在发送大数据不接收任何app指令下发的数据
-    {
-        return;
-    }
-    printf("bleDataRecv handle:%d\r\n",handle);
-    ble_read_data* read_data_tmp = NULL;
-    for(int i = 0;i<MAX_HANDLE_NUM;i++)
-    {
-        if(handle_l[i].handle == 0)//第一次用 
-        {
-            handle_l[i].handle = handle;            
-
-        }
-        if(handle_l[i].handle == handle)//以前用过 2AE4 2AE5 2AE1 2AE3 2AE0 
-        {
-            if((totalData[0]==0x4a || totalData[0]==0x73)&& totalData[1] <= 0x09){//多包第一包
-                if(handle_l[i].data)//保证第一包时释放buf
-                {
-                    ym_free(handle_l[i].data);
-                    handle_l[i].data = NULL;
-                    memset(&handle_l[i],0,sizeof(ble_read_data));
-                    handle_l[i].handle = handle;
-                }
-            }
-            if(handle_l[i].data == NULL )//释放过的
-            {
-                printf("bleDataRecv!!!!!!!!!!!!!recv %x %x\r\n",totalData[0],totalData[1]);
-                if(event_size <= 17 || !((totalData[0] ==0x4a || totalData[0] == 0x73) && totalData[1] <= 0x09))//第一包的数据一定要大于17个字节并且第一包的数据头必须为0x73 或者0x4a 并且类型小于0x09 类型根据协议可自行增加或者减少
-                {
-                    break;
-                }
-                memcpy(&totalDataLen,totalData+7,4);//总的数据大小
-                handle_l[i].totalDataLen = totalDataLen;
-                
-                
-                // printf("bleDataRecv!!!!!!!%d\r\n",totalDataLen);
-                if(totalDataLen > event_size-17)//多包数据第一包处理，大于一包的数据长度 514-17=494
-                {
-                    packdataLen = event_size-17;//多包数据第一包数据不带CRC校验和的
-                    handle_l[i].data = ym_malloc(totalDataLen+1);
-                    if(handle_l[i].data != NULL){
-                        printf("bleDataRecv long data %d\r\n",totalDataLen);
-                        if(handle_l[i].totalDataLen < packdataLen)
-                        {
-                            printf("packdataLen error!!!!!!!%d\r\n",packdataLen);
-                            packdataLen=handle_l[i].totalDataLen;
-                        }
-                        memcpy(handle_l[i].data,totalData+17,packdataLen);//从第十七个字节开始接收数据data
-                        handle_l[i].data_len = packdataLen;//当前包的数据长度
-                        memset(handle_l[i].cmd_data,0,17);
-                        memcpy(handle_l[i].cmd_data,totalData,17);
-                    } 
-                }else{//一包数据
-                    printf("bleDataRecv short data %d\r\n",totalDataLen);
-                    packdataLen = event_size-18;
-                    if(totalDataLen != 0)
-                    {
-                        handle_l[i].data =ym_malloc(totalDataLen+1);
-                        memcpy(handle_l[i].data,totalData+17,packdataLen);
-                    }
-                    memset(handle_l[i].cmd_data,0,17);
-                    memcpy(handle_l[i].cmd_data,totalData,17);
-                    handle_l[i].crcvalue = totalData[event_size-1];
-                    handle_l[i].data_len = packdataLen;
-                    read_data_tmp = &handle_l[i];//完整包，遍历后需要处理数据
-                }
-            }else//多包数据存储
-            {
-
-                uint32_t packStartAddrLen = handle_l[i].data_len;//每一包接收的数据长度起始地址
-                handle_l[i].data_len = handle_l[i].data_len+event_size;
-                printf("muilt 133333 handle_l[i].data_len:%d\r\n",handle_l[i].data_len);
-                if(handle_l[i].data_len >= handle_l[i].totalDataLen)//接收完整的数据
-                {
-                    handle_l[i].data_len = handle_l[i].data_len -1;//最后一包要减去最后的CRC的那一位
-                    //这是最后一包的起始地址
-                    if(handle_l[i].totalDataLen -packStartAddrLen < event_size-1)
-                    {
-                        printf("packStartAddrLen error!!!!!!!%d\r\n",packStartAddrLen);
-                        event_size=handle_l[i].totalDataLen-packStartAddrLen;
-                    }
-                    memcpy(handle_l[i].data+packStartAddrLen,totalData,event_size-1);//为了不把CRC copy到data所以多一步操作
-                    handle_l[i].crcvalue = totalData[event_size-1];//最后一个字节为总的数据包的CRC
-                    read_data_tmp = &handle_l[i];
-                }else{ //还没接收完 有 3 4 5包.........
-                    if(handle_l[i].totalDataLen -packStartAddrLen < event_size)
-                    {
-                        printf("event_size error!!!!!!!%d\r\n",event_size);
-                        event_size=handle_l[i].totalDataLen-packStartAddrLen;
-                    }
-                    memcpy(handle_l[i].data+packStartAddrLen,totalData,event_size); //这是不带CRC数据说明还有下一包直接copy
-                }
-            }
-            break;
-        } 
-        
-    }
-    if(read_data_tmp)//获取到完整数据，处理数据且释放内存
-    {
-        printf("pack data start!!!!!\r\n");
-        //处理数据..
-        if(read_data_tmp->data)
-        {
-            read_data_tmp->data[read_data_tmp->totalDataLen]=0;
-        }
-                bleLongRecvData(read_data_tmp->data,read_data_tmp->totalDataLen,read_data_tmp->cmd_data,NULL,read_data_tmp->crcvalue);
-        if(read_data_tmp->data)//只有数据不为NULL的才释放
-        {
-            ym_free(read_data_tmp->data);
-        }
-        read_data_tmp->data_len = 0;
-        read_data_tmp->data = NULL;
-        read_data_tmp->totalDataLen = 0;
-        //read_data_tmp->handle = 0;
-        read_data_tmp->crcvalue = 0;
-        memset(read_data_tmp->cmd_data,0,17);
-        printf("pack data end!!!!!!\r\n");
-    }
-
-
-}
 void free_ble_data(void)//以防断开蓝牙没有释放数据类型
 {
     return;
@@ -5671,7 +5392,6 @@ void free_ble_data(void)//以防断开蓝牙没有释放数据类型
     
 }
 
-#endif
 
 //接收app下发的原始数据 
 void revBleOldData(uint8_t *buf, uint16_t event_size,uint16_t handle)//每包的数据大小
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 6a6f0ab93..3073a4673 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
@@ -94,12 +94,6 @@ void cameram_send_data(void);
 
 #define FIND_PHONE_CMD 0x0501 //同步睡眠历史数据
 
-
-#define USE_PROTOCOL_EN_DE_BY_SNICKER 1
-
-#if USE_PROTOCOL_EN_DE_BY_SNICKER
-
-
 #define MSG_DIRECTION_RECV 0x73
 #define MSG_DIRECTION_RECV_ANDROID 0x4A
 #define MSG_DIRECTION_SEND 0x72
@@ -143,7 +137,7 @@ errcode_t ble_reply_cmdarr(uint16_t msg_cmd,uint8_t *replydata,uint16_t replydat
 errcode_t ble_reply_msg(uint8_t msg_cmdtype,uint8_t msg_cmdid,uint8_t replydata);
 errcode_t ble_reply_msgarr(uint8_t msg_cmdtype,uint8_t msg_cmdid,uint8_t *replydata,uint16_t replydata_len);
 
-#endif
+
 #pragma pack(1)
 typedef struct
 {