Merge #1803 into sdk602patch0911 from refs/changes/1803/head

Code review from 罗正

* refs/changes/1803/head: (3 commits squashed)

  - 解决香港乘车码获取不了问题

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - 解决乘车码未知错误问题

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1803

diff --git a/code/sdk/application/wearable/service/ble_service/transspecard/transspecard.c b/code/sdk/application/wearable/service/ble_service/transspecard/transspecard.c
index 6386281..170f14c 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/transspecard/transspecard.c
+++ b/code/sdk/application/wearable/service/ble_service/transspecard/transspecard.c
@@ -462,7 +462,7 @@ uint8_t send_transspecard_data(uint8_t type_id, void *data, uint16_t datalen)
 #endif
 
 // 接收缓冲区最大长度
-#define MAX_RECEIVE_BUFFER_SIZE (1024 * 4) //
+#define MAX_RECEIVE_BUFFER_SIZE (1024 * 5) //
 #define RECEIVE_PACKET_FIRST 0x01          // 第一个包
 #define RECEVIE_PACKET_COMPLETED_ACK 0x00  // 最后一个包接收完成ACK
 #define RECEIVE_PACKET_HEADER 0x73         // 消息头
@@ -624,14 +624,16 @@ uint8_t parse_transspecard_data(void *buf, uint16_t event_size)
         receive_packet_total = current_packet_total;
         receive_total_datalen = current_total_datalen;
 
+        #if 0 
         if (receive_total_datalen > MAX_RECEIVE_BUFFER_SIZE)
         {
-            printf("Received data length exceeds buffer size!\r\n");
+            printf("Received data length exceeds buffer size,receive_total_datalen:%u!\r\n",receive_total_datalen);
             isProcessingData = 0;
             ble_transspecard_receive_cleanup_resources();
             notify_resend(RECEIVE_PACKET_FIRST);
             return ALIPAY_TRANSSPECARD_ERRCODE_FAIL;
         }
+        #endif
 
         packet_received_flags = (uint8_t *)malloc(receive_packet_total);
         if (packet_received_flags == NULL)