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

Code review from 罗正

* refs/changes/1811/head: (2 commits squashed)

  - 解决蓝牙AI不能用问题

  - 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/1811

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
index b654b09..76cf73d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
@@ -170,7 +170,7 @@ namespace OHOS
             if (GetSelect4gorbt() == AI_SELECT_4G)
             {
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetSelect4gorbt() == AI_SELECT_4G");
-                if (init_4gai_task)
+                if (GetInit_4gai_task())
                 {
                     uapi_start_asr();
                 }

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
index 43047db..2313bbb 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
@@ -2353,7 +2353,7 @@ void send_Ai_record(uint16_t len,uint8_t *data,uint32_t count)
     LOS_Msleep(AI_interval+get_ble_interval());\r
 }\r
 \r
-\r
+#define ENABLE_4GAI 0\r
 static void blesrvAi_send_service_task(void const *arg)\r
 {\r
     unused(arg);\r
@@ -2393,12 +2393,15 @@ static void blesrvAi_send_service_task(void const *arg)
         // if(get_ble_connect())\r
         \r
 \r
+        #if ENABLE_4GAI\r
         if(mail.msg_data && mail.msg_len!=0)\r
         {\r
               send_ai_bin(mail.msg_data,mail.msg_len);\r
         }\r
-      \r
-        // send_Ai_record(mail.msg_len,mail.msg_data,AI_data_count);\r
+        #else\r
+        if(mail.msg_data && mail.msg_len!=0)\r
+            send_Ai_record(mail.msg_len,mail.msg_data,AI_data_count);\r
+        #endif\r
        \r
 \r
         if(mail.msg_data)\r
@@ -2477,7 +2480,7 @@ int send_msg_data_into_Ai_msg_queue(void *buff,uint16_t len,uint8_t type)
     if (buff == NULL) return ERRCODE_FAIL;\r
 \r
     uint32_t sendlen = sizeof(blesrv_custom_cmd_t);\r
-    uint32_t singlebuflen= 1024;//ble_nus_max_data_len-20;\r
+    uint32_t singlebuflen= ble_nus_max_data_len-20;\r
     blesrv_mail.msg_data=0;\r
 \r
     if(len<=singlebuflen)\r

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 170f14c..3f1bf8e 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/transspecard/transspecard.c
+++ b/code/sdk/application/wearable/service/ble_service/transspecard/transspecard.c
@@ -263,10 +263,14 @@ uint8_t send_transspecard_data(uint8_t type_id, void *data, uint16_t datalen)
     // 多包传输逻辑
     uint8_t current_packet = 1;
     int all_packets_sent = 0;
-    // 初始化信号量
+    if(g_transspecard_ack_sem != NULL)
+    {
+        osSemaphoreDelete(g_transspecard_ack_sem);
+        g_transspecard_ack_sem = NULL;
+    }
     if (g_transspecard_ack_sem == NULL)
     {
-        g_transspecard_ack_sem = osSemaphoreNew(1, 0, NULL);
+        g_transspecard_ack_sem = osSemaphoreNew(1, 0, NULL);// 初始化信号量
     }
 
     // 先顺序发送所有数据包