From: luozheng <1732036298@qq.com>
Date: Fri, 12 Jul 2024 08:15:22 +0000 (+0800)
Subject: Ai语音Model文件修改
X-Git-Tag: release_V1.2.70_20241020_135402~821
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8d733b722c276bb2d85eaef8d02c654963777bca;p=mirrors%2FFD230.git

Ai语音Model文件修改
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
index 839e5e256..4bd90555b 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-20 15:14:43
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-12 11:00:22
+ * @LastEditTime: 2024-07-12 16:02:11
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
  */
 #ifndef AI_VOICE_MODEL_H
@@ -13,8 +13,13 @@
 #include "iostream"
 #include "string"
 #include "ChatContentItem.h"
+#define AIAUDIO_TYPE_PCM 0
+#define AIAUDIO_TYPE_SBC 1
+#define AIAUDIO_TYPE_MSBC 2
+
+// 设置当前使用的音频类型，0 表示 PCM，1 表示 SBC，2 表示 MSBC
+#define CURRENT_AIAUDIO_TYPE AIAUDIO_TYPE_PCM
 
-#define IS_AIAUDIO_TYPE_PCM 1 /*AI录音文件是否是pcm格式*/
 namespace OHOS
 {
 
@@ -74,10 +79,12 @@ namespace OHOS
         AiVoiceModel &operator=(const AiVoiceModel &) = delete;
 
 // 私有成员变量
-#if IS_AIAUDIO_TYPE_PCM
+#if CURRENT_AIAUDIO_TYPE == AIAUDIO_TYPE_PCM
         std::string AIAIAudioPath = "/user/userdata/AiRecording/AIAudio.pcm"; // AI录音的文件路径
-#else
+#elif CURRENT_AIAUDIO_TYPE == AIAUDIO_TYPE_SBC
         std::string AIAIAudioPath = "/user/userdata/AiRecording/AIAudio.sbc"; // AI录音的文件路径
+#elif CURRENT_AIAUDIO_TYPE == AIAUDIO_TYPE_MSBC
+        std::string AIAIAudioPath = "/user/userdata/AiRecording/AIAudio.msbc"; // AI录音的文件路径
 #endif
         std::string userQuestionStr;                                         // 用户提出的问题
         std::string aiAnswerStr;                                             // AI回答的问题
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 6e9e881a1..8ec0813ba 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-20 15:14:50
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-12 10:59:18
+ * @LastEditTime: 2024-07-12 11:59:20
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
  */
 #include "aivoice/include/AiVoiceModel.h"
@@ -412,10 +412,12 @@ namespace OHOS
             {
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_delete_files fail!!");
             }
-#if IS_AIAUDIO_TYPE_PCM
+#if CURRENT_AIAUDIO_TYPE == AIAUDIO_TYPE_PCM
             const char *defaultArgs[6] = {"01", "pcm", "16000", "1", "16", audioPath.c_str()};
-#else
+#elif CURRENT_AIAUDIO_TYPE == AIAUDIO_TYPE_SBC
             const char *defaultArgs[6] = {"01", "sbc", "16000", "1", "16", audioPath.c_str()};
+#elif CURRENT_AIAUDIO_TYPE == AIAUDIO_TYPE_MSBC
+            const char *defaultArgs[6] = {"01", "msbc", "16000", "1", "16", audioPath.c_str()};
 #endif
             AudioCaptureSample(6, (const char **)defaultArgs);
         }