From: luozheng <1732036298@qq.com> Date: Sat, 29 Nov 2025 08:02:18 +0000 (+0800) Subject: N9:星辰康瑞图片修改,title修改 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F2825%2Fhead;p=mirrors%2FFD230.git N9:星辰康瑞图片修改,title修改 --- 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 f21761430..c86a2ef3b 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceView.h +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceView.h @@ -16,6 +16,7 @@ #include "components/ui_image_view.h" #include "components/ui_picker.h" #include "components/ui_slider.h" +#include "aivoice/include/AiVoiceModel.h" #include "aivoice/include/AiVoiceBluetoothFailedStartView.h" #include "aivoice/include/AivoiceMobileDataFailedStartView.h" #include "aivoice/include/AivoiceConnectTimeoutView.h" 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 b9705bbcc..80752ad6b 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 @@ -93,7 +93,7 @@ namespace OHOS if(labelconfig.textId == STR_JIUTIAN) { #if AI_VOICE_XINGCHEN - label->SetText("星辰康瑞"); + label->SetText("天翼AI"); #else label->SetText("中国移动智能助理灵犀"); #endif @@ -287,7 +287,7 @@ namespace OHOS if(textId == STR_JIUTIAN) { #if AI_VOICE_XINGCHEN - title->SetText("星辰康瑞"); + title->SetText("天翼AI"); #else title->SetText("中国移动智能助理灵犀"); #endif 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 ffc786103..d4b460b1d 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 @@ -182,7 +182,7 @@ namespace OHOS if(labelconfig.textId == STR_JIUTIAN) { #if AI_VOICE_XINGCHEN - label->SetText("星辰康瑞"); + label->SetText("天翼AI"); #else label->SetText("中国移动智能助理灵犀"); #endif @@ -320,6 +320,14 @@ namespace OHOS imagecinfig.src = it->second; } + if ( it->first == STR_JIUTIAN) + { + #if (AI_VOICE_XINGCHEN) + imagecinfig.x = 60; + #else + imagecinfig.x = 173; + #endif + } aiModelImage = AiVoiceViewImageView(imagecinfig); if (aiModelImage == nullptr) { @@ -1177,7 +1185,7 @@ namespace OHOS if(textId == STR_JIUTIAN) { #if AI_VOICE_XINGCHEN - title->SetText("星辰康瑞"); + title->SetText("天翼AI"); #else title->SetText("中国移动智能助理灵犀"); #endif @@ -1191,8 +1199,21 @@ namespace OHOS auto it = TextIdToImagePath.find(textId); if (it != TextIdToImagePath.end()) { + if(it->first == STR_JIUTIAN) + { + #if (AI_VOICE_XINGCHEN) + aiModelImage->SetX(60); + #else + aiModelImage->SetX(173); + #endif + } + else + { + aiModelImage->SetX(173); + } aiModelImage->SetSrc(it->second); aiModelImage->Invalidate(); + scrollView->Invalidate(); } } 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 5d6519886..8a2d114ab 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 @@ -85,7 +85,7 @@ namespace OHOS if(labelconfig.textId == STR_JIUTIAN) { #if AI_VOICE_XINGCHEN - label->SetText("星辰康瑞"); + label->SetText("天翼AI"); #else label->SetText("中国移动智能助理灵犀"); #endif @@ -278,7 +278,7 @@ namespace OHOS if(textId == STR_JIUTIAN) { #if AI_VOICE_XINGCHEN - title->SetText("星辰康瑞"); + title->SetText("天翼AI"); #else title->SetText("中国移动智能助理灵犀"); #endif 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 9aef7a8dc..ecab7a791 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 @@ -93,7 +93,7 @@ namespace OHOS if(labelconfig.textId == STR_JIUTIAN) { #if AI_VOICE_XINGCHEN - label->SetText("星辰康瑞"); + label->SetText("天翼AI"); #else label->SetText("中国移动智能助理灵犀"); #endif @@ -288,7 +288,7 @@ namespace OHOS if(textId == STR_JIUTIAN) { #if AI_VOICE_XINGCHEN - title->SetText("星辰康瑞"); + title->SetText("天翼AI"); #else title->SetText("中国移动智能助理灵犀"); #endif 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 fbced1a42..4795829c9 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 @@ -136,7 +136,7 @@ namespace OHOS if(labelconfig.textId == STR_JIUTIAN) { #if AI_VOICE_XINGCHEN - label->SetText("星辰康瑞"); + label->SetText("天翼AI"); #else label->SetText("中国移动智能助理灵犀"); #endif @@ -368,7 +368,7 @@ namespace OHOS if(textId == STR_JIUTIAN) { #if AI_VOICE_XINGCHEN - title->SetText("星辰康瑞"); + title->SetText("天翼AI"); #else title->SetText("中国移动智能助理灵犀"); #endif 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 index 06ae1f4b4..21737a7bb 100644 Binary files a/code/sdk/files/fd230/fs/user/res/AIVoice/aimodels/aimodes_xingchen.bin 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 index 06ae1f4b4..21737a7bb 100644 Binary files a/code/sdk/files/n9/fs/user/res/AIVoice/aimodels/aimodes_xingchen.bin and b/code/sdk/files/n9/fs/user/res/AIVoice/aimodels/aimodes_xingchen.bin differ