From 133270f69ee86fc7a6ee0067f1aade3059b04c96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Sat, 7 Jun 2025 11:01:11 +0000 Subject: [PATCH] Merge #1814 into sdk602patch0911 from refs/changes/1814/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 胡传军 * refs/changes/1814/head: (5 commits squashed) - 增加4Gai对话，待联调，且处于测试用服务器 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 - 增加tts服务,增加ai接口 Signed-off-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1814 --- .../service/ble_service/bleservice/bleEvent.c | 11 +- .../slip/cat1Service/CMakeLists.txt | 4 + .../slip/cat1Service/bk_websocket.h | 4 +- .../slip/cat1Service/cat1_at_cmd.cpp | 92 ++- .../peripheral/slip/cat1Service/cat1_ws.cpp | 508 ++++++++++++-- .../peripheral/slip/cat1Service/cat1_ws.h | 3 + .../slip/cat1Service/dev_authentication.cpp | 645 ++++++++++++++++++ .../slip/cat1Service/dev_authentication.h | 40 ++ .../peripheral/slip/cat1Service/http_cat1.cpp | 308 +++++++++ .../tools/build/config/brandy.config | 2 +- .../sample/wrapper/audio_capture_wrapper.cpp | 19 +- .../voice_call_volte_sample_wrapper.cpp | 203 +++++- .../wrapper/voice_call_volte_sample_wrapper.h | 5 + .../lwip/src/apps/http/http_client.c | 54 +- .../lwip/src/include/lwip/apps/http_client.h | 2 + 15 files changed, 1843 insertions(+), 57 deletions(-) create mode 100644 code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.cpp create mode 100644 code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.h create mode 100644 code/sdk/drivers/peripheral/slip/cat1Service/http_cat1.cpp 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 fc9fdb4c5..988a53dcd 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c @@ -782,7 +782,7 @@ void comfirmPaire(uint8_t flag) errcode_t code = gap_ble_pair_remote_device(&addr); if(code!=ERRCODE_SUCC) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"gap_ble_pair_remote_device fail %X\r\n",code); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"gap_ble_pair_remote_device fail %X\r\n",code); } } @@ -1217,7 +1217,8 @@ void sendBindInfor(uint8_t *data) } - CustomEventPublish(TOPIC_EVENT_DEVICE_BIND,(uint8_t *)buf,devnamelen+2); + // CustomEventPublish(TOPIC_EVENT_DEVICE_BIND,(uint8_t *)buf,devnamelen+2); + comfirmPaire(1); if(devname) { ym_free(devname); @@ -1229,7 +1230,8 @@ void sendBindInfor(uint8_t *data) memset(buf,0,2); buf[0] = DEVICEBIND; buf[1] = 0; - CustomEventPublish(TOPIC_EVENT_DEVICE_BIND,buf,2); + // CustomEventPublish(TOPIC_EVENT_DEVICE_BIND,buf,2); + comfirmPaire(1); } } @@ -1239,7 +1241,8 @@ void sendBindInfor(uint8_t *data) buf[0] = DEVICEBIND; buf[1] = 0 ; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"phone devname is no name!!!!!!!!!:"); - CustomEventPublish(TOPIC_EVENT_DEVICE_BIND,buf,2); + // CustomEventPublish(TOPIC_EVENT_DEVICE_BIND,buf,2); + comfirmPaire(1); } #endif #endif diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/CMakeLists.txt b/code/sdk/drivers/peripheral/slip/cat1Service/CMakeLists.txt index c7912d588..b4b5f30f4 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/CMakeLists.txt +++ b/code/sdk/drivers/peripheral/slip/cat1Service/CMakeLists.txt @@ -17,6 +17,9 @@ set(PRIVATE_HEADER ) set(SOURCES +${CMAKE_CURRENT_SOURCE_DIR}/dev_authentication.cpp +${CMAKE_CURRENT_SOURCE_DIR}/http_cat1.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cat1_at_cmd.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cat1_server_hal.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cat1_server.cpp @@ -26,6 +29,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/cat_imei_map.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cat1_ws.cpp + ) set(COMPONENT_PUBLIC_CCFLAGS diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/bk_websocket.h b/code/sdk/drivers/peripheral/slip/cat1Service/bk_websocket.h index 5448709e1..753610021 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/bk_websocket.h +++ b/code/sdk/drivers/peripheral/slip/cat1Service/bk_websocket.h @@ -2,7 +2,7 @@ #ifndef __BK_WEBSOCKET_H__ #define __BK_WEBSOCKET_H__ // #include "aic_osa.h" - +// #include // WebSocket 消息类型枚举 typedef enum { WS_CONT = 0x00, @@ -23,7 +23,7 @@ typedef struct { // 初始化 WebSocket 客户端 -WebSocketClient *init_websocket_client(const char *url, const char *headers); +WebSocketClient *init_websocket_client(const char *url, const char *headers,uint8_t use_dns); // 关闭 WebSocket 客户端 void close_websocket_client(WebSocketClient *client) ; diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp index c6c834df6..4f0220c8e 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp @@ -434,6 +434,39 @@ static uint32_t start_record(uint8_t *para, uint32_t paraLen, char *strCommonCmd return 0; } +extern void uapi_start_tts(void) ; +static uint32_t starttts(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + UNUSED(strCommonCmd); + uint8_t argv[PPG_MAX_ARGC][PPG_MAX_ARGV_LEN] = { 0 }; + uint32_t argc = 0; + printf("ai_msg\n"); + int ret = ConvertCmdToParam(para, paraLen, argv, &argc); + if (ret != PPG_SUCCESS) { + printf("CAT1TEST ATCMD Convert Command Failed\n"); + return ERRCODE_FAIL; + } + uapi_start_tts(); + + return 0; +} + +extern void uapi_start_tts_single(); +static uint32_t sendttstxt(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + UNUSED(strCommonCmd); + uint8_t argv[PPG_MAX_ARGC][PPG_MAX_ARGV_LEN] = { 0 }; + uint32_t argc = 0; + printf("ai_msg\n"); + int ret = ConvertCmdToParam(para, paraLen, argv, &argc); + if (ret != PPG_SUCCESS) { + printf("CAT1TEST ATCMD Convert Command Failed\n"); + return ERRCODE_FAIL; + } + uapi_start_tts_single(); + + return 0; +} static uint32_t start_asr(uint8_t *para, uint32_t paraLen, char *strCommonCmd) @@ -449,8 +482,6 @@ static uint32_t start_asr(uint8_t *para, uint32_t paraLen, char *strCommonCmd) } uapi_start_asr(); - - return 0; } extern void record_test(void); @@ -469,6 +500,57 @@ static uint32_t sendbindata(uint8_t *para, uint32_t paraLen, char *strCommonCmd) record_test(); return 0; } +#include "dev_authentication.h" + +// extern void aut_active(void); + +static uint32_t active(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + UNUSED(strCommonCmd); + uint8_t argv[PPG_MAX_ARGC][PPG_MAX_ARGV_LEN] = { 0 }; + uint32_t argc = 0; + printf("ai_msg\n"); + int ret = ConvertCmdToParam(para, paraLen, argv, &argc); + if (ret != PPG_SUCCESS) { + printf("CAT1TEST ATCMD Convert Command Failed\n"); + return ERRCODE_FAIL; + } + aut_active(); + return 0; +} + +static uint32_t autlogin(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + UNUSED(strCommonCmd); + uint8_t argv[PPG_MAX_ARGC][PPG_MAX_ARGV_LEN] = { 0 }; + uint32_t argc = 0; + printf("ai_msg\n"); + int ret = ConvertCmdToParam(para, paraLen, argv, &argc); + if (ret != PPG_SUCCESS) { + printf("CAT1TEST ATCMD Convert Command Failed\n"); + return ERRCODE_FAIL; + } + aut_login(); + return 0; +} + + +extern void read_file_put(void ); + +static uint32_t readfileput(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + UNUSED(strCommonCmd); + uint8_t argv[PPG_MAX_ARGC][PPG_MAX_ARGV_LEN] = { 0 }; + uint32_t argc = 0; + printf("ai_msg\n"); + int ret = ConvertCmdToParam(para, paraLen, argv, &argc); + if (ret != PPG_SUCCESS) { + printf("CAT1TEST ATCMD Convert Command Failed\n"); + return ERRCODE_FAIL; + } + read_file_put(); + return 0; +} static const at_cmd_table_t g_cat1_cmd[] = { { (char *)"AT^CAT1POWER", cat1_power, (char *)"1" }, @@ -495,6 +577,12 @@ static const at_cmd_table_t g_cat1_cmd[] = { { (char *)"AT^AI_ASR", start_record, (char *)"1" }, { (char *)"AT^STARTASR", start_asr, (char *)"1" }, { (char *)"AT^SENDBINDATA", sendbindata, (char *)"1" }, + { (char *)"AT^ACTIVE", active, (char *)"1" }, + { (char *)"AT^READPUT", readfileput, (char *)"1" }, + { (char *)"AT^LOGIN", autlogin, (char *)"1" }, + { (char *)"AT^STARTTTS", starttts, (char *)"1" }, + { (char *)"AT^SENDTTTS", sendttstxt, (char *)"1" }, + }; at_cmd_table_t *get_cat1_cmd_table(uint32_t *cmd_count) diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.cpp index 2cf3216f9..3765e8929 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.cpp @@ -11,7 +11,7 @@ #include "lwip/netif.h" #include "lwip/init.h" #include "lwip/inet_chksum.h" - +#include "lwip/dns.h" #include "lwip/err.h" #include "lwip/sockets.h" #include "lwip/sys.h" @@ -42,6 +42,7 @@ #include "broadcast_feature.h" #include "cmsis_os2.h" #include "cat1_ctl.h" +#include "voice_call_volte_sample_wrapper.h" #ifdef __cplusplus @@ -123,6 +124,7 @@ extern "C" { extern osStatus_t osDelay(uint32_t ticks); #define cat1_msleep(ms) osDelay(ms) /* osDelay(1) : 1ms */ + void bk_sleep(uint32_t time) { cat1_msleep(time); @@ -131,11 +133,17 @@ void bk_sleep(uint32_t time) #include #include +extern bool read_dev_token(char *data_token); + + void * aic_zalloc(unsigned int len) { return malloc(len); } + void uapi_start_tts_single_txt(char *buf); + + // free // 定义一个结构体来存储解析后的URL部分 @@ -524,7 +532,8 @@ int receive_websocket_message(WebSocketClient *client, unsigned char *buf,int l while(1) { bytes_received = recv(client->sockfd, frame, 1, 0); - if (bytes_received <= 0) { + if (bytes_received <= 0) + { if (bytes_received == 0) { printf("Connection closed by server.\n"); } else { @@ -541,8 +550,13 @@ int receive_websocket_message(WebSocketClient *client, unsigned char *buf,int l printf("receive_websocket_message:hend =0x%X,0x%X ,last_byte =0x%x ERROR222222222!!!!!!!!!",frame[0],frame[1],last_byte); continue; } + if(frame[0]==0 && frame[1]==0 && last_byte==0) + { + break; + } - }else + } + else { break; } @@ -659,14 +673,39 @@ int receive_websocket_message(WebSocketClient *client, unsigned char *buf,int l return payload_len;//parse_frame(buf, bytes_received, buf,code); } + + +struct cat1_ws_init_t +{ + osSemaphoreId_t dns_done_sem; + ip_addr_t ip; +}; + +static void dns_found(const char* hostname, const ip_addr_t *ipaddr, void *arg) +{ + struct cat1_ws_init_t * ip_sem=(struct cat1_ws_init_t *)arg; + + printf("hostname %s ipaddr%d \r\n",hostname,ipaddr->u_addr.ip4); + memcpy(&(ip_sem->ip),ipaddr,sizeof(ipaddr)); + (void)osSemaphoreRelease(ip_sem->dns_done_sem); +} + + // 初始化 WebSocket 客户端 -WebSocketClient *init_websocket_client(const char *url, const char *headers) { +WebSocketClient *init_websocket_client(const char *url, const char *headers,uint8_t use_dns) { //printf("init_websocket_client 1\n"); char *buffer = NULL; WebSocketClient *client =NULL; BK_URL parsed_url = {0}; struct sockaddr_in server_addr; ssize_t bytes_received; + struct in_addr in_addr_t={0}; + ip_addr_t ip; + struct cat1_ws_init_t ip_sem={0}; + + err_t ret=0; + + ip_sem.dns_done_sem = osSemaphoreNew(1, 0, NULL); parsed_url = parse_url(url);//解析url @@ -695,17 +734,34 @@ WebSocketClient *init_websocket_client(const char *url, const char *headers) { } // printf("init_websocket_client 3\n"); + if(use_dns) + { + ret =dns_gethostbyname(parsed_url.host,&ip,dns_found,&ip_sem); + // if(ERR_OK==ret) + { + osSemaphoreAcquire(ip_sem.dns_done_sem, 1000*30); + } + osSemaphoreDelete(ip_sem.dns_done_sem); + printf("dns_gethostbyname %d\r\n",ip_sem.ip.u_addr.ip4); + memcpy(&server_addr.sin_addr.s_addr, &ip_sem.ip.u_addr.ip4, 4); + + } + else + { + inet_pton(AF_INET, parsed_url.host, &server_addr.sin_addr); + } + + server_addr.sin_family = AF_INET; server_addr.sin_port = htons(parsed_url.port); + - server_addr.sin_addr.s_addr=inet_addr( parsed_url.host); - - // inet_pton(AF_INET, parsed_url.host, &server_addr.sin_addr); + // if (connect(client->sockfd, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) { - printf("init_websocket_client connection failed"); + printf("init_websocket_client connection failed\r\n"); close(client->sockfd); goto client_ERROR; } @@ -769,7 +825,7 @@ void close_websocket_client(WebSocketClient *client) { if(client) { printf("close_websocket_client "); - close(client->sockfd); + // close(client->sockfd); free(client); } @@ -840,35 +896,87 @@ bool chat_result_analysis(char *buf) } if(strcmp("middle",type_str)==0) { - if(strlen(content_str)>0) { - memset_s(content_str_chat,64,0,64); - memcpy_s(content_str_chat,64,content_str,strlen(content_str)); - ble_set_ai_Answer_str(content_str_chat,2); + if(strlen(content_str)>0) + { + memset_s(content_str_chat,64,0,64); + memcpy_s(content_str_chat,64,content_str,strlen(content_str)); + ble_set_ai_Answer_str(content_str_chat,2); + uapi_start_tts_single_txt(content_str_chat); + + } } cJSON_Delete(root); return true; +} +bool chat_ws_url_init(char * put_buf) +{ + char token[64]={0}; + if(read_dev_token(token)) + { + sprintf(put_buf,"ws://amp.raisound.com/chat/ws?dt=%s&platform=huoshan",token); + return true; + } + else + { + return false; + } } +uint8_t is_bk_websocket_chat=0; + void bk_websocket_demo(void *data) { - while (1) + // while (1) { /* code */ - chat_client = init_websocket_client("ws://118.145.158.207:22080/chat/ws",NULL); - if (chat_client== NULL) { + is_bk_websocket_chat=1; + + char url_buf[124]={0}; + if(chat_ws_url_init(url_buf)) + { + printf("%s\r\n",url_buf); + } + else + { + is_bk_websocket_chat=0; + return; + } + uint8_t client_count=3; + + while (client_count) + { + chat_client = init_websocket_client(url_buf,NULL,1); + + if (chat_client== NULL) { + client_count--; continue ; + } + else + { + break; + } } + if (chat_client== NULL){ + is_bk_websocket_chat=0; + return; + } + + // send_ai_txt(1,"你是谁"); WebSocketMessageType type; while (1) { memset_s(recv_buf,1024,0,1024); - receive_websocket_message(chat_client,(unsigned char *)recv_buf,1024,&type); + int len= receive_websocket_message(chat_client,(unsigned char *)recv_buf,1024,&type); + if(len==-1 || type == WS_CLOSE) + { + break; + } chat_result_analysis(recv_buf); printf("bk_websocket_demo %s",recv_buf); } @@ -876,7 +984,8 @@ void bk_websocket_demo(void *data) { close_websocket_client(chat_client); chat_client=NULL; - continue ; + is_bk_websocket_chat=0; + return ; } } @@ -887,13 +996,13 @@ void bk_websocket_demo(void *data) { #include "common_def.h" #include "los_printf.h" -#define CAT1_SERVICE_TASK_SIZE (0x1000*2) +#define CAT1_SERVICE_TASK_SIZE (0x1000*1) #define CAT1_SERVICE_TASK_PRIO 5 errcode_t chat_server_init(void) { - if(chat_client) + if(chat_client || is_bk_websocket_chat) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"cat1_tcp_server_init is connet!\r\n"); return ERRCODE_FAIL; @@ -926,7 +1035,9 @@ errcode_t chat_server_init(void) char asr_recv_buf[1024]={0}; WebSocketClient *asr_client; +int32_t uapi_tts_paly_init(void); +int32_t uapi_tts_paly_stop(void); //查询是否可以对话 void uapi_start_asr(void) { @@ -937,6 +1048,8 @@ void uapi_start_asr(void) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message succ 0\n"); else WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message erro\n"); + + uapi_tts_paly_stop(); } //停止对话 @@ -944,6 +1057,8 @@ void uapi_stop_asr(void) { char *jsonString ="{\"header\":{\"event\":\"StopTranscription\",\"trace_id\":\"3fa6b9e6a30b407ea38ad7ae69e6c291\"}}"; + uapi_tts_paly_init(); + if (send_websocket_message(asr_client,( const unsigned char *)jsonString,strlen(jsonString),WS_TEXT)==0) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message succ 0\n"); } @@ -953,11 +1068,13 @@ void uapi_stop_asr(void) void send_ai_bin(char *buf,uint32_t len) { // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_ai_bin 0\n"); + if (send_websocket_message(asr_client,( const unsigned char *)buf,len,WS_BINARY)==0) { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message succ 0\n"); bk_sleep(10); } - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message succ 0\n"); + // } void record_test(void) @@ -1065,40 +1182,84 @@ bool aer_result_analysis(char *buf) uint8_t is_bk_websocket_asr=0; +// ws://amp.raisound.com/asr/ws?dt=95fc6dcdf5a3e9a48df535453efd097c19&platform=aliyun + + +bool asr_ws_url_init(char * put_buf) +{ + char token[64]={0}; + if(read_dev_token(token)) + { + sprintf(put_buf,"ws://amp.raisound.com/asr/ws?dt=%s&platform=aliyun",token); + return true; + } + else + { + return false; + } + +} void bk_websocket_asr(void *data) { // while (1) + + WebSocketMessageType type; + bool state = true; + is_bk_websocket_asr=1; { - asr_client = init_websocket_client("ws://118.145.158.207:22080/asr/ws",NULL); - if (asr_client== NULL) { - bk_sleep(10); - // continue ; - is_bk_websocket_asr=0; + //ws://amp.raisound.com/asr/ws + char url_buf[124]={0}; + if(asr_ws_url_init(url_buf)) + { + printf("%s\r\n",url_buf); + } + else + { return; } + + uint8_t client_count=3; + + while (client_count) + { + // asr_client = init_websocket_client("ws://118.145.158.207:22080/asr/ws",NULL,0); + asr_client = init_websocket_client(url_buf,NULL,1); + if (asr_client== NULL) { + printf("init_websocket_client fail %d\r\n",client_count); + client_count--; + continue ; + } + else + { + break; + } + } + if (asr_client== NULL){ + return; + } + uapi_cat1_keep_wakeup(1); - WebSocketMessageType type; - bool state = true; - SendMsgToUIService(UI_4G_AI_INIT_STAUS, 0,&state, sizeof(bool)); + // uapi_start_asr(); + // SendMsgToUIService(UI_4G_AI_INIT_STAUS, 0,&state, sizeof(bool)); while (1) { memset_s(asr_recv_buf,1024,0,1024); - receive_websocket_message(asr_client,(unsigned char *)asr_recv_buf,1024,&type); + int len= receive_websocket_message(asr_client,(unsigned char *)asr_recv_buf,1024,&type); // if(type==WS_CONT || - if( type==WS_CLOSE) + if( type==WS_CLOSE || len==-1) { printf("WS_CLOSE bk_websocket_asr\r\n"); break; } - printf("WS_CLOSE bk_websocket_asr %d\r\n",type); - + printf(" bk_websocket_asr %d\r\n",type); + printf("bk_websocket_demo %s %d",asr_recv_buf,type); aer_result_analysis(asr_recv_buf); - // printf("bk_websocket_demo %s %d",asr_recv_buf,type); + // } @@ -1112,16 +1273,15 @@ void bk_websocket_asr(void *data) { } - - - errcode_t asr_server_init(void) { - if(is_bk_websocket_asr) + if(is_bk_websocket_asr || asr_client!=NULL) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"cat1_tcp_server_init is connet!\r\n"); return ERRCODE_FAIL; } + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"asr_server_init !\r\n"); app_task_definition_t taskcfg={0}; taskcfg.create_queue_handle = NULL; @@ -1141,15 +1301,283 @@ errcode_t asr_server_init(void) } return ERRCODE_SUCC; } +/////////////////////////////////////////////tts接口//////////////////////////////////////////// + +bool tts_ws_url_init(char * put_buf) +{ + char token[64]={0}; + if(read_dev_token(token)) + { + sprintf(put_buf,"ws://amp.raisound.com/tts/stream?dt=%s&platform=huoshan&noCache=1",token); + return true; + } + else + { + return false; + } + +} + + + +WebSocketClient *tts_client; + + +void uapi_start_tts(void) +{ + char *jsonString = + "{\"header\": \ + { \"event\": \"StartSynthesis\",\ + \"trace_id\": \"3fa6b9e6a30b407ea38ad7ae69e6c291\"},\ + \"payload\": \ + {\"voice\":\"xiaoyun\",\ + \"format\":\"pcm\",\ + \"sample_rate\":16000,\ + \"volume\":50,\ + \"speech_rate\":0}\ + }"; + + printf("uapi_start_tts : %s\r\n",jsonString); + + if (send_websocket_message(tts_client,( const unsigned char *)jsonString,strlen(jsonString),WS_TEXT)==0) + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message succ 0\n"); +} +void uapi_start_tts_single(void) +{ + char *jsonString = + " { \"header\": { \ + \"event\": \"LongTextStream\",\ + \"trace_id\": \"3fa6b9e6a30b407ea38ad7ae69e6c291\" \ + }, \ + \"payload\": { \ + \"voice\":\"xiaoyun\", \ + \"format\":\"pcm\", \ + \"sample_rate\":16000, \ + \"volume\":50, \ + \"speech_rate\":0, \ + \"text\":\"深圳市北科瑞声科技股份有限公司，是由国家重大人才计划特聘专家刘轶博士创办的国内人 \ + 工智能音频领军企业，专注于行业智能音频交互技术，拥有全链条核心自主知识产权，汇集世界一流的研发运营团队。\" \ + } } "; + + printf("uapi_start_tts : %s\r\n",jsonString); + + if (send_websocket_message(tts_client,( const unsigned char *)jsonString,strlen(jsonString),WS_TEXT)==0) + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message succ 0\n"); +} + + + void uapi_start_tts_single_txt(char *buf) +{ + char jsonString[512] ={0}; + + sprintf(jsonString, " { \"header\": { \ + \"event\": \"LongTextStream\",\ + \"trace_id\": \"3fa6b9e6a30b407ea38ad7ae69e6c291\" \ + }, \ + \"payload\": { \ + \"voice\":\"xiaoyun\", \ + \"format\":\"pcm\", \ + \"sample_rate\":16000, \ + \"volume\":50, \ + \"speech_rate\":0, \ + \"text\":\"%s\" \ + } } ",buf); + + printf("uapi_start_tts : %s\r\n",jsonString); + + if (send_websocket_message(tts_client,( const unsigned char *)jsonString,strlen(jsonString),WS_TEXT)==0) + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message succ 0\n"); +} + +// char *tts_txt_str= + + +void send_tts_txt(char *msg) +{ + char *jsonString = + "{ \ + \"header\": { \ + \"event\": \"RunSynthesis\", \ + \"trace_id\": \"3fa6b9e6a30b407ea38ad7ae69e6c291\"\ + }, \ + \"payload\": { \ + \"text\":\"深圳市北科瑞声科技股份有限公司，是由国家重大人才计划特聘专家刘轶博士创办的国内人工智能音频领军企业，\ + 专注于行业智能音频交互技术，拥有全链条核心自主知识产权，汇集世界一流的研发运营团队。\" \ + }\ + }"; + + + if (send_websocket_message(tts_client,( const unsigned char *)jsonString,strlen(jsonString),WS_TEXT)==0) + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message succ 0\n"); + else + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"send_websocket_message fail 1\n"); +} + + + + +uint8_t is_bk_websocket_tts=0; + + +void bk_websocket_tts(void *data) { + + // while (1) + uapi_cat1_keep_wakeup(1); + + WebSocketMessageType type; + bool state = true; + + is_bk_websocket_tts=1; + + { + //ws://amp.raisound.com/asr/ws + char url_buf[124]={0}; + if(tts_ws_url_init(url_buf)) + { + printf("%s\r\n",url_buf); + } + else + { + is_bk_websocket_tts=0; + return; + } + + uint8_t client_count=3; + + + + while (client_count) + { + tts_client = init_websocket_client("ws://118.145.158.207:22080/tts/stream?audio_buffer_size=4096",NULL,0); + + if (tts_client== NULL) + { + printf("init_websocket_client fail %d\r\n",client_count); + client_count--; + continue ; + } + else + { + printf("init_websocket_client succ \r\n"); + break; + } + } + if (tts_client== NULL){ + is_bk_websocket_tts=0; + return; + } + + uapi_start_tts_single(); + char* tts_recv_buf=(char *)malloc(1024*4); + + while (1) + { + + + memset_s(tts_recv_buf,2048,0,2048); + int len=receive_websocket_message(tts_client,(unsigned char *)tts_recv_buf,1024*4,&type); + // if(type==WS_CONT || + if( type==WS_CLOSE || len==-1)//|| type==WS_CONT ) + { + printf("WS_CLOSE bk_websocket_tts\r\n"); + break; + } + printf("bk_websocket_tts bk_websocket_tts %d\r\n",type); + if(type==WS_BINARY) + { + AIStreamWrite((uint8_t *)tts_recv_buf,len); + } + + // aer_result_analysis(asr_recv_buf); + printf("bk_websocket_demo %s %d",tts_recv_buf,type); + } + + close_websocket_client(tts_client); + tts_client=NULL; + // return; + } + is_bk_websocket_tts=0; + +} + + +errcode_t tts_server_init(void) +{ + + if(tts_client!=NULL || is_bk_websocket_tts) + { + return ERRCODE_FAIL; + } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"asr_server_init !\r\n"); + app_task_definition_t taskcfg={0}; + taskcfg.create_queue_handle = NULL; + taskcfg.attr.name="tts_server_init"; + taskcfg.attr.priority = TASK_PRIORITY_APP; + taskcfg.attr.stack_size = CAT1_SERVICE_TASK_SIZE; + taskcfg.func = bk_websocket_tts; + taskcfg.use_mem = USE_EXTEND_MEM; + + errcode_t ret=uapi_create_osThread_custom(&taskcfg); + + + if(ret != ERRCODE_SUCC) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"create cat1_service_file failed %d!\r\n",ret); + return ERRCODE_FAIL; + } + return ERRCODE_SUCC; +} + static uint8_t is_init_ai=1; + +int32_t uapi_tts_paly_init(void) +{ + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_tts_paly_init\n"); + + int32_t ret = ERRCODE_FAIL; + int32_t argc = 1; + uint8_t *argv = (uint8_t *)"StartAIpaly"; + { + ret = VoiceCallVolteSample(argc, (const char **)&argv); + } + + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ret %d ",ret); + + return ret; +} + + +int32_t uapi_tts_paly_stop(void) +{ + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_tts_paly_init\n"); + + int32_t ret = ERRCODE_FAIL; + int32_t argc = 1; + uint8_t *argv = (uint8_t *)"stop"; + { + ret = VoiceCallVolteSample(argc, (const char **)&argv); + } + + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ret %d ",ret); + + return ret; +} + + + + bool init_ai_task(void) { if(is_init_ai) { - asr_server_init(); - chat_server_init(); + uapi_tts_paly_init(); + // asr_server_init(); + // chat_server_init(); + tts_server_init(); // is_init_ai=0; } diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.h b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.h index 739ac8476..508f23a7b 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.h +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ws.h @@ -12,6 +12,9 @@ void uapi_stop_asr(void); bool init_ai_task(void); + void uapi_start_tts_single_txt(char *buf); + + #ifdef __cplusplus #if __cplusplus } diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.cpp new file mode 100644 index 000000000..bd4710233 --- /dev/null +++ b/code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.cpp @@ -0,0 +1,645 @@ +//设备鉴权 + +#define AIC_THIS_FILE 0x888899 +// #include +// #include +// #include +// // #include +// #include "app_msg.h" +// #include "aic_net_pdp_mgr.h" +// #include "aic_network_pcap.h" + +#include "cJSON.h" +// #include +// #include "aic_osa.h" +// #include "AI_AMP_2_5.h" +#include "mbedtls/base64.h" +#include "mbedtls/md5.h" +#include +#include +#include "mbedtls/aes.h" +#include "mbedtls/cipher.h" +#include "dev_authentication.h" +#include "bts_br_gap.h" +#include "custom_utils.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +void ase_encrypt_demo(void); + +// #include "aic_http_comm.h" + +// #define malloc malloc +// #define free free +// static char * dev_key = "uKLrChwrxA1LklgBc3VwawYjUkbT3BgX" ; +// static char * dev_pid = "cqxJZi5CNgzjS3mX21Zw"; +int get_dev_pass_MAX_len(void)//获取设备密码最大长度，注意要防止内存越界 +{ + // return sizeof(vc_cfg.dev_pass); +} +void save_dev_pass(char *dev_pass)//保存设备密码,dev_pass字符串 +{ + // memset(vc_cfg.dev_pass,0,sizeof(vc_cfg.dev_pass)); + // strncpy(vc_cfg.dev_pass,dev_pass,get_dev_pass_MAX_len()); + // save_VC_cfg(); +} +char *get_dev_pass(void)//获取设备密码，字符串的方式，返回字符串长度为0，即没密码 +{ + + // return vc_cfg.dev_pass; +} + +static char aut_token[50] ={0}; +int str_count(char *data,char type) +{ + int ret = 0; + //int count = 0; + while(1) + { + if(data[ret] == type) + break; + ret++; + if(ret>65532) + return 0; + } + return ret; +} +void ase_encrypt_dome(void); +//激活用的md5签名 +int active_md5_sign(const char *dev_id,const char *pid,const char *timestamp,const char *productSecret,char*md5_str) +{ + if(strlen(dev_id)>256) + return -1; + if(strlen(pid)>256) + return -2; + if(strlen(productSecret)>256) + return -3; + if(strlen(timestamp)>256) + return -4; + char md5_buf[16]={0}; + char *sign_buf = (char *)malloc(1024); + + if(!sign_buf) + return -10; + memset(sign_buf,0,1024); + int sign_len = 0; + strcpy(sign_buf,dev_id); + sign_len = strlen(sign_buf); + + strcpy(sign_buf+sign_len,pid); + sign_len = strlen(sign_buf); + + strcpy(sign_buf+sign_len,timestamp); + sign_len = strlen(sign_buf); + + strcpy(sign_buf+sign_len,productSecret); + sign_len = strlen(sign_buf); + printf("sign_buf:%s\r\n",sign_buf); + + + mbedtls_md5_context ctx; + + // 初始化MD5上下文 + mbedtls_md5_init(&ctx); + + // 开始计算MD5哈希 + mbedtls_md5_starts(&ctx); + // 更新要计算哈希的数据 + mbedtls_md5_update(&ctx, (const unsigned char *)sign_buf, sign_len); + + // 完成哈希计算 + mbedtls_md5_finish(&ctx, (unsigned char *)md5_buf); + + // printf("md5_buf\r\n"); + // for (int i = 0; i < 16; i++) { + // printf("%02X\n", (uint8_t)md5_buf[i]); + // } + // printf("md5_buf end\r\n"); + + // 清理MD5上下文 + mbedtls_md5_free(&ctx); + for (int i = 0; i < 16; i++) { + sprintf(&md5_str[i * 2], "%02x", (uint8_t)md5_buf[i]); + } + md5_str[32] = '\0'; + + free(sign_buf); + return 0; +} + +void active_md5_sign_demo(void) +{ + const char *dev_id ="1234567890";//imei号 + const char *timestamp = "1717752535000";//时间戳 + const char *pid = "Amg1HJ3dJkX3kLiLPNFg";//PID + const char *productSecret = "productSecret";//密钥 + char md5_buf[33]={0}; + active_md5_sign(dev_id,pid,timestamp,productSecret,md5_buf); + printf("md5_buf:%s",md5_buf); + ase_encrypt_demo(); +} +#define AES_BLOCK_SIZE 16 +// PKCS5填充 +void pkcs5_padding(unsigned char *data, size_t data_len, size_t block_size) { + size_t padding_len = block_size - (data_len % block_size); + for (size_t i = 0; i < padding_len; i++) { + data[data_len + i] = (unsigned char)padding_len; + } +} +// 移除PKCS5填充 +size_t pkcs5_unpadding(unsigned char *data, size_t data_len,size_t block_size) { + size_t padding_len = data[data_len - 1]; + if (padding_len > 0 && padding_len <= block_size) { + for (size_t i = 0; i < padding_len; i++) { + if (data[data_len - 1 - i] != (unsigned char)padding_len) { + return data_len; + } + } + return data_len - padding_len; + } + return data_len; +} + +//登录用的aes256加密 +int aes_cbc_pkcs5_encrypt(const char *input,int input_len,const char* str_key,const char* str_iv,char *Base64_output,int *Base64_output_len) +{ + + mbedtls_cipher_context_t ctx; + int ret; + unsigned char *aes_data =NULL; + unsigned char *padded_plaintext=NULL; + uint32_t aes_data_len = 0; + uint32_t padded_len; + // 初始化上下文 + mbedtls_cipher_init(&ctx); + + // 设置加密算法 + ret = mbedtls_cipher_setup(&ctx, mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_CBC)); + if (ret != 0) { + printf("mbedtls_cipher_setup failed: -0x%04x\n", -ret); + goto exit; + } + + // 设置密钥和IV + ret = mbedtls_cipher_setkey(&ctx, ( const unsigned char *)str_key, strlen(str_key) * 8, MBEDTLS_ENCRYPT); + if (ret != 0) { + printf("mbedtls_cipher_setkey failed: -0x%04x\n", -ret); + goto exit; + } + + ret = mbedtls_cipher_set_iv(&ctx, ( const unsigned char *)str_iv, strlen(str_iv)); + if (ret != 0) { + printf("mbedtls_cipher_set_iv failed: -0x%04x\n", -ret); + goto exit; + } + //printf("aes_cbc_pkcs5_encrypt2"); + // 计算填充后的长度 + padded_len = input_len; + if (padded_len % AES_BLOCK_SIZE != 0) { + padded_len += AES_BLOCK_SIZE - (padded_len % AES_BLOCK_SIZE); + }else + padded_len+=AES_BLOCK_SIZE; + //printf("aes_cbc_pkcs5_encrypt3"); + // 复制明文并进行填充 + padded_plaintext = (unsigned char *)malloc(padded_len); + if (padded_plaintext == NULL) { + ret = MBEDTLS_ERR_CIPHER_ALLOC_FAILED; + printf("Memory allocation failed\n"); + goto exit; + } + //printf("aes_cbc_pkcs5_encrypt4 padded_len :%d,input_len:%d",padded_len,input_len); + aes_data = (unsigned char *)malloc(padded_len); + if (aes_data == NULL) { + ret = MBEDTLS_ERR_CIPHER_ALLOC_FAILED; + printf("Memory allocation failed\n"); + goto exit; + } + //printf("aes_cbc_pkcs5_encrypt5"); + memcpy(padded_plaintext, input, input_len); + pkcs5_padding(padded_plaintext, input_len, AES_BLOCK_SIZE); + printf("aes_cbc_pkcs5_encrypt6"); + // 加密 + ret = mbedtls_cipher_update(&ctx, padded_plaintext, padded_len, aes_data, &aes_data_len); + if (ret != 0) { + printf("mbedtls_cipher_update failed: -0x%04x\n", -ret); + + goto exit; + } + printf("aes_cbc_pkcs5_encrypt7"); + mbedtls_base64_encode((unsigned char *)Base64_output, *Base64_output_len,(size_t *) Base64_output_len, aes_data, aes_data_len); + Base64_output[*Base64_output_len] = 0; + printf("aes_cbc_pkcs5_encrypt8."); + free(padded_plaintext); + printf("aes_cbc_pkcs5_encrypt9"); + free(aes_data); + + // 清理上下文 + mbedtls_cipher_free(&ctx); + return 0; + +exit: + mbedtls_cipher_free(&ctx); + if(aes_data) + free(aes_data); + if(padded_plaintext) + free(padded_plaintext); + return ret; +} + +// AES/CBC/PKCS5Padding解密 +int aes_cbc_pkcs5_decrypt(const char *Base64_str_input,const char* str_key,const char* str_iv,char *output,int *output_len) + // const unsigned char *key, size_t key_len, + // const unsigned char *iv, size_t iv_len, + // const unsigned char *ciphertext, size_t ciphertext_len, + // unsigned char *plaintext, size_t *plaintext_len) +{ + mbedtls_aes_context ctx = {0}; + int ret; + char *input_buf = NULL; + size_t input_buf_len; + char vi_tmp[16]; + // 初始化上下文 + mbedtls_aes_init(&ctx); + //printf("aes_cbc_pkcs5_decrypt str_key:%s,str_iv:%s!!!!!!!!!!!!!!!!!!!!!!!!", str_key,str_iv); + // // 设置加密算法 + // ret = mbedtls_cipher_setup(&ctx, mbedtls_cipher_info_from_type(MBEDTLS_CIPHER_AES_256_CBC)); + // if (ret != 0) { + // printf("mbedtls_cipher_setup failed: -0x%04x\n", -ret); + // goto exit; + // } + + // 设置密钥和IV + ret = mbedtls_aes_setkey_dec(&ctx, (const unsigned char*)str_key, strlen(str_key) * 8); + if (ret != 0) { + printf("mbedtls_cipher_setkey failed: -0x%04x\n", -ret); + goto exit; + } + + // ret = mbedtls_cipher_set_iv(&ctx, str_iv, strlen(str_iv)); + // if (ret != 0) { + // printf("mbedtls_cipher_set_iv failed: -0x%04x\n", -ret); + // goto exit; + // } + input_buf_len = strlen(Base64_str_input)+1; + input_buf = (char *)malloc(input_buf_len); + memset(input_buf,0,input_buf_len); + //printf("mbedtls_base64_decode1:input_buf_len:%d,Base64_str_input:%s",input_buf_len,Base64_str_input); + mbedtls_base64_decode((unsigned char *)input_buf, input_buf_len, &input_buf_len,( const unsigned char *) Base64_str_input, strlen(Base64_str_input)); + //printf("mbedtls_base64_decode2:input_buf_len:%d,output_len:%d",input_buf_len,*output_len); + // bk_print_hex(input_buf,input_buf_len); + // 解密 + + + memcpy(vi_tmp,str_iv,16); + ret = mbedtls_aes_crypt_cbc(&ctx,MBEDTLS_AES_DECRYPT,input_buf_len,(unsigned char *) vi_tmp,( const unsigned char *)input_buf,( unsigned char *)output); + *output_len = input_buf_len; + + if (ret != 0) { + printf("mbedtls_cipher_update failed: -0x%04x\n", -ret); + goto exit; + } + + // 清理上下文 + mbedtls_aes_free(&ctx); + //printf("aes_cbc_pkcs5_decrypt output_len:%d output:%s",*output_len,output); + // 移除填充 + *output_len = pkcs5_unpadding((unsigned char *)output, *output_len,AES_BLOCK_SIZE); + output[*output_len] = 0; + if(input_buf) + free(input_buf); + return 0; + + exit: + if(input_buf) + free(input_buf); + mbedtls_cipher_free((mbedtls_cipher_context_t *)&ctx); + return ret; +} +void ase_encrypt_demo(void) +{ + const char *data = "123456789123456789001234567890"; + size_t Base64_data_len = strlen(data)*3+32; + char *Base64_data =(char *) malloc(Base64_data_len); + memset(Base64_data,0,Base64_data_len); + aes_cbc_pkcs5_encrypt(data,strlen(data),"uKLrChwrxA1LklgBc3VwawYjUkbT3BgX","5555555566666666",Base64_data,(int *)&Base64_data_len); + printf("ase_encrypt_dome:aes_cbc_pkcs5_encrypt:len:%d,Base64_data:%s",Base64_data_len,Base64_data); + char *decrypt_data = (char *)malloc(Base64_data_len); + aes_cbc_pkcs5_decrypt(Base64_data,"uKLrChwrxA1LklgBc3VwawYjUkbT3BgX","5555555566666666",decrypt_data,(int *)&Base64_data_len); + printf("ase_encrypt_dome:aes_cbc_pkcs5_decrypt:len:%d,decrypt_data:%s",Base64_data_len,decrypt_data); + if(Base64_data) + free(Base64_data); + if(decrypt_data) + free(decrypt_data); +} + +/****************************************************************************** */ +int set_token(char *token) +{ + if(strlen(token)>=sizeof(aut_token)) + { + printf("ERROR token to0 long"); + return -1; + } + memset(aut_token,0,sizeof(aut_token)); + strcpy(aut_token,token); + return 0; + +} +int get_token(char *token) +{ + return 0; + // return aut_token; +} + + +//激活 + + +// 设备激活 + + +//激活->登录的密钥 +const char * key = "4EepovakpbqhZUnUDwH42KAADYGv4UUe" ; +//每小时更新登录一次的更新定时器 +// static aos_timer_ptr LOGIN_1H_timer = NULL; + +void aut_active(void)//设备激活 +{ + int ret; + printf("aut_active"); + // AIC_HTTPS_CLIENT_INSTANCE *http_client; + char dev_pass_base64[100] ={0}; + char enc_iv[65] = {0}; + // http创建客户端句柄 + + char *json_string =NULL; + cJSON *root = NULL; + + + unsigned char deviceId[6] = {0}; + unsigned int len = 6; + + + memset(deviceId,0,6); + bluetooth_get_local_addr(&deviceId[0],len); + + char deviceId_temp[20] = {0}; + + sprintf(deviceId_temp,"%02X%02x%02X%02x%02X%02x",deviceId[5],deviceId[4],deviceId[3],deviceId[2],deviceId[1],deviceId[0]); + + + time_t timestamp; + timestamp = time(NULL); + printf("2时间戳: %ld\n", (long)timestamp); + long long timestamp_ms = (long long)timestamp * 1000; + + char* timestamp_str_2=(char *)malloc(20); + memset(timestamp_str_2,0,20); + + // 使用 sprintf 将 long long 类型的时间戳转换为字符串 + ret = sprintf(timestamp_str_2, "%lld", timestamp_ms); + // 打印转换后的字符串形式的时间戳 + + + const char *dev_pid = "Y1DxRdBfnzVZQrXHdrNl";//PID + // const char *dev_key = "4EepovakpbqhZUnUDwH42KAADYGv4UUe";//密钥 + + char md5_buf[33]={0}; + active_md5_sign((char *)deviceId_temp,dev_pid,timestamp_str_2,key,md5_buf); + printf("md5_buf:%s",md5_buf); + + + const char *signMethod ="MD5"; + + uint32_t response = 0; + //创建客户端实例 + + + // 创建JSON对象 + root = cJSON_CreateObject(); + if (root == NULL) { + printf( "Failed to create JSON object\n"); + return; + } + + // 添加字段 + cJSON_AddStringToObject(root, "deviceId", (char *)deviceId_temp); + cJSON_AddStringToObject(root, "pid", dev_pid); + cJSON_AddStringToObject(root, "sign", md5_buf); + + printf("时间戳(ms 转换为字符串): %s\n", timestamp_str_2); + + cJSON_AddStringToObject(root, "timeStamp", timestamp_str_2); + + free(timestamp_str_2); + + cJSON_AddStringToObject(root, "signMethod", signMethod); + + // 生成JSON字符串 + json_string = cJSON_Print(root); + if (json_string == NULL) { + printf("Failed to print JSON\n"); + cJSON_Delete(root); + return; + } + + // 输出JSON + printf("JSON output: %s\n", json_string); + extern void put_data_by_get_file(char *data,uint16_t data_len); + + put_data_by_get_file(json_string,strlen(json_string)); + + cJSON_free(json_string); +} + + + +extern bool read_dev_pass(char *data_pass); +extern void post_data_by_get_file(char *data,uint16_t data_len); + + +void aut_login(void)//登录 +{ + printf("dev_sign_in 1"); + char dev_pass[64]={0}; + if(read_dev_pass(dev_pass)==false) + return ; + + + printf("dev_sign_in 2"); + int count = 5; + char *encrypt_data = NULL; + char *response_data =NULL; + int aut_login_http_handle = 0; + char enc_iv[17]={0}; + + // 随机生成16个字符串 设备生成做加密使用 + //char *random_string= generate_random_string(); // 随机的16个字符串 + // 设备端进行密码加密 + /** + * password, productSecret, nonce utJMIAPRN1E81DzSDVigh/f0ZmHQdBgdAGZ/DhkPJ/s= uKLrChwrxA1LklgBc3VwawYjUkbT3BgX qgofeplofqeoadha + */ + int encrypt_data_len = 512; + encrypt_data = (char *)malloc(encrypt_data_len); + + + // 登录数据 + unsigned char deviceId[20] = {0}; + //aic_srv_tele_radio_get_current_slot_imei_sync(deviceId); + memset(deviceId,0,6); + bluetooth_get_local_addr(&deviceId[0],6); + + char deviceId_temp[20] = {0}; + + sprintf(deviceId_temp,"%02X%02x%02X%02x%02X%02x",deviceId[5],deviceId[4],deviceId[3],deviceId[2],deviceId[1],deviceId[0]); + + time_t timestamp; + timestamp = time(NULL); + printf("2时间戳: %ld\n", (long)timestamp); + long long timestamp_ms = (long long)timestamp * 1000; + char timestamp_str[20] ={0}; + + // 使用 sprintf 将 long long 类型的时间戳转换为字符串 + sprintf(timestamp_str, "%lld", timestamp_ms); + memset(enc_iv,'1',16); + memcpy(enc_iv,timestamp_str,strlen(timestamp_str)); + + enc_iv[16] = 0; + aes_cbc_pkcs5_encrypt(dev_pass, strlen(dev_pass), key, enc_iv,encrypt_data,&encrypt_data_len);//加密 + + cJSON *root = cJSON_CreateObject(); + if (root == NULL) + { + return; + } + // 添加字段 + cJSON_AddStringToObject(root, "deviceId", deviceId_temp); + cJSON_AddStringToObject(root, "password", encrypt_data); + cJSON_AddStringToObject(root, "nonce", enc_iv); + // 生成JSON字符串 + char *json_string = cJSON_Print(root); + if (json_string == NULL) + { + printf( "Failed to print JSON\n"); + cJSON_Delete(root); + return; + } + printf("json_string:%s",json_string); + + post_data_by_get_file(json_string,strlen(json_string)); + + cJSON_free(json_string); +} + + +// void aut_chack_token(void)//检查token +// { + +// } + +//每小时更新一次登录 +static void LOGIN_1H_timeout(void *param) +{ + // if (sizeof(dev_pass) == 0) + // aut_active();//没有密钥走激活 + // //每小时登录一次 + // aut_login(); + dev_authentication_MSG_put(NULL,0,AUT_LOGIN); +} +// static aos_thread_id dev_authentication_id = 0; +// static aos_queue_ptr dev_authentication_task_queue = NULL; +//鉴权消息发送 +void dev_authentication_MSG_put(const char *data,uint32_t len,dev_authentication_MSG_Type MSG_Type) +{ + dev_authentication_MSG_queue_t dev_authentication_MSG_queue_data = {0}; + //bk_msg_printf("dev_authentication_MSG_put1 MSG_Type:%d",MSG_Type); + if(len >0) + { + dev_authentication_MSG_queue_data.data = (char *)malloc(len+1); + memset(dev_authentication_MSG_queue_data.data ,0,len+1); + if(!dev_authentication_MSG_queue_data.data) + { + //bk_msg_printf("AI_VC_send_data malloc ERROR!!!!!!!!!!"); + return ; + } + memcpy(dev_authentication_MSG_queue_data.data,data,len); + dev_authentication_MSG_queue_data.len=len; + } + + dev_authentication_MSG_queue_data.MSG_Type=MSG_Type; + // if(dev_authentication_task_queue && AOS_SUCCESS!=aos_send_to_queue(dev_authentication_task_queue,&dev_authentication_MSG_queue_data,AOS_NO_WAIT)) + { + if(!dev_authentication_MSG_queue_data.data) + free(dev_authentication_MSG_queue_data.data); + return ; + } + //bk_msg_printf("dev_authentication_MSG_put2 MSG_Type:%d",MSG_Type); + return ; +} +static void dev_authentication_task(void *thread_input)//鉴权逻辑线程 +{ + dev_authentication_MSG_queue_t dev_authentication_msg = {0}; + //ase_encrypt_demo(); + //dev_NTP();//获取时间 + //aut_active();//激活 + aut_login();//登录 + // if(LOGIN_1H_timer == NULL) + // { + // LOGIN_1H_timer = aos_create_timer("AI_VC_1S_timer", + // LOGIN_1H_timeout, &LOGIN_1H_timer, + // 60000*60, + // AOS_AUTO_ACTIVATE, AOS_BE_PERIOD); + // aic_assert(LOGIN_1H_timer); + // } + + // /** + // * 原来已激活过了...AuthVo(password=rPbSCNTIVYWKso6I5+6l0KIbSiIembg3p10IEny2UVg=, deviceId=860132061481751, nonce=xiRqXDqkqGFodIiw) + // */ + // while (1) { + // if(dev_authentication_task_queue) + // { + // aos_recv_from_queue(dev_authentication_task_queue,&dev_authentication_msg,AOS_WAIT_FOREVER) ; + // switch (dev_authentication_msg.MSG_Type) + // { + // case AUT_ACTIVE://激活 + // aut_active(); + // break; + // case AUT_LOGIN://登录 + // aut_login(); + // break; + // // case AUT_CHACK_TOKEN://检查token + // // aut_chack_token(); + // // break; + // } + // if(dev_authentication_msg.data) + // free(dev_authentication_msg.data); + // }else + // { + // aos_sleep(10); + // } + // } +} +void dev_authentication_init(void) +{ + // //创建设备激活队列 + // if(dev_authentication_task_queue == NULL) + // { + // dev_authentication_task_queue = aos_create_queue("dev_authentication_task_queue", + // sizeof(dev_authentication_MSG_queue_t), + // 200); + // } + // dev_authentication_id = aos_create_thread( + // "dev_authentication_task", + // dev_authentication_task, + // &dev_authentication_id, + // 4096u, + // 0, + // NULL, + // 35, + // AOS_AUTO_START); +} +#ifdef __cplusplus +} +#endif /* __cplusplus */ \ No newline at end of file diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.h b/code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.h new file mode 100644 index 000000000..6d91265c4 --- /dev/null +++ b/code/sdk/drivers/peripheral/slip/cat1Service/dev_authentication.h @@ -0,0 +1,40 @@ + +#ifndef __DEV_AUTHENTICATION_H__ +#define __DEV_AUTHENTICATION_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +void active_md5_sign_demo(void); + +void dev_authentication_init(void); +int aes_cbc_pkcs5_encrypt(const char *input,int input_len, +const char* str_key,const char* str_iv,char *Base64_output,int *Base64_output_len); +//激活用的md5签名 +int active_md5_sign(const char *dev_id,const char *pid,const char *timestamp,const char *productSecret,char*md5_str); +int str_count(char *data,char type); +// int get_token(void); +typedef enum dev_authentication_MSG +{ + AUT_ACTIVE,//激活 + AUT_LOGIN,//登录 + //AUT_CHACK_TOKEN//检查令牌 + +} dev_authentication_MSG_Type; +typedef struct +{ + char *data; + uint32_t len; + dev_authentication_MSG_Type MSG_Type; +}dev_authentication_MSG_queue_t; +void dev_authentication_MSG_put(const char *data,uint32_t len,dev_authentication_MSG_Type MSG_Type); + +void aut_active(void);//设备激活; +void aut_login(void);//设备激活; + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif \ No newline at end of file diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/http_cat1.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/http_cat1.cpp new file mode 100644 index 000000000..f3115cabe --- /dev/null +++ b/code/sdk/drivers/peripheral/slip/cat1Service/http_cat1.cpp @@ -0,0 +1,308 @@ +#include "lwip/apps/http_client.h" + + +#include + +#include "bletest.h" +#include "custom_utils.h" +#include "custom_runtime.h" +#include "bleANCS.h" +#include "cat1_tcpServer.h" +#include "custom_utils.h" +#include "broadcast_feature.h" +#include "cmsis_os2.h" +#include "cat1_ctl.h" +#include "wearable_log.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#define HTTP_JSON_SERVER_NAME "app-api.raisound.com"//"test.app.api.thisiot.com"//获取升级服务器 +#define PORT (80)// (80)http端口号 (443)//https端口号 +#define PUT_URL "/dev/auth/active"//激活接口 +#define POST_URL "/dev/auth/sign_in"//登录接口 + + +#define AUTH_ACTIVE "/user/userdata/ota_report_.json"//上报升级得到的json + +#define AUTH_SIGN_IN "/user/userdata/sign_in.json"//上报升级得到的json + + + + +static httpc_connection_t settings = {0}; + + + static err_t httpc_download_headers_done_ui(httpc_state_t *connection, void *arg, struct pbuf *hdr, u16_t hdr_len, u32_t content_len) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_headers_done_ui hdrlen %d, file len %d\r\n",hdr_len,content_len); + // file_total_len = content_len; + return 0; + } + static err_t httpc_download_file_recv_ui(httpc_state_t *connection, u32_t rx_len,u32_t rx_total_len) + { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_file_recv_ui recv %d bytes total received %d filelen %d\r\n",rx_len,rx_total_len,file_total_len); + return 0; + } + + static void httpc_download_result_data_put(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", + httpc_result,rx_content_len,srv_res,err); + if(srv_res==200) + { + //激活成功 + } + return ; + } + // {"success":true,"msg":"登录成功","code":20001,"data":{"deviceId":"28110601009b","token":"95fc6dcdf5a3e9a48df535453efd097c19"}} + + static void httpc_download_result_data_post(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", + httpc_result,rx_content_len,srv_res,err); + if(srv_res==200) + { + //登录成功 + } + return ; + } + + + +void put_data_by_get_file(char *data,uint16_t data_len) +{ + memset_s(&settings,sizeof(settings),0,sizeof(settings)); + settings.use_proxy=0; + + settings.use_put=1; + settings.args=(u8_t*)data; + settings.arglen=data_len; + uint8_t *otadatapath =(uint8_t *)AUTH_ACTIVE; + + settings.result_fn=httpc_download_result_data_put; + settings.file_rx_fn = httpc_download_file_recv_ui; + settings.headers_done_fn = httpc_download_headers_done_ui; + + httpc_state_t* connection=NULL; + err_t rett= httpc_get_file_dns_to_disk( + HTTP_JSON_SERVER_NAME, + PORT, + PUT_URL, + &settings, + NULL, + (const char*) otadatapath, + &connection); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"custom_start_ota_download %d \r\n",rett); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "use_put"); +} + + +void post_data_by_get_file(char *data,uint16_t data_len) +{ + memset_s(&settings,sizeof(settings),0,sizeof(settings)); + settings.use_proxy=0; + + settings.use_post=1; + settings.args=(u8_t*)data; + settings.arglen=data_len; + uint8_t *otadatapath =(uint8_t *)AUTH_SIGN_IN; + + settings.result_fn=httpc_download_result_data_post; + settings.file_rx_fn = httpc_download_file_recv_ui; + settings.headers_done_fn = httpc_download_headers_done_ui; + + httpc_state_t* connection=NULL; + err_t rett= httpc_get_file_dns_to_disk( + HTTP_JSON_SERVER_NAME, + PORT, + POST_URL, + &settings, + NULL, + (const char*) otadatapath, + &connection); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"custom_start_ota_download %d \r\n",rett); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "use_post"); +} +// {"success":true, +// "msg":"激活成功.", +// "code":20000, +// "data": +// {"password": +// "mCx3DK7AqNyCXiP7/Iim4X4/e2Y5h/ZA4n9qLN3V4Z0=", +// "deviceId":"28110601009b","nonce":"OlhdyxEkdqJVPyvr"} +// } +extern int aes_cbc_pkcs5_decrypt(const char *Base64_str_input,const char* str_key,const char* str_iv,char *output,int *output_len); + +bool read_dev_pass(char *data_pass) +{ + char buf[512]={0}; + + FILE *fp=fopen(AUTH_ACTIVE,"rb+"); + int read_size; + + uint32_t pack=512; + + if(fp==NULL) + { + return false; + } + + memset_s(buf,512,0,512); + read_size=fread(buf,1,512,fp); + if(read_size!=0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "buf %d %s",read_size,buf); + } + fclose(fp); + + char *p=buf; + while (*p!='{' && *p !='\0') + { + p++; + } + + cJSON* root = cJSON_Parse((const char *)p); + if (root == NULL) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"解析失败\n"); + return false; + } + char *password_str=NULL; + char * nonce_str=0; + + cJSON* data = cJSON_GetObjectItem(root, "data"); + if (data) + { + cJSON* password = cJSON_GetObjectItem(data, "password"); + if (password && cJSON_IsString(password)) { + password_str= password->valuestring; + } + + cJSON* nonce = cJSON_GetObjectItem(data, "nonce"); + if (nonce && cJSON_IsString(nonce)) { + nonce_str = nonce->valuestring; + } + + } + + int dev_pass_len =64; + char *dev_pass =(char *)malloc(dev_pass_len); + if(dev_pass) + { + memset(dev_pass,0,dev_pass_len); + if(strlen(nonce_str)>8 && strlen(password_str)>8) + { + aes_cbc_pkcs5_decrypt(password_str, "4EepovakpbqhZUnUDwH42KAADYGv4UUe", nonce_str,dev_pass,&dev_pass_len);//解密 + dev_pass[dev_pass_len] = 0; + printf("dev_pass:%s dev_pass_len:%d\n",dev_pass,dev_pass_len); + } + + }else + { + printf("dev_pass malloc error!!!!!!!!!!!"); + } + + if(strlen(password_str)>=0) + { + memcpy(data_pass,dev_pass,dev_pass_len); + free(dev_pass); + return true; + } + + return false; +} + +// {"success":true,"msg":"登录成功","code":20001,"data":{"deviceId":"28110601009b","token":"95fc6dcdf5a3e9a48df535453efd097c19"}} + +bool read_dev_token(char *data_token) +{ + char buf[512]={0}; + + FILE *fp=fopen(AUTH_SIGN_IN,"rb+"); + int read_size; + + uint32_t pack=512; + + if(fp==NULL) + { + return false; + } + + memset_s(buf,512,0,512); + read_size=fread(buf,1,512,fp); + if(read_size!=0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "buf %d %s",read_size,buf); + } + fclose(fp); + + char *p=buf; + while (*p!='{' && *p !='\0') + { + p++; + } + + cJSON* root = cJSON_Parse((const char *)p); + if (root == NULL) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"解析失败\n"); + return false; + } + char *token_str=NULL; + + cJSON* data = cJSON_GetObjectItem(root, "data"); + if (data) + { + cJSON* token = cJSON_GetObjectItem(data, "token"); + if (token && cJSON_IsString(token)) { + token_str= token->valuestring; + } + } + + if(strlen(token_str)>=0) + { + memcpy(data_token,token_str,strlen(token_str)); + return true; + } + + return false; +} + +void read_file_put(void ) +{ + char buf[1024]={0}; + + FILE *fp=fopen(AUTH_SIGN_IN,"rb+"); + int read_size; + + uint32_t pack=1024; + + if(fp==NULL) + { + return; + } + do + { + memset_s(buf,1024,0,1024); + read_size=fread(buf,1,1024,fp); + + if(read_size!=0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "buf %d %s",read_size,buf); + } + + } while (read_size==1024); + fclose(fp); + +} + + + + + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ \ No newline at end of file diff --git a/code/sdk/kernel/liteos/liteos_v207.1.0/Huawei_LiteOS/tools/build/config/brandy.config b/code/sdk/kernel/liteos/liteos_v207.1.0/Huawei_LiteOS/tools/build/config/brandy.config index 930c26cc0..31bbe1ca1 100755 --- a/code/sdk/kernel/liteos/liteos_v207.1.0/Huawei_LiteOS/tools/build/config/brandy.config +++ b/code/sdk/kernel/liteos/liteos_v207.1.0/Huawei_LiteOS/tools/build/config/brandy.config @@ -76,7 +76,7 @@ LOSCFG_TASK_JOINABLE=y LOSCFG_BASE_CORE_TSK_MONITOR=y LOSCFG_TASK_STACK_STATIC_ALLOCATION=y LOSCFG_TASK_STACK_DYNAMIC_ALLOCATION=y -LOSCFG_BASE_CORE_TSK_LIMIT=64 +LOSCFG_BASE_CORE_TSK_LIMIT=72 LOSCFG_BASE_CORE_TSK_MIN_STACK_SIZE=1024 LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE=2048 LOSCFG_BASE_CORE_TSK_SWTMR_STACK_SIZE=3072 diff --git a/code/sdk/middleware/services/media/foundation/sample/wrapper/audio_capture_wrapper.cpp b/code/sdk/middleware/services/media/foundation/sample/wrapper/audio_capture_wrapper.cpp index 63c020aa2..028b4c422 100755 --- a/code/sdk/middleware/services/media/foundation/sample/wrapper/audio_capture_wrapper.cpp +++ b/code/sdk/middleware/services/media/foundation/sample/wrapper/audio_capture_wrapper.cpp @@ -27,6 +27,7 @@ #include "audio_manager.h" #include "media_log.h" #include "media_thread_adapt.h" +#include "voice_call_volte_sample_wrapper.h" #ifdef __cplusplus extern "C" { @@ -495,19 +496,20 @@ int32_t streamingRecordAndSend_AI(int type) { // 定义argv数组在更大的作用域 const char *argv[6]; - if(ai_4g_enable_flag == 1) + // if(ai_4g_enable_flag == 1) { argv[0] = "01"; argv[1] = "mp3"; argv[2] = "16000"; argv[3] = "1"; argv[4] = "16"; argv[5] = "/user/aiRecord.sbc"; } - else - { - argv[0] = "01"; argv[1] = "sbc"; argv[2] = "16000"; - argv[3] = "1"; argv[4] = "16"; argv[5] = "/user/aiRecord.sbc"; - } + // else + // { + // argv[0] = "01"; argv[1] = "sbc"; argv[2] = "16000"; + // argv[3] = "1"; argv[4] = "16"; argv[5] = "/user/aiRecord.sbc"; + // } int32_t argc = 6; Cur_AI_Model = type; if (g_audioSourceProcessInput.bThreadRun) { + MEDIA_ERR_LOG("g_audioSourceProcessInput.bThreadRun"); return HandleAudioCaptureCmd(argc, argv); } std::string filePath = ""; @@ -560,6 +562,8 @@ int32_t streamingRecordAndSend_AI(int type) #endif g_audioCap.reset(); (void)g_amInstance.DeactivateAudioInterrupt(g_sample.interrupt); + MEDIA_ERR_LOG("AudioCaptureSetInfo failed"); + goto EXIT; } g_sample.audioCaptureProcess = MediaThreadCreate(AudioCaptureProcess_AI, pfd, &attr); @@ -572,6 +576,9 @@ EXIT: g_audioSourceProcessInput.bThreadRun = false; return -1; } + + + #ifdef __cplusplus }; #endif diff --git a/code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.cpp b/code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.cpp index 452c06492..55ab83aa2 100755 --- a/code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.cpp +++ b/code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.cpp @@ -75,6 +75,7 @@ static int32_t VoiceCallMicMute(const char **param); static int32_t StartHFPVoiceCall(const char **param); static int32_t NO_LOCAL_VOICE_CALL_RequsetAudioFocus(const char **param); static int32_t ReleaseAudioFocus_HFP(const char **param); +static int32_t StartAIpaly(const char **param); // static int32_t updata_Audio_code_hfp(const char **param); static AudioSession g_sessionId=0; @@ -112,7 +113,8 @@ static FuncsMap g_voiceCallVolteFuncs[] = { { "startSCO",StartHFPVoiceCall}, { "stopcall",stopcall}, // { "RequsetAudioFocus",NO_LOCAL_VOICE_CALL_RequsetAudioFocus}, - { "ReleaseAudioFocus",ReleaseAudioFocus_HFP} + { "ReleaseAudioFocus",ReleaseAudioFocus_HFP}, + { "StartAIpaly",StartAIpaly}, // { "updata_Audio_code_hfp",updata_Audio_code_hfp} }; @@ -583,6 +585,47 @@ static int32_t NO_LOCAL_VOICE_CALL_RequsetAudioFocus(const char **param) } +static int32_t AIRequsetAudioFocus(const char **param) +{ + bool success; + + success = g_amInstance.Initialize(); + if (!success) { + MEDIA_ERR_LOG("audiomanager init failed"); + return -1; + } + + AudioSession sessionId; + + sessionId = g_amInstance.MakeSessionId(); + + if (sessionId == AUDIO_SESSION_ID_NONE) { + MEDIA_ERR_LOG("audio session id invalid"); + return -1; + } + + + std::shared_ptr interruptListener = + std::make_shared((VoiceCallVolteContext*)NULL); + if (interruptListener == nullptr || interruptListener.get() == nullptr) { + MEDIA_ERR_LOG("voice call volte interrupt listener is nullptr"); + return -1; + } + + AudioInterrupt interrupt = { AUDIO_STREAM_VOICE_ASSISTANT, sessionId, interruptListener }; + if (g_amInstance.ActivateAudioInterrupt(interrupt) == INTERRUPT_FAILED) { + MEDIA_ERR_LOG("activate audio interrupt failed"); + return -1; + } + + g_sessionId = sessionId; + g_interrupt = interrupt; + + + return 0; +} + + #ifdef LOCAL_VOICE_CALL @@ -1068,13 +1111,171 @@ static int32_t StartHFPVoiceCall(const char **param) return 0; } +///////////////////////////////////////////////////////////////////////////////////// +static int32_t ReleaseAIAudioFocus(const char **param) +{ + if (g_amInstance.DeactivateAudioInterrupt(g_interrupt) != 0) { + MEDIA_ERR_LOG("deactivate audio interrupt failed"); + return -1; + } + g_sessionId=0; + MEDIA_ERR_LOG("succ ReleaseAIAudioFocus"); + return 0; +} + +static void AiDeinitVoiceCallVolteResources(VoiceCallVolteContext *context) +{ + (void)g_stream_out_downink.reset(); + + (void)MediaThreadCondDestroy(&context->cond); + (void)MediaMutexDestroy(&context->mutex); + + if (g_voiceCallVolteContext != nullptr) { + free(g_voiceCallVolteContext); + g_voiceCallVolteContext = nullptr; + } +} + + + +static int32_t RunVoiceCallVolteAI(VoiceCallVolteContext *context) +{ + bool success = InitVoiceCallVolteResources(context); + if (!success) { + MEDIA_ERR_LOG("init voice call volte resources failed"); + return -1; + } + int32_t ret ; + + g_stream_out_downink = std::make_shared(); + // 16000 32000 44100 48000 + AudioRendererConfig renderConfig = {}; + renderConfig.audioFormat = PCM; + renderConfig.channelCount = 1; + renderConfig.linkDir = AUDIO_DOWN_LINK; + renderConfig.sampleRate = 16000; + renderConfig.sessionID = context->sessionId; + renderConfig.streamType = AUDIO_STREAM_VOICE_ASSISTANT; + + ret = g_stream_out_downink->Init(renderConfig); + if (ret != 0) { + MEDIA_ERR_LOG("audio stream out uplink init failed"); + } + + ret = g_stream_out_downink->Play(); + if (ret != 0) { + MEDIA_ERR_LOG("audio stream out downink play failed"); + } + // uint32_t asiDownlinkChannelId = 0; + // MEDIA_INFO_LOG("asiDownlinkChannelId: 0x%x", asiDownlinkChannelId); + // g_stream_out_downink->AttachFrontend(asiDownlinkChannelId); + MediaMutexLock(context->mutex); + while (!context->isVoiceCallVolteStopped) { + MediaThreadCondWait(context->cond, context->mutex); + } + MediaMutexUnLock(context->mutex); + + + ret = g_stream_out_downink->Stop(); + if (ret != 0) { + MEDIA_ERR_LOG("audio stream out downink stop failed"); + } + + ret = g_stream_out_downink->Release(); + if (ret != 0) { + MEDIA_ERR_LOG("audio stream out downink release failed"); + } + + + AiDeinitVoiceCallVolteResources(context); + + return 0; +} +AudioSession get_ai_g_sessionId(void) +{ + MEDIA_ERR_LOG("get_ai_g_sessionId %d",g_sessionId); + return g_sessionId; +} + + +static void *VoiceAIThread(void *priv) +{ + VoiceCallVolteContext *context = (VoiceCallVolteContext *)priv; + if(g_sessionId==0) + { + AIRequsetAudioFocus(NULL); + } + context->sessionId=g_sessionId; + MEDIA_ERR_LOG("VoiceAIThread %d",g_sessionId); + + int32_t ret = RunVoiceCallVolteAI(context); + if (ret != 0) { + MEDIA_ERR_LOG("run voice call volte failed"); + return nullptr; + } + + ReleaseAIAudioFocus(NULL); + printf("VoiceCallVolteHFPThread END"); + return nullptr; +} + + + +int32_t AIStreamWrite(uint8_t *buf,uint32_t size) +{ + int32_t ret; + + uint64_t writeLen = 0; + AudioRendererConfig renderConfig; + ret = g_stream_out_downink->StreamWrite(buf,size, writeLen, renderConfig); + + return ret; +} + + + + +static int32_t StartAIpaly(const char **param) +{ + MediaMutexLock(g_voiceCallVolteContextMutex); + if (g_voiceCallVolteContext != nullptr) { + MEDIA_ERR_LOG("invalid operation"); + return -1; + } + + // 1. create VoiceCallVolteContext + g_voiceCallVolteContext = (VoiceCallVolteContext *)malloc(sizeof(VoiceCallVolteContext)); + if (g_voiceCallVolteContext == nullptr) { + MEDIA_ERR_LOG("malloc failed"); + MediaMutexUnLock(g_voiceCallVolteContextMutex); + return -1; + } + if (memset_s(g_voiceCallVolteContext, sizeof(VoiceCallVolteContext), 0, sizeof(VoiceCallVolteContext)) != EOK) { + MEDIA_ERR_LOG("memset_s failed"); + } + MediaMutexUnLock(g_voiceCallVolteContextMutex); + + // 3. create voice call volte thread + MediaThreadattr attr = { "VoiceCallVolteHFPThread", 0x2000, THREAD_SCHED_INVALID, 0, false }; + g_voiceCallVolteContext->taskHandle = MediaThreadCreate(VoiceAIThread, g_voiceCallVolteContext, &attr); + if ( g_voiceCallVolteContext->taskHandle == nullptr) { + MEDIA_ERR_LOG("create voice call volte thread failed"); + free(g_voiceCallVolteContext); + g_voiceCallVolteContext = nullptr; + return -1; + } + + // will free g_voiceCallVolteContext when sub thread play exit + return 0; +} + diff --git a/code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.h b/code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.h index bfeb4150a..8a1f45530 100755 --- a/code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.h +++ b/code/sdk/middleware/services/media/foundation/sample/wrapper/voice_call_volte_sample_wrapper.h @@ -9,6 +9,7 @@ #define VOICE_CALL_VOLTE_SAMPLE_WRAPPER_H #include +#include "audio_base_type.h" #ifdef __cplusplus extern "C" { @@ -18,6 +19,10 @@ int32_t VoiceCallVolteSample(int32_t argc, const char *argv[]); void updata_Audio_code_hfp(uint32_t type); +int32_t AIStreamWrite(uint8_t *buf,uint32_t size); + +AudioSession get_ai_g_sessionId(void); + #ifdef __cplusplus }; #endif diff --git a/code/sdk/open_source/openharmony/third_party/lwip/src/apps/http/http_client.c b/code/sdk/open_source/openharmony/third_party/lwip/src/apps/http/http_client.c index 2891ef1a9..2e767db37 100644 --- a/code/sdk/open_source/openharmony/third_party/lwip/src/apps/http/http_client.c +++ b/code/sdk/open_source/openharmony/third_party/lwip/src/apps/http/http_client.c @@ -152,6 +152,45 @@ #define HTTPC_REQ_11_HOST_FORMAT_POST(uri, srv_name, arglen, args) HTTPC_REQ_11_HOST_POST, uri, HTTPC_CLIENT_AGENT, srv_name, arglen, args +////////////////////////////////////////PUT报文/////////////////////////////////////////////////// +/* PUT request basic */ +#define HTTPC_REQ_11_PUT "PUT %s HTTP/1.1\r\n" /* URI */\ + "User-Agent: %s\r\n" /* User-Agent */ \ + "Accept: */*\r\n" \ + "Content-Type: application/json\r\n" \ + "Content-Length: %d\r\n" \ + "Connection: Close\r\n" /* we don't support persistent connections, yet */\ + "\r\n" \ + "%s" + +#define HTTPC_REQ_11_FORMAT_PUT(uri, arglen, args) HTTPC_REQ_11_PUT, uri, HTTPC_CLIENT_AGENT, arglen, args + +// PUT /api/user HTTP/1.1 +// Host: example.com +// Content-Type: application/json +// Content-Length: 123 + +// { +// "id": 123, +// "name": "John Doe", +// "email": "johndoe@example.com", +// "age": 30 +// } +/* PUT request with host */ +#define HTTPC_REQ_11_HOST_PUT "PUT %s HTTP/1.1\r\n" /* URI */\ + "User-Agent: %s\r\n" /* User-Agent */ \ + "Accept: */*\r\n" \ + "Host: %s\r\n" /* server name */ \ + "Content-Type: application/json\r\n" \ + "Content-Length: %d\r\n" \ + "Connection: Close\r\n" /* we don't support persistent connections, yet */ \ + "\r\n" \ + "%s" + +#define HTTPC_REQ_11_HOST_FORMAT_PUT(uri, srv_name, arglen, args) HTTPC_REQ_11_HOST_PUT, uri, HTTPC_CLIENT_AGENT, srv_name, arglen, args + + + typedef enum ehttpc_parse_state { HTTPC_PARSE_WAIT_FIRST_LINE = 0, HTTPC_PARSE_WAIT_HEADERS, @@ -546,11 +585,23 @@ httpc_create_request_string(const httpc_connection_t *settings, const char* serv return snprintf(buffer, buffer_size, HTTPC_REQ_11_HOST_FORMAT_POST(uri, server_name, settings->arglen, settings->args)); // printf("%s\r\n",buffer); } + if (settings->use_put) + { + return snprintf(buffer, buffer_size, HTTPC_REQ_11_HOST_FORMAT_PUT(uri, server_name, settings->arglen, settings->args)); + // printf("%s\r\n",buffer); + } + return snprintf(buffer, buffer_size, HTTPC_REQ_11_HOST_FORMAT(uri, server_name)); } else { + if (settings->use_put) + { + return snprintf(buffer, buffer_size, HTTPC_REQ_11_HOST_FORMAT_PUT(uri, server_name, settings->arglen, settings->args)); + // printf("%s\r\n",buffer); + } + if (settings->use_post){ return snprintf(buffer, buffer_size, HTTPC_REQ_11_FORMAT_POST(uri, settings->arglen, settings->args)); @@ -631,7 +682,8 @@ httpc_init_connection_common(httpc_state_t **connection, const httpc_connection_ /* set up request buffer */ req_len2 = httpc_create_request_string(settings, server_name, server_port, uri, use_host, (char *)req->request->payload, req_len + 1); - // printf("%s\r\n",(char *)req->request->payload); + printf("%s\r\n",(char *)req->request->payload); + if (req_len2 != req_len) { httpc_free_state(req); return ERR_VAL; diff --git a/code/sdk/open_source/openharmony/third_party/lwip/src/include/lwip/apps/http_client.h b/code/sdk/open_source/openharmony/third_party/lwip/src/include/lwip/apps/http_client.h index 1cce15ef4..721ef79b9 100644 --- a/code/sdk/open_source/openharmony/third_party/lwip/src/include/lwip/apps/http_client.h +++ b/code/sdk/open_source/openharmony/third_party/lwip/src/include/lwip/apps/http_client.h @@ -144,6 +144,8 @@ typedef struct _httpc_connection { httpc_file_rx_fn file_rx_fn; //添加post u8_t use_post; + u8_t use_put; + u16_t arglen; u8_t* args; -- 2.17.1