ai界面“九天大模型”修改未“中国智能移动助理灵犀”

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 10b37c4..a048d2d 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,7 +30,7 @@
 // 设置当前使用的音频类型，0 表示 PCM，1 表示 SBC，2 表示 MSBC
 #define CURRENT_AIAUDIO_TYPE AIAUDIO_TYPE_SBC
 
-#if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_CHINA_MOBILE_AI_REGULATION)
+#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)
     #define AI_VOICE_N9 //N9 星辰Ai

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 1094f32..18754ca 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,6 +90,10 @@ 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) 
+            label->SetText("中国智能移动助理灵犀");
+        else
+            label->SetTextId(labelconfig.textId);
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetRollSpeed(23);
@@ -275,7 +279,10 @@ namespace OHOS
     {
         if (title)
         {
-            title->SetTextId(textId);
+            if(textId == STR_JIUTIAN) 
+                title->SetText("中国智能移动助理灵犀");
+            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 fab863d..c810190 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,7 +179,10 @@ 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);
-        label->SetTextId(labelconfig.textId);
+        if(labelconfig.textId == STR_JIUTIAN) 
+            label->SetText("中国智能移动助理灵犀");
+        else
+            label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         label->SetRollSpeed(23);
@@ -1165,7 +1168,10 @@ namespace OHOS
         int textId = AiVoiceModel::GetInstance().GetAiModelTextId();
         if (title)
         {
-            title->SetTextId(textId);
+            if(textId == STR_JIUTIAN) 
+                title->SetText("中国智能移动助理灵犀");
+            else
+                title->SetTextId(textId);
             title->ForceResetText();
         }
         if (aiModelImage)

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 fab01cc..6977eaf 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,7 +82,10 @@ 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);
-        label->SetTextId(labelconfig.textId);
+        if(labelconfig.textId == STR_JIUTIAN) 
+            label->SetText("中国智能移动助理灵犀");
+        else
+            label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
@@ -266,7 +269,10 @@ namespace OHOS
     {
         if (title)
         {
-            title->SetTextId(textId);
+            if(textId == STR_JIUTIAN) 
+                title->SetText("中国智能移动助理灵犀");
+            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 01423d8..66d198e 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,7 +90,10 @@ 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);
-        label->SetTextId(labelconfig.textId);
+        if(labelconfig.textId == STR_JIUTIAN) 
+            label->SetText("中国智能移动助理灵犀");
+        else
+            label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetRollSpeed(23);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
@@ -276,7 +279,10 @@ namespace OHOS
     {
         if (title)
         {
-            title->SetTextId(textId);
+            if(textId == STR_JIUTIAN) 
+                title->SetText("中国智能移动助理灵犀");
+            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 be47227..c4e7b87 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,7 +133,10 @@ 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);
-        label->SetTextId(labelconfig.textId);
+        if(labelconfig.textId == STR_JIUTIAN) 
+            label->SetText("中国智能移动助理灵犀");
+        else
+            label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
@@ -356,7 +359,10 @@ namespace OHOS
     {
         if (title)
         {
-            title->SetTextId(textId);
+            if(textId == STR_JIUTIAN) 
+                title->SetText("中国智能移动助理灵犀");
+            else
+                title->SetTextId(textId);
             title->ForceResetText();
         }
     }