AI语音界面优化修改，将标签的LINE_BREAK 为MARQUEE改为OSCILLATION

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 cb9a7be..7bf57cc 100644 (file)
--- 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 d1402c8..e8d7e54 100644 (file)
--- 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 04c5919..4b96a10 100644 (file)
--- 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 504fa27..9483cf6 100644 (file)
--- 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 9f49602..2be4658 100644 (file)
--- 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 27a28f8..aaa107d 100644 (file)
--- 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)