From: luozheng <1732036298@qq.com> Date: Wed, 3 Jul 2024 11:50:16 +0000 (+0800) Subject: Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=798daa8a57f4442d45271969dcf5cb4e11b14ce2;p=mirrors%2FFD230.git Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 --- 798daa8a57f4442d45271969dcf5cb4e11b14ce2 diff --cc code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp index 0caa8d9fe,6f7d3b84c..a0d491f68 --- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp +++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp @@@ -80,9 -80,72 +80,72 @@@ void ble_set_ai_Question_str(char *buf void ble_set_ai_Answer_str(char *buf) { - OHOS::AiVoiceModel::GetInstance().SetaiAnswerStrStr(std::string(buf)); + OHOS::AiVoiceModel::GetInstance().SetAiAnswerStrStr(std::string(buf)); } - + + // { + // "type":3, + // "list":[ + // { + // "uid":3758, + // "name":"plate_3758.bin", + // "size":129600 + // }, + // { + // "uid":3759, + // "name":"plate_3759.bin", + // "size":129600 + // } + // ] + // } + // 注:MP3文件目录格式 + // { + // "type":2, + // "list": [ + // { + // "uid":2461, //指定唯一编号,便于APP发送编号删除文件 + // "name":"夜曲.mp3", + // "size":3894464, + // "artist":"周杰伦", + // "dur":223000 //歌曲时长,单位毫秒 + // }, + // { + // "uid":2465, //指定唯一编号,便于APP发送编号删除文件 + // "name":"告白气球.mp3", + // "size":3894464, + // "artist":"周杰伦", + // "dur":223000 //歌曲时长,单位毫秒 + // } + // ] + // } + // Tag_Trailer_t Mp3Trailer; + + // void Tag_GetTrailer( FILE *fp) + // { + // // Get Header + // fseek(fp,-128,SEEK_END); + // fread(Mp3Trailer.Header,3,1,fp); + // // Get Title + // fseek(fp,-125,SEEK_END); + // fread(Mp3Trailer.Title,30,1,fp); + // // Get Artist + // fseek(fp,-95,SEEK_END); + // fread(Mp3Trailer.Artist,30,1,fp); + // // Get Album + // fseek(fp,-65,SEEK_END); + // fread(Mp3Trailer.Album,30,1,fp); + // // Get Year + // fseek(fp,-35,SEEK_END); + // fread(Mp3Trailer.Year,4,1,fp); + // // Get Comment + // fseek(fp,-31,SEEK_END); + // fread(Mp3Trailer.Comment,30,1,fp); + // // Get Cenre + // fseek(fp,-1,SEEK_END); + // fread(Mp3Trailer.Cenre,1,1,fp); + // } + + char * dir_to_json_buf_malloc_(uint8_t type) {