From 4ef81e69dbb026958aaf026fb06ab7e0703ea26c Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Tue, 30 Jul 2024 19:14:48 +0800 Subject: [PATCH] =?utf8?q?AI=E8=AF=AD=E9=9F=B3=E7=95=8C=E9=9D=A2=E4=BC=98?= =?utf8?q?=E5=8C=96=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=B0=86=E6=A0=87=E7=AD=BE?= =?utf8?q?=E7=9A=84LINE=5FBREAK=20=E4=B8=BAMARQUEE=E6=94=B9=E4=B8=BAOSCILL?= =?utf8?q?ATION?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230app/nativeui/aivoice/include/AiVoiceView.h | 4 +++- .../aivoice/src/AiVoiceBluetoothFailedStartView.cpp | 9 +++++---- .../nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp | 5 +++-- .../nativeui/aivoice/src/AivoiceListeningView.cpp | 7 ++++--- .../aivoice/src/AivoiceMobileDataFailedStartView.cpp | 7 ++++--- .../nativeui/aivoice/src/AivoiceThinkingView.cpp | 7 ++++--- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceView.h b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceView.h index cb9a7be8e..7bf57cc9f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-08 09:36:01 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-30 15:15:46 + * @LastEditTime: 2024-07-30 19:05:40 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/include/AiVoiceView.h */ #ifndef AI_VOICE_VIEW_H @@ -30,11 +30,13 @@ #include "map" namespace OHOS { + /*图片路径*/ static constexpr const char *AIMODEL_WENXINYIYAN_PATH = "/user/res/AIVoice/aimodels/aimodels_wenxinyiyan.bin"; /*文心一言*/ static constexpr const char *AIMODEL_CHATGPT_ON_PATH = "/user/res/AIVoice/aimodels/aimodels_chatgpt.bin"; /*ChatGPT*/ static constexpr const char *AIMODEL_KIMI_PATH = "/user/res/AIVoice/aimodels/aimodels_kimi.bin"; /*KIMI*/ static constexpr const char *AIMODEL_DOUBAO_PATH = "/user/res/AIVoice/aimodels/aimodels_doubao.bin"; /*豆包*/ + /*组件ID*/ static constexpr const char *AIVOICE_START_CHAT_BUTTON_VIEW_ID = "aivoice_start_chat_button_view_id"; // 开始对话 static constexpr const char *AIVOICE_CHAT_BUTTON_VIEW_ID = "aivoice_chat_button_view_id"; // 对话 static constexpr const char *AIVOICE_APIKEYS_BUTTON_VIEW_ID = "aivoice_apikeys_button_view_id"; // API Keys 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 d1402c8cd..e8d7e54be 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-24 10:39:08 + * @LastEditTime: 2024-07-30 19:08:31 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AiVoiceBluetoothFailedStartView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -52,7 +52,7 @@ namespace OHOS attentionImage = nullptr; } - for (int i = 0; i < 2; i++) + for (int i = 0; i < (sizeof(label) / sizeof(label[0])); i++) { if (label[i] != nullptr) { @@ -90,6 +90,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); + label->SetRollSpeed(70); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; @@ -149,7 +150,7 @@ namespace OHOS .fontSize = 30, .lineHeigh = 35, .textId = STR_AI_INTELLIGENT_ASSISTANT, - .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; title = AiVoiceBluetoothFailedStartLabelInit(labelconfig); if (title == nullptr) @@ -181,7 +182,7 @@ namespace OHOS .fontSize = 30, .lineHeigh = 35, .textId = STR_OK, - .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; ensure = AiVoiceBluetoothFailedStartLabelInit(labelconfig); if (ensure == nullptr) 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 04c591901..4b96a102f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-12 11:18:00 + * @LastEditTime: 2024-07-30 19:10:30 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AivoiceConnectTimeoutView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -91,6 +91,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); + label->SetRollSpeed(70); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); label->SetRollSpeed(LABEL_ROLL_SPEED); @@ -190,7 +191,7 @@ namespace OHOS .fontSize = 30, .lineHeigh = 35, .textId = STR_OK, - .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; ensure = AivoiceConnectTimeoutLabelInit(labelconfig); if (ensure == nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp index 504fa27d1..9483cf6f0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-03 18:38:35 + * @LastEditTime: 2024-07-30 19:11:15 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AivoiceListeningView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -113,6 +113,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); + label->SetRollSpeed(70); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; @@ -198,7 +199,7 @@ namespace OHOS .fontSize = 30, .lineHeigh = 35, .textId = STR_LISTENING, - .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; title = AivoiceListeningLabelInit(labelconfig); if (title == nullptr) @@ -215,7 +216,7 @@ namespace OHOS .fontSize = 30, .lineHeigh = 35, .textId = STR_FINISH_SPEAKING, - .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; finishSpeak = AivoiceListeningLabelInit(labelconfig); if (finishSpeak == nullptr) 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 9f4960260..2be465838 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-03 09:34:25 + * @LastEditTime: 2024-07-30 19:11:42 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AivoiceMobileDataFailedStartView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -90,6 +90,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); + label->SetRollSpeed(70); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; @@ -149,7 +150,7 @@ namespace OHOS .fontSize = 30, .lineHeigh = 35, .textId = STR_AI_INTELLIGENT_ASSISTANT, - .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; title = AivoiceMobileDataFailedStartLabelInit(labelconfig); if (title == nullptr) @@ -181,7 +182,7 @@ namespace OHOS .fontSize = 30, .lineHeigh = 35, .textId = STR_OK, - .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; ensure = AivoiceMobileDataFailedStartLabelInit(labelconfig); if (ensure == nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp index 27a28f84b..aaa107db0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-03 09:34:58 + * @LastEditTime: 2024-07-30 19:09:31 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AivoiceThinkingView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -113,6 +113,7 @@ namespace OHOS label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); + label->SetRollSpeed(70); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; @@ -198,7 +199,7 @@ namespace OHOS .fontSize = 30, .lineHeigh = 35, .textId = STR_THINKING, - .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; title = AivoiceThinkingLabelInit(labelconfig); if (title == nullptr) @@ -215,7 +216,7 @@ namespace OHOS .fontSize = 30, .lineHeigh = 35, .textId = STR_CANCEL, - .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; cancelThink = AivoiceThinkingLabelInit(labelconfig); if (cancelThink == nullptr) -- 2.17.1