From df5c57eaccca8c162bdfd5ff035bbdf4e3e1f175 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com> Date: Wed, 25 Jun 2025 03:37:10 +0000 Subject: [PATCH] Merge #1885 into sdk602patch0911 from refs/changes/1885/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 罗正 * refs/changes/1885/head: (7 commits squashed) - 情绪测量界面slice添加，数据交互逻辑待添加 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - applist添加情绪测测量 - applist文件提交 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - AI界面优化 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 Signed-off-by: 罗正 <1732036298@qq.com> Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Reviewed-by: 薛文强 Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1885 --- .../src/AiVoiceBluetoothFailedStartView.cpp | 20 +++++++------- .../nativeui/aivoice/src/AiVoiceView.cpp | 26 +++++++++---------- .../aivoice/src/AivoiceConnectTimeoutView.cpp | 20 +++++++------- .../src/AivoiceMobileDataFailedStartView.cpp | 20 +++++++------- .../src/AivoiceReturnResultTextView.cpp | 20 +++++++------- 5 files changed, 53 insertions(+), 53 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp index 42f982951..d0a36eb92 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp @@ -90,9 +90,9 @@ namespace OHOS label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize); label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); //TOOD: 待优化 - if(labelconfig.textId == STR_DEEPSEEK) { - label->SetText("DeepSeek"); - } else + // if(labelconfig.textId == STR_DEEPSEEK) { + // label->SetText("DeepSeek"); + // } else label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetRollSpeed(23); @@ -278,15 +278,15 @@ namespace OHOS { if (title) { - if(textId == STR_DEEPSEEK) - { - title->SetText("DeepSeek"); - } - else - { + // if(textId == STR_DEEPSEEK) + // { + // title->SetText("DeepSeek"); + // } + // else + // { title->SetTextId(textId); title->ForceResetText(); - } + // } } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp index f7aa2a0e3..7792bcc61 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp @@ -168,12 +168,12 @@ 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); - // TOOD: 待优化 - if (labelconfig.textId == STR_DEEPSEEK) - { - label->SetText("DeepSeek"); - } - else + // // TOOD: 待优化 + // if (labelconfig.textId == STR_DEEPSEEK) + // { + // label->SetText("DeepSeek"); + // } + // else label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -1029,15 +1029,15 @@ namespace OHOS int textId = AiVoiceModel::GetInstance().GetAiModelTextId(); if (title) { - if (textId == STR_DEEPSEEK) - { - title->SetText("DeepSeek"); - } - else - { + // if (textId == STR_DEEPSEEK) + // { + // title->SetText("DeepSeek"); + // } + // else + // { title->SetTextId(textId); title->ForceResetText(); - } + // } } if (aiModelImage) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp index babb77944..f831ec6da 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp @@ -82,9 +82,9 @@ namespace OHOS label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize); label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); //TOOD: 待优化 - if(labelconfig.textId == STR_DEEPSEEK) { - label->SetText("DeepSeek"); - } else + // if(labelconfig.textId == STR_DEEPSEEK) { + // label->SetText("DeepSeek"); + // } else label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -269,15 +269,15 @@ namespace OHOS { if (title) { - if(textId == STR_DEEPSEEK) - { - title->SetText("DeepSeek"); - } - else - { + // if(textId == STR_DEEPSEEK) + // { + // title->SetText("DeepSeek"); + // } + // else + // { title->SetTextId(textId); title->ForceResetText(); - } + // } } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp index 554cab823..100c7f786 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp @@ -90,9 +90,9 @@ namespace OHOS label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize); label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); //TOOD: 待优化 - if(labelconfig.textId == STR_DEEPSEEK) { - label->SetText("DeepSeek"); - } else + // if(labelconfig.textId == STR_DEEPSEEK) { + // label->SetText("DeepSeek"); + // } else label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetRollSpeed(23); @@ -279,15 +279,15 @@ namespace OHOS { if (title) { - if(textId == STR_DEEPSEEK) - { - title->SetText("DeepSeek"); - } - else - { + // if(textId == STR_DEEPSEEK) + // { + // title->SetText("DeepSeek"); + // } + // else + // { title->SetTextId(textId); title->ForceResetText(); - } + // } } } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp index 0d5611b31..6f0141073 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp @@ -127,9 +127,9 @@ namespace OHOS label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize); label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeight); //TOOD: 待优化 - if(labelconfig.textId == STR_DEEPSEEK) { - label->SetText("DeepSeek"); - } else + // if(labelconfig.textId == STR_DEEPSEEK) { + // label->SetText("DeepSeek"); + // } else label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); @@ -353,15 +353,15 @@ namespace OHOS { if (title) { - if(textId == STR_DEEPSEEK) - { - title->SetText("DeepSeek"); - } - else - { + // if(textId == STR_DEEPSEEK) + // { + // title->SetText("DeepSeek"); + // } + // else + // { title->SetTextId(textId); title->ForceResetText(); - } + // } } } -- 2.17.1