n9九天大模型替换为“星辰康瑞”

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceModel.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceModel.h
index a048d2d..4a13a37 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceModel.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceModel.h
@@ -30,6 +30,8 @@
 // 设置当前使用的音频类型，0 表示 PCM，1 表示 SBC，2 表示 MSBC
 #define CURRENT_AIAUDIO_TYPE AIAUDIO_TYPE_SBC
 
+#define AI_VOICE_XINGCHEN 0  //打开星辰康瑞的宏
+
 #if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_CHINA_MOBILE_AI_REGULATION) || defined(SUPPORT_CHINA_MOBILE_AI_REGULATION)
     #define AI_VOICE_FD230  // 九天版本
 #elif defined(BOARD_N9)

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceView.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceView.h
index 48c5cb6..4afda32 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceView.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceView.h
@@ -44,6 +44,7 @@ namespace OHOS
     static constexpr const char *AIMODEL_IFLYTEK_SPARK_PATH = "/user/res/AIVoice/aimodels/aimodes_iflytek_spark.bin";   /*讯飞星火*/
     static constexpr const char *AIMODEL_DEEPSEEK_PATH = "/user/res/AIVoice/aimodels/aimodes_deepseek.bin";             /*deepseek*/
     static constexpr const char *AIMODEL_LINGXI_PATH = "/user/res/AIVoice/aimodels/aimodels_lingxi.bin";                /*jiutian*/
+    static constexpr const char *AIMODEL_XINGCHEN_PATH = "/user/res/AIVoice/aimodels/aimodes_xingchen.bin";             /*星辰ai*/
 
     /*组件ID*/
     static constexpr const char *AIVOICE_START_CHAT_BUTTON_VIEW_ID = "aivoice_start_chat_button_view_id"; // 开始对话
@@ -79,7 +80,11 @@ namespace OHOS
         {STR_DEEPSEEK, AIMODEL_DEEPSEEK_PATH},
         {STR_IFLYTEK_SPARK, AIMODEL_IFLYTEK_SPARK_PATH},
         {STR_AIMODES_CHATGPT, AIMODEL_CHATGPT_ON_PATH},
+        #if (AI_VOICE_LINGXI)
         {STR_JIUTIAN, AIMODEL_LINGXI_PATH},
+        #else
+        {STR_JIUTIAN, AIMODEL_XINGCHEN_PATH},
+        #endif
     };
 
     class AiVoicePresenter;

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp
index a3563a5..0b18835 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp
@@ -90,8 +90,14 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height);
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);
-        if(labelconfig.textId == STR_JIUTIAN) 
+        if(labelconfig.textId == STR_JIUTIAN)
+        { 
+            #if AI_VOICE_XINGCHEN
+            label->SetText("星辰康瑞");
+            #else
             label->SetText("中国移动智能助理灵犀");
+            #endif
+        }
         else
             label->SetTextId(labelconfig.textId);
         label->SetTextId(labelconfig.textId);
@@ -279,8 +285,14 @@ namespace OHOS
     {
         if (title)
         {
-            if(textId == STR_JIUTIAN) 
+            if(textId == STR_JIUTIAN)
+            { 
+                #if AI_VOICE_XINGCHEN
+                title->SetText("星辰康瑞");
+                #else
                 title->SetText("中国移动智能助理灵犀");
+                #endif
+            }
             else
                 title->SetTextId(textId);
             title->ForceResetText();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp
index 139c98e..ffc7861 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp
@@ -179,8 +179,14 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height);
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);
-        if(labelconfig.textId == STR_JIUTIAN) 
+        if(labelconfig.textId == STR_JIUTIAN)
+        {
+            #if AI_VOICE_XINGCHEN
+            label->SetText("星辰康瑞");
+            #else
             label->SetText("中国移动智能助理灵犀");
+            #endif
+        } 
         else
             label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
@@ -1168,8 +1174,14 @@ namespace OHOS
         int textId = AiVoiceModel::GetInstance().GetAiModelTextId();
         if (title)
         {
-            if(textId == STR_JIUTIAN) 
+            if(textId == STR_JIUTIAN)
+            {
+                #if AI_VOICE_XINGCHEN
+                title->SetText("星辰康瑞");
+                #else
                 title->SetText("中国移动智能助理灵犀");
+                #endif
+            } 
             else
                 title->SetTextId(textId);
             title->ForceResetText();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp
index e021a48..5d65198 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp
@@ -82,8 +82,14 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height);
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);
-        if(labelconfig.textId == STR_JIUTIAN) 
+        if(labelconfig.textId == STR_JIUTIAN)
+        {
+            #if AI_VOICE_XINGCHEN
+            label->SetText("星辰康瑞");
+            #else
             label->SetText("中国移动智能助理灵犀");
+            #endif
+        } 
         else
             label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
@@ -269,8 +275,14 @@ namespace OHOS
     {
         if (title)
         {
-            if(textId == STR_JIUTIAN) 
+            if(textId == STR_JIUTIAN)
+            {
+                #if AI_VOICE_XINGCHEN
+                title->SetText("星辰康瑞");
+                #else
                 title->SetText("中国移动智能助理灵犀");
+                #endif
+            }
             else
                 title->SetTextId(textId);
             title->ForceResetText();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp
index 53fa0c8..9aef7a8 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp
@@ -90,8 +90,14 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height);
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);
-        if(labelconfig.textId == STR_JIUTIAN) 
+        if(labelconfig.textId == STR_JIUTIAN)
+        {
+            #if AI_VOICE_XINGCHEN
+            label->SetText("星辰康瑞");
+            #else
             label->SetText("中国移动智能助理灵犀");
+            #endif
+        } 
         else
             label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
@@ -279,8 +285,14 @@ namespace OHOS
     {
         if (title)
         {
-            if(textId == STR_JIUTIAN) 
+            if(textId == STR_JIUTIAN)
+            {
+                #if AI_VOICE_XINGCHEN
+                title->SetText("星辰康瑞");
+                #else
                 title->SetText("中国移动智能助理灵犀");
+                #endif
+            } 
             else
                 title->SetTextId(textId);
             title->ForceResetText();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp
index 7bd9027..fbced1a 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp
@@ -133,8 +133,14 @@ namespace OHOS
         label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height);
         label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize);
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeight);
-        if(labelconfig.textId == STR_JIUTIAN) 
+        if(labelconfig.textId == STR_JIUTIAN)
+        {
+            #if AI_VOICE_XINGCHEN
+            label->SetText("星辰康瑞");
+            #else
             label->SetText("中国移动智能助理灵犀");
+            #endif
+        } 
         else
             label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
@@ -359,8 +365,14 @@ namespace OHOS
     {
         if (title)
         {
-            if(textId == STR_JIUTIAN) 
+            if(textId == STR_JIUTIAN)
+            {
+                #if AI_VOICE_XINGCHEN
+                title->SetText("星辰康瑞");
+                #else
                 title->SetText("中国移动智能助理灵犀");
+                #endif
+            } 
             else
                 title->SetTextId(textId);
             title->ForceResetText();

diff --git a/code/sdk/files/fd230/fs/user/res/AIVoice/aimodels/aimodes_xingchen.bin b/code/sdk/files/fd230/fs/user/res/AIVoice/aimodels/aimodes_xingchen.bin
new file mode 100644 (file)
index 0000000..06ae1f4
Binary files /dev/null and b/code/sdk/files/fd230/fs/user/res/AIVoice/aimodels/aimodes_xingchen.bin differ

diff --git a/code/sdk/files/n9/fs/user/res/AIVoice/aimodels/aimodes_xingchen.bin b/code/sdk/files/n9/fs/user/res/AIVoice/aimodels/aimodes_xingchen.bin
new file mode 100644 (file)
index 0000000..06ae1f4
Binary files /dev/null and b/code/sdk/files/n9/fs/user/res/AIVoice/aimodels/aimodes_xingchen.bin differ