From ea4feeca4113c043847c86e9565ba11298594a16 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Mon, 24 Nov 2025 17:29:20 +0800 Subject: [PATCH] =?utf8?q?ai=E7=95=8C=E9=9D=A2=E2=80=9C=E4=B9=9D=E5=A4=A9?= =?utf8?q?=E5=A4=A7=E6=A8=A1=E5=9E=8B=E2=80=9D=E4=BF=AE=E6=94=B9=E6=9C=AA?= =?utf8?q?=E2=80=9C=E4=B8=AD=E5=9B=BD=E6=99=BA=E8=83=BD=E7=A7=BB=E5=8A=A8?= =?utf8?q?=E5=8A=A9=E7=90=86=E7=81=B5=E7=8A=80=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeapp/nativeui/aivoice/include/AiVoiceModel.h | 2 +- .../aivoice/src/AiVoiceBluetoothFailedStartView.cpp | 9 ++++++++- .../n9/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp | 10 ++++++++-- .../nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp | 10 ++++++++-- .../aivoice/src/AivoiceMobileDataFailedStartView.cpp | 10 ++++++++-- .../aivoice/src/AivoiceReturnResultTextView.cpp | 10 ++++++++-- 6 files changed, 41 insertions(+), 10 deletions(-) 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 10b37c4c1..a048d2db2 100644 --- 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 1094f3238..18754cae6 100644 --- 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 fab863d81..c8101903a 100644 --- 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 fab01ccb9..6977eaf09 100644 --- 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 01423d8eb..66d198e34 100644 --- 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 be4722755..c4e7b87f8 100644 --- 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(); } } -- 2.17.1