系统：修改label的滚动速度为23

diff --git a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
index 4e8174b..b2313a5 100644 (file)
--- a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
+++ b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
@@ -100,7 +100,7 @@ bool InitRollLabel(UILabelExt *&label, int left, int top, int width, int height,
   // 设置标签的文本和其他属性
   label->SetTextId(id);
   label->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-  label->SetRollSpeed(70);
+  label->SetRollSpeed(23);
   label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
 
   return true;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp
index 8f2e71a..e831b35 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp
@@ -125,7 +125,7 @@ namespace OHOS
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;
     }

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 0d11484..8bd7be1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp
@@ -91,7 +91,7 @@ namespace OHOS
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
index b04ee95..98b314e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
@@ -87,7 +87,7 @@ namespace OHOS
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;
     }

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 8a589ea..6f85706 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp
@@ -161,7 +161,7 @@ namespace OHOS
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;
     }

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 fd6e393..50fec0c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp
@@ -169,7 +169,7 @@ namespace OHOS
         NoteLabel->SetStyle(STYLE_TEXT_FONT, 30);
         NoteLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
         NoteLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-        NoteLabel->SetRollSpeed(70);
+        NoteLabel->SetRollSpeed(23);
         NoteLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         NoteLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
         /* -------------------------------------------------------------------------- */

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 d571e64..050d452 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp
@@ -92,7 +92,7 @@ namespace OHOS
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;

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 7e2b0ad..c3750fc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp
@@ -91,7 +91,7 @@ namespace OHOS
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;

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 aa68b65..6e7db53 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp
@@ -87,7 +87,7 @@ namespace OHOS
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysDeleteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysDeleteView.cpp
index 27ca807..0d2138a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysDeleteView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysDeleteView.cpp
@@ -80,7 +80,7 @@ namespace OHOS
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp
index e9c902d..6c4c11d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp
@@ -81,7 +81,7 @@ namespace OHOS
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp
index 5b9fcd7..6ba5687 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp
@@ -88,7 +88,7 @@ namespace OHOS
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp
index 78927fb..33cd189 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp
@@ -149,7 +149,7 @@ namespace OHOS
         editLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         editLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         editLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-        editLabel->SetRollSpeed(70);\r
+        editLabel->SetRollSpeed(23);\r
         /* -------------------------------------------------------------------------- */\r
         // if (labelTime == nullptr)\r
         // {\r
@@ -178,7 +178,7 @@ namespace OHOS
         labelTime->SetStyle(STYLE_LINE_HEIGHT, 45);\r
         labelTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 40);\r
         labelTime->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-        labelTime->SetRollSpeed(70);\r
+        labelTime->SetRollSpeed(23);\r
         /* -------------------------------------------------------------------------- */\r
         if (labelSetTime == nullptr)\r
         {\r
@@ -197,7 +197,7 @@ namespace OHOS
         labelSetTime->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));\r
         labelSetTime->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         labelSetTime->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-        labelSetTime->SetRollSpeed(70);\r
+        labelSetTime->SetRollSpeed(23);\r
         /* -------------------------------------------------------------------------- */\r
         if (labelDay == nullptr)\r
         {\r
@@ -213,7 +213,7 @@ namespace OHOS
         labelDay->SetStyle(STYLE_LINE_HEIGHT, 45);\r
         labelDay->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 40);\r
         labelDay->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-        labelDay->SetRollSpeed(70);\r
+        labelDay->SetRollSpeed(23);\r
         /* -------------------------------------------------------------------------- */\r
         if (labelSetWeek == nullptr)\r
         {\r
@@ -232,7 +232,7 @@ namespace OHOS
         labelSetWeek->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));\r
         labelSetWeek->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         labelSetWeek->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-        labelSetWeek->SetRollSpeed(70);\r
+        labelSetWeek->SetRollSpeed(23);\r
     }\r
 \r
     void AlarmConfigView::InitButton()\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp
index 17a5ad4..b45d224 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp
@@ -88,7 +88,7 @@ UIScrollView * AlarmJudgeView::InitDeleteScreen()
             DeleteTitleLabelExt_->SetTextId(STR_DELETE);\r
             DeleteTitleLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             DeleteTitleLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            DeleteTitleLabelExt_->SetRollSpeed(70);\r
+            DeleteTitleLabelExt_->SetRollSpeed(23);\r
             DeleteTitleLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             DeleteTitleLabelExt_->SetStyle(STYLE_TEXT_COLOR, Color::White().full);\r
         }\r
@@ -105,7 +105,7 @@ UIScrollView * AlarmJudgeView::InitDeleteScreen()
             DeletePromptLabelExt_->SetTextId(STR_ALARM_DELETE_NOTE);\r
             DeletePromptLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             DeletePromptLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            DeletePromptLabelExt_->SetRollSpeed(70);\r
+            DeletePromptLabelExt_->SetRollSpeed(23);\r
             DeletePromptLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             DeletePromptLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999);\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp
index e00410e..3796e19 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp
@@ -101,7 +101,7 @@ namespace OHOS
         title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-        title->SetRollSpeed(70);\r
+        title->SetRollSpeed(23);\r
         group->Add(title);\r
         /* -------------------------------------------------------------------------- */\r
         if (picker == nullptr)\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp
index b126649..a026335 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetTimeView.cpp
@@ -175,7 +175,7 @@ UIScrollView *AlarmSetTimeView::InitSetTimeView(void)
     title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
     title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
     title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-    title->SetRollSpeed(70);\r
+    title->SetRollSpeed(23);\r
     group->Add(title);\r
     /* -------------------------------------------------------------------------- */\r
     if (picker == nullptr) {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
index c53c176..32b2dc2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
@@ -189,7 +189,7 @@ void MainAlarmView::AlarmTitleCreate(void)
         TitleLabelExt_->SetTextId(STR_ALARM);
         TitleLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
         TitleLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        TitleLabelExt_->SetRollSpeed(70);
+        TitleLabelExt_->SetRollSpeed(23);
         TitleLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 
         group->Add(TitleLabelExt_);
@@ -216,7 +216,7 @@ void MainAlarmView::AlarmAddButtonCreate(void)
         AddButton_->SetTextId(STR_ADD_A_NEW_ALARM);
         // AddButton_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
         // AddButton_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        // AddButton_->SetRollSpeed(70);
+        // AddButton_->SetRollSpeed(23);
         AddButton_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();
         AddButton_->SetOnClickListener(clickListener);
@@ -293,7 +293,7 @@ UIViewGroup * MainAlarmView::NewClockCtlExt(int16_t alarmNum, uint8_t index)
         dLabel[alarmNum]->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));
         dLabel[alarmNum]->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, D_CLOCK_LABEL_FONT);
         dLabel[alarmNum]->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-        dLabel[alarmNum]->SetRollSpeed(70);
+        dLabel[alarmNum]->SetRollSpeed(23);
         /* -------------------------------------------------------------------------- */
         statusButton[alarmNum] = new UIToggleButton();
         if (statusButton[alarmNum] == nullptr) {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp
index 09ad20c..18ebe11 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipaySetting.cpp
@@ -121,7 +121,7 @@ bool AlipaySetting::AlipayInitLabel(void)
     labelName->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
     labelName->SetStyle(STYLE_TEXT_FONT, SETTING_NAME_FONT);\r
     labelName->SetAlign(TEXT_ALIGNMENT_CENTER);\r
-    labelName->SetRollSpeed(30);\r
+    labelName->SetRollSpeed(23);\r
     labelName->SetRollStartPos(SETTING_NAME_X);\r
 \r
     Add(labelName);\r
@@ -140,7 +140,7 @@ bool AlipaySetting::AlipayInitLabel(void)
     labelId->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));\r
     labelId->SetStyle(STYLE_TEXT_FONT, SETTING_ID_FONT);\r
     labelId->SetAlign(TEXT_ALIGNMENT_CENTER);\r
-    labelId->SetRollSpeed(30);\r
+    labelId->SetRollSpeed(23);\r
     labelId->SetRollStartPos(SETTING_ID_X);\r
 \r
     Add(labelId);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp
index 2f04595..b32347c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp
@@ -85,7 +85,7 @@ bool AlipayTransCode::AlipayInitLabel(void)
     labelPayCode->SetPosition(TRANSCODE_TITLE_X, TRANSCODE_TITLE_Y, TRANSCODE_TITLE_WIDTH, TRANSCODE_TITLE_HEIGHT);\r
     labelPayCode->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
     labelPayCode->SetAlign(TEXT_ALIGNMENT_CENTER);\r
-    labelPayCode->SetRollSpeed(30);\r
+    labelPayCode->SetRollSpeed(23);\r
     labelPayCode->SetRollStartPos(TRANSCODE_TITLE_X);\r
     Add(labelPayCode);\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantAnswerView.cpp b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantAnswerView.cpp
index 6484407..3a79448 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantAnswerView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantAnswerView.cpp
@@ -290,7 +290,7 @@ void AssistantAnswerView::InitNoteLabel() {
   notelabel->SetTextId(STR_CALLSOMEONE);
   // notelabel->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
   notelabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-  notelabel->SetRollSpeed(70);
+  notelabel->SetRollSpeed(23);
   notelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
   notelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantHfpView.cpp b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantHfpView.cpp
index 3fdd707..cfc6855 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantHfpView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantHfpView.cpp
@@ -67,7 +67,7 @@ AssistantHfpView::AssistantHfpViewLabelInit(LabelConfig &labelconfig) {
   label->SetTextId(labelconfig.textId);
   label->SetLineBreakMode(labelconfig.lineBreakMode);
   label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-  label->SetRollSpeed(70);
+  label->SetRollSpeed(23);
   label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
   return label;
 }
@@ -114,7 +114,7 @@ bool AssistantHfpView::CreateAssistantHfpViewLabel(void) {
   InitLabelExt(noteLabel, 53, 230, 360, 105, "label", STR_BLUENOTE, DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
   noteLabel->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
   noteLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-  noteLabel->SetRollSpeed(70);
+  noteLabel->SetRollSpeed(23);
   /* --------------------------------------------------------------------------
    */
   int16_t y = noteLabel->GetY() + noteLabel->GetTextHeight() + 30 + 33;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp
index 4d9615a..55afd4a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodResultView.cpp
@@ -113,7 +113,7 @@ namespace OHOS
         InitLabelExt(timeLabel, 53, 270, 360, 35, "time", STR_CHECKNO, DEFAULT_VECTOR_FONT_FILENAME, 30);
         // 设置来回滚动属性
         timeLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-        timeLabel->SetRollSpeed(70);
+        timeLabel->SetRollSpeed(23);
 
         UpSPO2Text();
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceListView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceListView.cpp
index 9701f7c..2dd4085 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceListView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceListView.cpp
@@ -216,7 +216,7 @@ namespace OHOS
         titleLabel->SetStyle(STYLE_TEXT_FONT,30);\r
         titleLabel->SetStyle(STYLE_LINE_HEIGHT,35);\r
         titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-        titleLabel->SetRollSpeed(70);\r
+        titleLabel->SetRollSpeed(23);\r
         titleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
         InitList(); // 加载bt设备列表\r
         InitNewEquipmentButton();\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarListView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarListView.cpp
index c7272b0..2a68bf6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarListView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarListView.cpp
@@ -244,7 +244,7 @@ namespace OHOS
         titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
         titleLabel->SetStyle(STYLE_TEXT_FONT,30);\r
         titleLabel->SetStyle(STYLE_LINE_HEIGHT,35);\r
-        titleLabel->SetRollSpeed(70);\r
+        titleLabel->SetRollSpeed(23);\r
         titleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
         titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         group->Add(titleLabel);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp
index a33b9fb..97f68ab 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothOptionsView.cpp
@@ -101,7 +101,7 @@ namespace OHOS
         titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         titleLabel->SetStyle(STYLE_TEXT_FONT,30);\r
         titleLabel->SetStyle(STYLE_LINE_HEIGHT,35);\r
-        titleLabel->SetRollSpeed(70);\r
+        titleLabel->SetRollSpeed(23);\r
         titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         /* --------------------------- EarPhoneDeviceName --------------------------- */\r
         if (EarPhoneDeviceName == nullptr)\r
@@ -238,7 +238,7 @@ namespace OHOS
         unpairLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
         unpairLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         unpairLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-        // unpairLabel->SetRollSpeed(70);\r
+        // unpairLabel->SetRollSpeed(23);\r
         /* -------------------------------------------------------------------------- */\r
         return true;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp
index d44de8c..78a9d07 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp
@@ -153,7 +153,7 @@ namespace OHOS
                 titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
                 titleLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
                 titleLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-                titleLabel->SetRollSpeed(70);\r
+                titleLabel->SetRollSpeed(23);\r
                 titleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
                 titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             }\r
@@ -182,7 +182,7 @@ namespace OHOS
                 bluetoothNameLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
                 bluetoothNameLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
                 bluetoothNameLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-                bluetoothNameLabel->SetRollSpeed(70);\r
+                bluetoothNameLabel->SetRollSpeed(23);\r
                 bluetoothNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);\r
                 bluetoothNameLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
             }\r
@@ -200,7 +200,7 @@ namespace OHOS
                 conn_fail_Label->SetStyle(STYLE_TEXT_FONT, 30);\r
                 conn_fail_Label->SetStyle(STYLE_LINE_HEIGHT, 35);\r
                 conn_fail_Label->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-                conn_fail_Label->SetRollSpeed(70);\r
+                conn_fail_Label->SetRollSpeed(23);\r
                 conn_fail_Label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                 conn_fail_Label->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
                 conn_fail_Label->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));\r
@@ -221,7 +221,7 @@ namespace OHOS
                 // tipLabel->SetText("请确认该设备在通信范围内且处于待配对状态");\r
                 tipLabel->SetTextId(STR_BTEARPHONE_CONN_FAIL_TIP);\r
                 tipLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-                // tipLabel->SetRollSpeed(70);\r
+                // tipLabel->SetRollSpeed(23);\r
                 tipLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                 tipLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
                 tipLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsSuccMessageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsSuccMessageView.cpp
index 3fc03be..89fb015 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsSuccMessageView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsSuccMessageView.cpp
@@ -108,7 +108,7 @@ namespace OHOS
                 titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
                 titleLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
                 titleLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-                titleLabel->SetRollSpeed(70);\r
+                titleLabel->SetRollSpeed(23);\r
                 titleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
                 titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             }\r
@@ -137,7 +137,7 @@ namespace OHOS
                 bluetoothNameLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
                 bluetoothNameLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
                 bluetoothNameLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-                bluetoothNameLabel->SetRollSpeed(70);\r
+                bluetoothNameLabel->SetRollSpeed(23);\r
                 bluetoothNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);\r
                 bluetoothNameLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
             }\r
@@ -156,7 +156,7 @@ namespace OHOS
                 conn_succ_Label->SetStyle(STYLE_TEXT_FONT, 30);\r
                 conn_succ_Label->SetStyle(STYLE_LINE_HEIGHT, 35);\r
                 conn_succ_Label->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-                conn_succ_Label->SetRollSpeed(70);\r
+                conn_succ_Label->SetRollSpeed(23);\r
                 conn_succ_Label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                 conn_succ_Label->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER, UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
                 conn_succ_Label->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
index a771708..04faea7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
@@ -254,7 +254,7 @@ namespace OHOS
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);                                    // 字体行高
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp
index 3684794..3aa1661 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeConfigView.cpp
@@ -97,7 +97,7 @@ namespace OHOS
             Title->SetTextId(STR_COUNT_DOWN); // 倒计时
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-            Title->SetRollSpeed(70);
+            Title->SetRollSpeed(23);
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
             /* -------------------------------------------------------------------------- */
             timePicker = new UITimePicker();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp
index f2d4dc9..0f657ae 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownTimeNotNullView.cpp
@@ -79,7 +79,7 @@ namespace OHOS
             Title->SetTextId(STR_COUNT_DOWN); // 倒计时\r
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            Title->SetRollSpeed(70);\r
+            Title->SetRollSpeed(23);\r
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             Attention = new UIImageView();\r
@@ -104,7 +104,7 @@ namespace OHOS
             AttentionLabel->SetTextId(STR_SET_COUNT_DOWN_NOTE); // 请先设置好倒计时间\r
             AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             AttentionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            AttentionLabel->SetRollSpeed(70);\r
+            AttentionLabel->SetRollSpeed(23);\r
             AttentionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             button = new UILabelButtonExt();\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp
index fcfecb7..9a6ab67 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownView.cpp
@@ -131,7 +131,7 @@ namespace OHOS
             Title->SetTextId(STR_COUNT_DOWN); // 倒计时\r
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            Title->SetRollSpeed(70);\r
+            Title->SetRollSpeed(23);\r
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------- CUSTOM_COUNTDOWN ------------------------- */\r
             CUSTOM_COUNTDOWN = new UILabelButtonExt();\r
@@ -161,7 +161,7 @@ namespace OHOS
             QuickStart->SetTextId(STR_QUICK_START);\r
             QuickStart->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             QuickStart->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            QuickStart->SetRollSpeed(70);\r
+            QuickStart->SetRollSpeed(23);\r
             QuickStart->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* ----------------------- COUNTDOWN_ONE_MINUTE_BUTTON ---------------------- */\r
             COUNTDOWN_ONE_MINUTE_BUTTON = SetUILabelButton(43, 345, 180, 150, COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID, "1分钟", STR_1_MIN);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp
index 3eb3f4f..af12408 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp
@@ -124,7 +124,7 @@ namespace OHOS
             Title->SetTextId(STR_COUNT_DOWN); // 倒计时\r
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            Title->SetRollSpeed(70);\r
+            Title->SetRollSpeed(23);\r
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             showCountDownTimelabel = new UILabelExt();\r
@@ -143,7 +143,7 @@ namespace OHOS
             showCountDownTimelabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             showCountDownTimelabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
             showCountDownTimelabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 80);\r
-            showCountDownTimelabel->SetRollSpeed(70);\r
+            showCountDownTimelabel->SetRollSpeed(23);\r
             /* -------------------------------------------------------------------------- */\r
             vectorImage = new UIImageView();\r
             if (vectorImage == nullptr)\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
index 431e6eb..5efab47 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
@@ -128,7 +128,7 @@ namespace OHOS
         DisplayBrightnessTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
         DisplayBrightnessTitleLabel->SetTextId(STR_SCREEN_AND_BRIGHTNESS); /*屏幕与亮度*/\r
         DisplayBrightnessTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-        DisplayBrightnessTitleLabel->SetRollSpeed(70);\r
+        DisplayBrightnessTitleLabel->SetRollSpeed(23);\r
         DisplayBrightnessTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         DisplayBrightnessTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         return true;\r
@@ -197,7 +197,7 @@ namespace OHOS
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);                                    // 字体行高\r
         label->SetTextId(labelconfig.textId);\r
         label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。\r
-        label->SetRollSpeed(70);\r
+        label->SetRollSpeed(23);\r
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);\r
         return label;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp
index fb72545..165721e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp
@@ -101,7 +101,7 @@ namespace OHOS
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);                                    // 字体行高\r
         label->SetTextId(labelconfig.textId);                                                         // 内容\r
         label->SetLineBreakMode(labelconfig.lineBreakMode);                                           // 断行模式。\r
-        label->SetRollSpeed(70);\r
+        label->SetRollSpeed(23);\r
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);\r
         return label;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightView.cpp b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightView.cpp
index ee0a3d5..eafeda0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightView.cpp
@@ -752,7 +752,7 @@ namespace OHOS
         temp_UILabelExt->SetTextId(text_id);
         temp_UILabelExt->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
         temp_UILabelExt->SetAlign(hor_align, ver_align);
-        temp_UILabelExt->SetRollSpeed(70);
+        temp_UILabelExt->SetRollSpeed(23);
         temp_UILabelExt->SetFont(DEFAULT_VECTOR_FONT_FILENAME, font_size);
         temp_UILabelExt->SetStyle(STYLE_TEXT_COLOR, color_value);
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp
index 9b26a2d..12aee59 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp
@@ -108,7 +108,7 @@ namespace OHOS
         InitRollLabel(timeLabel, 53, 260, 360, 35, "time", STR_CHECKNO, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         // 设置来回滚动属性\r
         timeLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-        timeLabel->SetRollSpeed(70);\r
+        timeLabel->SetRollSpeed(23);\r
 \r
         UpSPO2Text();\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp
index 8f42040..355804b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalView.cpp
@@ -79,7 +79,7 @@ namespace OHOS
         InitLabelExt(noteLabel, 53, 230, 360, 70, "time", STR_PWUWC, DEFAULT_VECTOR_FONT_FILENAME, 30);
         // 设置来回滚动属性
         noteLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-        noteLabel->SetRollSpeed(70);
+        noteLabel->SetRollSpeed(23);
 
         container_->Add(titleLabel);
         container_->Add(noteLabel);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp
index ff547f8..8058099 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp
@@ -127,7 +127,7 @@ namespace OHOS
         // 设置来回滚动属性
         InitLabelExt(noteLabel, 53, 230, 360, 70, "time", STR_HEARTNOTE, DEFAULT_VECTOR_FONT_FILENAME, 30);
         noteLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-        noteLabel->SetRollSpeed(70);
+        noteLabel->SetRollSpeed(23);
 
         container_->Add(titleLabel);
         container_->Add(remindLabel);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
index 0f85e62..f7d8f43 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
@@ -436,7 +436,7 @@ void HeartChartView::InitChartLabel() {
   InitLabel(lastheart_, 53, 130, 360, 35, "label", "--",
             DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
   lastheart_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-  lastheart_->SetRollSpeed(70);
+  lastheart_->SetRollSpeed(23);
   //最小心率 不居中
   InitLabelAdapt(minheart_, 293, 380, 200, 35, "label", "--",
                  DEFAULT_VECTOR_FONT_FILENAME_EN, 35);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartNoteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartNoteView.cpp
index 37ae1a8..4fc7ca9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartNoteView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartNoteView.cpp
@@ -85,7 +85,7 @@ UIScrollView *HeartNoteView::CreateHeartNoteView(void) {
                DEFAULT_VECTOR_FONT_FILENAME, 30);
   // 设置来回滚动属性
   noteLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-  noteLabel->SetRollSpeed(70);
+  noteLabel->SetRollSpeed(23);
 
   /*初始化button*/
   InitButtonExt(StButton, 58, 320, 170, 90, CLICK_HEART_STOP, STR_STOP, 30);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp
index 4584b65..e49bc79 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultView.cpp
@@ -110,7 +110,7 @@ namespace OHOS
         InitLabelExt(timeLabel, 53, 270, 360, 35, "time", STR_CHECKNO, DEFAULT_VECTOR_FONT_FILENAME, 30);
         // 设置来回滚动属性
         timeLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-        timeLabel->SetRollSpeed(70);
+        timeLabel->SetRollSpeed(23);
 
         UpHeartText();
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp
index a09ec44..f4e7c83 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp
@@ -108,7 +108,7 @@ namespace OHOS
         stitle.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         // 来回滚动属性
         stitle.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-        stitle.SetRollSpeed(70);
+        stitle.SetRollSpeed(23);
 
         smessgae.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
         smessgae.SetTextColor(Color::Gray());

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp
index 7971847..dd8006f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp
@@ -175,7 +175,7 @@ namespace OHOS
         title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); // 来回滚动属性
-        title->SetRollSpeed(70);
+        title->SetRollSpeed(23);
         title->SetVisible(true);
         /* -------------------------------------------------------------------------- */
         time = new UILabel();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp
index 417b6ec..f6e7953 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp
@@ -101,7 +101,7 @@ namespace OHOS
             Title->SetTextId(STR_MOTION_RECOGNITION); /*运动识别*/
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-            Title->SetRollSpeed(70);
+            Title->SetRollSpeed(23);
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
             Title->SetVisible(true);
             /* -------------------------------------------------------------------------- */
@@ -125,7 +125,7 @@ namespace OHOS
             MotionRecognitionLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
             MotionRecognitionLabel->SetTextId(STR_AUTO_DETECT); /*自动识别*/
             MotionRecognitionLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);
-            MotionRecognitionLabel->SetRollSpeed(70);
+            MotionRecognitionLabel->SetRollSpeed(23);
             MotionRecognitionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
             /* -------------------------------------------------------------------------- */
             MotionRecognitionToggleButton = new UIToggleButton();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp
index 16d213e..66748f6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp
@@ -103,7 +103,7 @@ namespace OHOS
             Title->SetTextId(STR_NETWORKANDCALL); // 网络与通话
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-            Title->SetRollSpeed(70);
+            Title->SetRollSpeed(23);
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
             /* -------------------------------------------------------------------------- */
             int positionY_Img = 120;
@@ -134,7 +134,7 @@ namespace OHOS
                 NetworkAndCallLabel[i]->SetTextId(textId[i]);
                 NetworkAndCallLabel[i]->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
                 NetworkAndCallLabel[i]->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER);
-                NetworkAndCallLabel[i]->SetRollSpeed(70);
+                NetworkAndCallLabel[i]->SetRollSpeed(23);
                 NetworkAndCallLabel[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
             }
             /* -------------------------------------------------------------------------- */

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp
index e858cc9..3a6b06f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp
@@ -89,7 +89,7 @@ namespace OHOS
             label[i]->SetText(addressbook_t.Contact_t[i].name);\r
             label[i]->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
             label[i]->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER);\r
-            label[i]->SetRollSpeed(70);\r
+            label[i]->SetRollSpeed(23);\r
             label[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             label[i]->SetVisible(true);\r
 \r
@@ -138,7 +138,7 @@ namespace OHOS
         label1_phone_name->SetText(addressbook_t.Contact_t[0].name);\r
         label1_phone_name->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
         label1_phone_name->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        label1_phone_name->SetRollSpeed(70);\r
+        label1_phone_name->SetRollSpeed(23);\r
         label1_phone_name->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
 \r
         // Add to rootView\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp
index e816052..705810b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp
@@ -118,7 +118,7 @@ namespace OHOS
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp
index 031cf8f..f7f8597 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp
@@ -215,7 +215,7 @@ namespace OHOS
         label->SetTextId(labelconfig.textId);\r
         label->SetLineBreakMode(labelconfig.lineBreakMode);\r
         // label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        label->SetRollSpeed(70);\r
+        label->SetRollSpeed(23);\r
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);\r
         return label;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp
index 08f0fb4..531a5e3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp
@@ -49,7 +49,7 @@ namespace OHOS
         sLabel.SetStyle(STYLE_LINE_HEIGHT, 35);
         sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
         sLabel.SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));
-        sLabel.SetRollSpeed(70);
+        sLabel.SetRollSpeed(23);
         sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
         sLabel.SetTouchable(true);
         sLabel.SetAlign(TEXT_ALIGNMENT_LEFT,TEXT_ALIGNMENT_TOP);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
index 1c99bb5..9aba7c9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
@@ -286,7 +286,7 @@ namespace OHOS
         musicListTitle->SetTextId(STR_MUSIC_LIST);\r
         musicListTitle->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         musicListTitle->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-        musicListTitle->SetRollSpeed(70);\r
+        musicListTitle->SetRollSpeed(23);\r
         musicListTitle->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         /* -------------------------- musicListIsEmptyImage ------------------------- */\r
         if (musicListIsEmptyImage == nullptr)\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp
index f13850f..db48569 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/FactoryResetView.cpp
@@ -127,7 +127,7 @@ namespace OHOS
             Title->SetStyle(STYLE_LINE_HEIGHT, 35);
             Title->SetTextId(STR_FACTORY_RESET); /*恢复出厂*/
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-            Title->SetRollSpeed(70);
+            Title->SetRollSpeed(23);
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
             /* ---------------------------- FactoryResetImage --------------------------- */
@@ -276,7 +276,7 @@ namespace OHOS
             Title->SetStyle(STYLE_LINE_HEIGHT, 35);
             Title->SetTextId(STR_FACTORY_RESET); /*恢复出厂*/
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-            Title->SetRollSpeed(70);
+            Title->SetRollSpeed(23);
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
             /* ---------------------------- FactoryResetImage --------------------------- */

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp
index ce44e90..e64dcda 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp
@@ -112,7 +112,7 @@ namespace OHOS
         label->SetTextId(labelconfig.textId);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;
     }
@@ -169,7 +169,7 @@ namespace OHOS
         sosLabel->SetText("SOS");
         sosLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
         sosLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        sosLabel->SetRollSpeed(70);
+        sosLabel->SetRollSpeed(23);
         sosLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
         sosLabel->SetTextColor(Color::GetColorFromRGBA(0x66, 0x66, 0x66, 0xff));
         /* -------------------------------------------------------------------------- */
@@ -608,7 +608,7 @@ namespace OHOS
                 shutdowntitle->SetTextId(STR_SHUTDOWN);         // 内容
                 shutdowntitle->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
                 shutdowntitle->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-                shutdowntitle->SetRollSpeed(70);
+                shutdowntitle->SetRollSpeed(23);
                 shutdowntitle->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
                 SystemShutdownScrollView->Add(shutdowntitle);
             }
@@ -638,7 +638,7 @@ namespace OHOS
                 note->SetTextId(STR_SHUTDOWN_CONFIRM);
                 note->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
                 note->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-                note->SetRollSpeed(70);
+                note->SetRollSpeed(23);
                 note->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
                 SystemShutdownScrollView->Add(note);
             }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp
index 49a27d4..b72a336 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp
@@ -80,7 +80,7 @@ namespace OHOS
         label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。\r
         label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);\r
-        label->SetRollSpeed(70);\r
+        label->SetRollSpeed(23);\r
 \r
         return label;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp
index 22971d4..eea5598 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp
@@ -69,7 +69,7 @@ namespace OHOS
         // label->SetText(labelconfig.text);
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/RepairView.cpp b/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/RepairView.cpp
index e133764..f2c56d1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/RepairView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/RepairView.cpp
@@ -138,7 +138,7 @@ void RepairView::InitLabels() {
     downingLabel_->SetTextColor(
         Color::GetColorFromRGBA(0xef, 0x0e, 0x0e, 0xff));
     downingLabel_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-    downingLabel_->SetRollSpeed(70);
+    downingLabel_->SetRollSpeed(23);
     downingLabel_->SetFont(GILROY_BOLD_FONT, 26);
     scrollView_->Add(downingLabel_);
     downingLabel_->SetVisible(false);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerView.cpp b/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerView.cpp
index 3cd6842..518b3f3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/safemodemanager/src/SafeModeManagerView.cpp
@@ -138,7 +138,7 @@ void SafeModeManagerView::InitView() {
     if (item.statusLabel.text == "Resource Check") {
       item.statusLabel.label->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);
       item.statusLabel.label->SetAlign(TEXT_ALIGNMENT_CENTER);
-      item.statusLabel.label->SetRollSpeed(30);
+      item.statusLabel.label->SetRollSpeed(23);
     }
     SafeModeScrollView[VIEW_SAFE_LIST]->Add(item.statusLabel.label);
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListItem.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListItem.cpp
index 40fb26d..26156b1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListItem.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListItem.cpp
@@ -24,7 +24,7 @@ namespace OHOS
         // LabelExtDate_.SetTextId(text_id);
         LabelExtDate_.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
         LabelExtDate_.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        LabelExtDate_.SetRollSpeed(70);
+        LabelExtDate_.SetRollSpeed(23);
         LabelExtDate_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         LabelExtDate_.SetStyle(STYLE_TEXT_COLOR, 0xffff5a36);
 
@@ -34,7 +34,7 @@ namespace OHOS
         // LabelExtTopic_.SetTextId(text_id);
         LabelExtTopic_.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
         LabelExtTopic_.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP);
-        LabelExtTopic_.SetRollSpeed(70);
+        LabelExtTopic_.SetRollSpeed(23);
         LabelExtTopic_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         // LabelExtTopic_.SetStyle(STYLE_TEXT_COLOR, 0xffff5a36);
 
@@ -44,7 +44,7 @@ namespace OHOS
         // LabelExtTime_.SetTextId(text_id);
         LabelExtTime_.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
         LabelExtTime_.SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP);
-        LabelExtTime_.SetRollSpeed(70);
+        LabelExtTime_.SetRollSpeed(23);
         LabelExtTime_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20);
         // LabelExtTime_.SetStyle(STYLE_TEXT_COLOR, 0xffff5a36);
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp
index 7cb2cdf..1dfb891 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp
@@ -454,7 +454,7 @@ namespace OHOS
                 // ContentDateLabelExt_->SetTextId(text_id);\r
                 ContentDateLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
                 ContentDateLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-                ContentDateLabelExt_->SetRollSpeed(70);\r
+                ContentDateLabelExt_->SetRollSpeed(23);\r
                 ContentDateLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                 ContentDateLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xffff5a36);\r
             }\r
@@ -471,7 +471,7 @@ namespace OHOS
                 ContentTopicLabelExt_->SetTextId(STR_SCHEDULE_TOPIC);\r
                 // ContentTopicLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
                 ContentTopicLabelExt_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP);\r
-                ContentTopicLabelExt_->SetRollSpeed(70);\r
+                ContentTopicLabelExt_->SetRollSpeed(23);\r
                 ContentTopicLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                 ContentTopicLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999);\r
             \r
@@ -488,7 +488,7 @@ namespace OHOS
                     ContentTopicLabelExt1_->SetStyle(STYLE_LINE_HEIGHT, 35);\r
                     ContentTopicLabelExt1_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
                     ContentTopicLabelExt1_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP);\r
-                    ContentTopicLabelExt1_->SetRollSpeed(70);\r
+                    ContentTopicLabelExt1_->SetRollSpeed(23);\r
                     ContentTopicLabelExt1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                     ContentTopicLabelExt1_->SetStyle(STYLE_TEXT_COLOR, Color::White().full);\r
                 }\r
@@ -506,7 +506,7 @@ namespace OHOS
                 ContentTimeLabelExt_->SetTextId(STR_SCHEDULE_TIME);\r
                 // ContentTimeLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
                 ContentTimeLabelExt_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP);\r
-                ContentTimeLabelExt_->SetRollSpeed(70);\r
+                ContentTimeLabelExt_->SetRollSpeed(23);\r
                 ContentTimeLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                 ContentTimeLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999);\r
 \r
@@ -523,7 +523,7 @@ namespace OHOS
                     ContentTimeLabelExt1_->SetStyle(STYLE_LINE_HEIGHT, 35);\r
                     ContentTimeLabelExt1_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
                     ContentTimeLabelExt1_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP);\r
-                    ContentTimeLabelExt1_->SetRollSpeed(70);\r
+                    ContentTimeLabelExt1_->SetRollSpeed(23);\r
                     ContentTimeLabelExt1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                     ContentTimeLabelExt1_->SetStyle(STYLE_TEXT_COLOR, Color::White().full);\r
                 }\r
@@ -541,7 +541,7 @@ namespace OHOS
                 ContentContentLabelExt_->SetTextId(STR_SCHEDULE_NOTES);\r
                 // ContentContentLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
                 ContentContentLabelExt_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP);\r
-                ContentContentLabelExt_->SetRollSpeed(70);\r
+                ContentContentLabelExt_->SetRollSpeed(23);\r
                 ContentContentLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                 ContentContentLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999);\r
 \r
@@ -558,7 +558,7 @@ namespace OHOS
                     ContentContentLabelExt1_->SetStyle(STYLE_LINE_HEIGHT, 35);\r
                     ContentContentLabelExt1_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
                     ContentContentLabelExt1_->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_TOP);\r
-                    ContentContentLabelExt1_->SetRollSpeed(70);\r
+                    ContentContentLabelExt1_->SetRollSpeed(23);\r
                     ContentContentLabelExt1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                     ContentContentLabelExt1_->SetStyle(STYLE_TEXT_COLOR, Color::White().full);\r
                 }\r
@@ -674,7 +674,7 @@ namespace OHOS
                 DeleteTitleLabelExt_->SetTextId(STR_DELETE);\r
                 DeleteTitleLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
                 DeleteTitleLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-                DeleteTitleLabelExt_->SetRollSpeed(70);\r
+                DeleteTitleLabelExt_->SetRollSpeed(23);\r
                 DeleteTitleLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                 DeleteTitleLabelExt_->SetStyle(STYLE_TEXT_COLOR, Color::White().full);\r
             }\r
@@ -691,7 +691,7 @@ namespace OHOS
                 DeletePromptLabelExt_->SetTextId(STR_SCHEDULE_DELETE_PROMPT);\r
                 DeletePromptLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
                 DeletePromptLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-                DeletePromptLabelExt_->SetRollSpeed(70);\r
+                DeletePromptLabelExt_->SetRollSpeed(23);\r
                 DeletePromptLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
                 DeletePromptLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xff999999);\r
             }\r
@@ -756,7 +756,7 @@ namespace OHOS
         LabelExt->SetTextId(text_id);\r
         LabelExt->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
         LabelExt->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        LabelExt->SetRollSpeed(70);\r
+        LabelExt->SetRollSpeed(23);\r
         LabelExt->SetFont(DEFAULT_VECTOR_FONT_FILENAME, font_size);\r
         LabelExt->SetStyle(STYLE_TEXT_COLOR, text_color);\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp
index 6413ce4..3565169 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial_style/src/SetDialStyleView.cpp
@@ -61,7 +61,9 @@ namespace OHOS
         labelTitle_.SetPosition(83, 50, 300, 60);
         labelTitle_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         labelTitle_.SetTextId(STR_BROWSING_SPECIAL_EFFECTS);
-        labelTitle_.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); // 居中
+        // labelTitle_.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); // 居中
+        labelTitle_.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
+        labelTitle_.SetRollSpeed(23);
         labelTitle_.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         container_->Add(&labelTitle_);
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_time_format/src/SetTimeFormatView.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_time_format/src/SetTimeFormatView.cpp
index 9411194..eaf83d6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_time_format/src/SetTimeFormatView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_time_format/src/SetTimeFormatView.cpp
@@ -57,6 +57,8 @@ void SetTimeFormatView::OnSetUpView() {
   labelFormat24H_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
   // labelFormat24H_.SetTextId(STR_OVERLAY_FLOW);
   labelFormat24H_.SetTextId(STR_FORMAT); // TODO:多国语言
+  labelFormat24H_.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
+  labelFormat24H_.SetRollSpeed(23);
   container_->Add(&labelFormat24H_);
 
   btnFormat24H_.SetPosition(298, 145, 100, 50);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModeView.cpp
index d05e9da..2e079c6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleepmode/src/SleepModeView.cpp
@@ -149,7 +149,7 @@ namespace OHOS
                 TitleLabelExt_->SetTextId(STR_SLEEPMODE);
                 TitleLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
                 TitleLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-                TitleLabelExt_->SetRollSpeed(70);
+                TitleLabelExt_->SetRollSpeed(23);
                 TitleLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
                 // TitleLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0xffff5a36);
             }
@@ -182,7 +182,7 @@ namespace OHOS
                 PromptLabelExt_->SetTextId(STR_SLEEP_MODE_PROMPT_ON);
                 PromptLabelExt_->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
                 PromptLabelExt_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-                PromptLabelExt_->SetRollSpeed(70);
+                PromptLabelExt_->SetRollSpeed(23);
                 PromptLabelExt_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
                 PromptLabelExt_->SetStyle(STYLE_TEXT_COLOR, 0Xff999999);
             }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
index 04840cc..d006a22 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
@@ -149,7 +149,7 @@ namespace OHOS
         label->SetTextId(labelconfig.textId);\r
         label->SetLineBreakMode(labelconfig.lineBreakMode);\r
         label->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER);\r
-        label->SetRollSpeed(70);\r
+        label->SetRollSpeed(23);\r
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);\r
         return label;\r
     }\r
@@ -173,7 +173,7 @@ namespace OHOS
         Title->SetStyle(STYLE_LINE_HEIGHT, 35);\r
         Title->SetTextId(STR_SOUND_AND_VIBRATION); // 声音与震动\r
         Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-        Title->SetRollSpeed(70);\r
+        Title->SetRollSpeed(23);\r
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         SoundAndVibrationScrollView[SOUNDANDVIBRATIONVIEW]->Add(Title);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp
index 7d6f746..091ee7f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp
@@ -103,7 +103,7 @@ namespace OHOS
             Title->SetStyle(STYLE_LINE_HEIGHT, 35);
             Title->SetTextId(STR_VIBRATION_MODE); // 震动模式
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-            Title->SetRollSpeed(70);
+            Title->SetRollSpeed(23);
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
             scrollView->Add(Title);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp
index 1ddf56c..d0bd49d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp
@@ -266,7 +266,7 @@ namespace OHOS
             stopWatchlabel->SetTextId(STR_STOPWATCH); // 秒表\r
             stopWatchlabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             stopWatchlabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            stopWatchlabel->SetRollSpeed(70);\r
+            stopWatchlabel->SetRollSpeed(23);\r
             stopWatchlabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             stopWatchlabel->SetVisible(true);\r
             /* ------------------------------ showTimelabel ----------------------------- */\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordCycleToLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordCycleToLimitView.cpp
index 879ddac..a6bf75f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordCycleToLimitView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordCycleToLimitView.cpp
@@ -57,7 +57,7 @@ namespace OHOS
             Title->SetTextId(STR_STOPWATCH); // 秒表\r
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            Title->SetRollSpeed(70);\r
+            Title->SetRollSpeed(23);\r
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             if (AttentionImage == nullptr)\r
@@ -89,7 +89,7 @@ namespace OHOS
             AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             AttentionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
             AttentionLabel->SetTextColor(Color::GetColorFromRGBA(0xaa, 0xaa, 0xaa, 0xff));\r
-            AttentionLabel->SetRollSpeed(70);\r
+            AttentionLabel->SetRollSpeed(23);\r
             AttentionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             if (button == nullptr)\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp
index 83af2f8..403064d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp
@@ -58,7 +58,7 @@ namespace OHOS
             Title->SetTextId(STR_STOPWATCH); // 秒表\r
             Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            Title->SetRollSpeed(70);\r
+            Title->SetRollSpeed(23);\r
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             if (AttentionImage == nullptr)\r
@@ -90,7 +90,7 @@ namespace OHOS
             AttentionLabel_1->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             AttentionLabel_1->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
             AttentionLabel_1->SetTextColor(Color::GetColorFromRGBA(0xaa, 0xaa, 0xaa, 0xff));\r
-            AttentionLabel_1->SetRollSpeed(70);\r
+            AttentionLabel_1->SetRollSpeed(23);\r
             AttentionLabel_1->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* ---------------------------- AttentionLabel_2 ---------------------------- */\r
             if (AttentionLabel_2 == nullptr)\r
@@ -109,7 +109,7 @@ namespace OHOS
             AttentionLabel_2->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             AttentionLabel_2->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
             AttentionLabel_2->SetTextColor(Color::GetColorFromRGBA(0xaa, 0xaa, 0xaa, 0xff));\r
-            AttentionLabel_2->SetRollSpeed(70);\r
+            AttentionLabel_2->SetRollSpeed(23);\r
             AttentionLabel_2->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             if (button == nullptr)\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp
index 569f833..e8553e7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp
@@ -92,7 +92,7 @@ namespace OHOS
         Title->SetStyle(STYLE_LINE_HEIGHT, 35);\r
         Title->SetTextId(STR_FACTORY_RESET); /*恢复出厂*/\r
         Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-        Title->SetRollSpeed(70);\r
+        Title->SetRollSpeed(23);\r
         Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
         Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         /* ---------------------------- FactoryResetImage --------------------------- */\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp
index 19b8b12..646156e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemRestart.cpp
@@ -88,7 +88,7 @@ namespace OHOS
                 title->SetTextId(STR_RESTART);         // 内容
                 title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
                 title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-                title->SetRollSpeed(70);
+                title->SetRollSpeed(23);
                 title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
                 SystemRestartScrollView->Add(title);
             }
@@ -118,7 +118,7 @@ namespace OHOS
                 note->SetTextId(STR_RESET_CONFIRM);
                 note->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
                 note->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-                note->SetRollSpeed(70);
+                note->SetRollSpeed(23);
                 note->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
                 SystemRestartScrollView->Add(note);
             }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp
index f800315..482720c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemShutdown.cpp
@@ -88,7 +88,7 @@ namespace OHOS
                 title->SetTextId(STR_SHUTDOWN);         // 内容
                 title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
                 title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-                title->SetRollSpeed(70);
+                title->SetRollSpeed(23);
                 title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
                 SystemShutdownScrollView->Add(title);
             }
@@ -118,7 +118,7 @@ namespace OHOS
                 note->SetTextId(STR_SHUTDOWN_CONFIRM);
                 note->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
                 note->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-                note->SetRollSpeed(70);
+                note->SetRollSpeed(23);
                 note->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
                 SystemShutdownScrollView->Add(note);
             }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
index 0b9c6b5..4fd6543 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
@@ -136,7 +136,7 @@ namespace OHOS
         label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh);\r
         label->SetTextId(labelconfig.textId);\r
         label->SetLineBreakMode(labelconfig.lineBreakMode);\r
-        label->SetRollSpeed(70);\r
+        label->SetRollSpeed(23);\r
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);\r
         return label;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp
index 9ce58cd..0926b5b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosView.cpp
@@ -249,7 +249,7 @@ void TakephotosView::ShowTakeView() {
   /*初始化label*/
   InitLabelExt(labeltake_, 83, 50, 300, 35, "labletitle", STR_REMOTE_SHOOTING,
                DEFAULT_VECTOR_FONT_FILENAME, 30);
-  InitLabelExt(labelclick_, 53, 278, 360, 70, "labelclick_", STR_TACKNUM,
+  InitRollLabel(labelclick_, 53, 278, 360, 70, "labelclick_", STR_TACKNUM,
                DEFAULT_VECTOR_FONT_FILENAME, 30);
   UpdateLabel(labelclick_, 0, STR_TACKNUM); // 初始化为0
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp
index ea79708..5da20e5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp
@@ -134,7 +134,7 @@ namespace OHOS
         label->SetTextId(labelconfig.textId);//TODO::多国语言
         label->SetLineBreakMode(labelconfig.lineBreakMode);
         label->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER);
-        label->SetRollSpeed(70);
+        label->SetRollSpeed(23);
         label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize);
         return label;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
index 9cf253a..8f9d23a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
@@ -113,7 +113,7 @@ void TraingEnddataView ::InitializeLabels() {
   /*title and sport*/
   InitRollLabel(labeltype, 83, 50, 300, 35, "label1", STR_EXERCISE_LIST,
                 DEFAULT_VECTOR_FONT_FILENAME, 30);
-  InitLabel(labelsport, 147, 140, 240, 35, "label6", "健走",
+  InitRollLabel(labelsport, 147, 140, 240, 35, "label6", STR_EXERCISE_OUTDOORRUNNING,
             DEFAULT_VECTOR_FONT_FILENAME, 30);
   InitLabel(labelduration, 146, 179, 240, 40, "label7", "13:00:22-15:00:12",
             DEFAULT_VECTOR_FONT_FILENAME, 28);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
index dbec98e..d61e7ca 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
@@ -862,7 +862,7 @@ void TraingCardView::ShowGetTagView() {
   InitLabelExt(labeltitle, 83, 50, 300, 35, "label3", STR_GOAL_TITLE,\r
                DEFAULT_VECTOR_FONT_FILENAME_EN, 35);\r
   labeltitle->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-  labeltitle->SetRollSpeed(70);\r
+  labeltitle->SetRollSpeed(23);\r
 \r
   getView->Add(labeltitle);\r
   InitRollLabel(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL,\r
@@ -913,7 +913,7 @@ void TraingCardView::ShowHeartView() {
             DEFAULT_VECTOR_FONT_FILENAME_EN, 30);\r
 \r
   labelnote->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-  labelnote->SetRollSpeed(70);\r
+  labelnote->SetRollSpeed(23);\r
 \r
   heartView->Add(labelnote);\r
 \r
@@ -994,7 +994,7 @@ void TraingCardView::InitImageAnimator() {
             DEFAULT_VECTOR_FONT_FILENAME_EN, 80);\r
 \r
   labeltag->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
-  labeltag->SetRollSpeed(70);\r
+  labeltag->SetRollSpeed(23);\r
 \r
   labeltag->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff));\r
   getView->Add(labeltag);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp
index b02e3cf..5b1ae56 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp
@@ -86,7 +86,7 @@ void TraingAquaticItemView::SetUpChild() {
 
   sLabel.SetPosition(40, 33, 240, 35);
   sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-  sLabel.SetRollSpeed(70);
+  sLabel.SetRollSpeed(23);
   sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp
index e7178af..dd4062c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp
@@ -86,7 +86,7 @@ void TraingBallItemView::SetUpChild() {
 
   sLabel.SetPosition(40, 33, 240, 35);
   sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-  sLabel.SetRollSpeed(70);
+  sLabel.SetRollSpeed(23);
   sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp
index 3517cdf..6ba3435 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp
@@ -86,7 +86,7 @@ void TraingDanceItemView::SetUpChild() {
 
   sLabel.SetPosition(40, 33, 240, 35);
   sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-  sLabel.SetRollSpeed(70);
+  sLabel.SetRollSpeed(23);
   sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp
index 99737ab..5e85353 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp
@@ -86,7 +86,7 @@ void TraingFitnessItemView::SetUpChild() {
 
   sLabel.SetPosition(40, 33, 240, 35);
   sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-  sLabel.SetRollSpeed(70);
+  sLabel.SetRollSpeed(23);
   sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp
index af8e218..da24e2a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp
@@ -86,7 +86,7 @@ void TraingIceItemView::SetUpChild() {
 
   sLabel.SetPosition(40, 33, 240, 35);
   sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-  sLabel.SetRollSpeed(70);
+  sLabel.SetRollSpeed(23);
   sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp
index 2d349bb..89b1398 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp
@@ -86,7 +86,7 @@ void TraingLimitItemView::SetUpChild() {
 
   sLabel.SetPosition(40, 33, 240, 35);
   sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-  sLabel.SetRollSpeed(70);
+  sLabel.SetRollSpeed(23);
   sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp
index 6f7698e..8b217d9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp
@@ -105,7 +105,7 @@ void TraingMoreItemView::SetUpChild() {
   sLabel.SetPosition(105, 33, 200, 35);
   sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
   // sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-  sLabel.SetRollSpeed(70);
+  sLabel.SetRollSpeed(23);
   sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp
index 4015ee5..c96ad43 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp
@@ -86,7 +86,7 @@ void TraingOtherItemView::SetUpChild() {
 
   sLabel.SetPosition(40, 33, 240, 35);
   sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-  sLabel.SetRollSpeed(70);
+  sLabel.SetRollSpeed(23);
   sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp
index bdec1eb..1b2e5cc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp
@@ -86,7 +86,7 @@ void TraingRestItemView::SetUpChild() {
 
   sLabel.SetPosition(40, 33, 240, 35);
   sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-  sLabel.SetRollSpeed(70);
+  sLabel.SetRollSpeed(23);
   sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp
index b37e912..1d62ee8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp
@@ -123,7 +123,7 @@ namespace OHOS
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "get btname %s ,ret 0x%X\n", ble_name, ret);
         TitleLabel->SetText((char *)ble_name);
         TitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
-        TitleLabel->SetRollSpeed(70);
+        TitleLabel->SetRollSpeed(23);
         TitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
         TitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         WatchQRCodeGroupView->Add(TitleLabel);
@@ -139,7 +139,7 @@ namespace OHOS
         DeviceNameLabel->SetStyle(STYLE_TEXT_FONT, 30);
         DeviceNameLabel->SetStyle(STYLE_LINE_HEIGHT, 35);
         DeviceNameLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30);
-        DeviceNameLabel->SetRollSpeed(70);
+        DeviceNameLabel->SetRollSpeed(23);
         DeviceNameLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
         DeviceNameLabel->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));
         DeviceNameLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/alarm_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/alarm_notification.cpp
index b24132c..adc7561 100755 (executable)
--- a/code/sdk/application/wearable/service/msg_center/src/notify/alarm_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/alarm_notification.cpp
@@ -409,7 +409,7 @@ namespace OHOS
             g_mainLable->SetStyle(STYLE_LINE_HEIGHT, 35);
             g_mainLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
             g_mainLable->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-            g_mainLable->SetRollSpeed(70);
+            g_mainLable->SetRollSpeed(23);
             g_mainLable->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             g_alarmView->Add(g_mainLable);
             /* -------------------------------------------------------------------------- */

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/goal_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/goal_notification.cpp
index 67274d5..09d0c25 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/notify/goal_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/goal_notification.cpp
@@ -365,7 +365,7 @@ namespace OHOS
                       STR_GOAL_DOWN, DEFAULT_VECTOR_FONT_FILENAME_EN,
                       35);
             labeltitle->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-            labeltitle->SetRollSpeed(70);
+            labeltitle->SetRollSpeed(23);
             getView->Add(labeltitle);
             InitRollLabel(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL,
                             DEFAULT_VECTOR_FONT_FILENAME, 30);

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/message_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/message_notification.cpp
index b62d497..2c48743 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/notify/message_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/message_notification.cpp
@@ -142,7 +142,7 @@ UIViewGroup *CreateMessageView(void) {
     // titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
     titleLabel->SetLineBreakMode(
         UILabel::LINE_BREAK_OSCILLATION); // 来回滚动属性
-    titleLabel->SetRollSpeed(70);
+    titleLabel->SetRollSpeed(23);
     titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
     titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
     titleLabel->SetVisible(true);

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp
index 2911e5d..2e08881 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp
@@ -292,7 +292,7 @@ namespace OHOS
             DeviceBindingViewTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
             DeviceBindingViewTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             DeviceBindingViewTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
-            DeviceBindingViewTitleLabel->SetRollSpeed(70);
+            DeviceBindingViewTitleLabel->SetRollSpeed(23);
             /* ----------------------- DeviceBindingAnimatorView ---------------------- */
             BindPathsArray = CreateImageInfoArray(BIND_IMAGE_SRC, BIND_IMAGE_ANIMATOR_VIEW_NUM_FRAMES);
             if (DeviceBindingAnimatorView == nullptr)
@@ -352,7 +352,7 @@ namespace OHOS
             DeviceBindingName->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);
             DeviceBindingName->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             DeviceBindingName->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
-            DeviceBindingName->SetRollSpeed(70);
+            DeviceBindingName->SetRollSpeed(23);
             /* ------------------------------ DeviceBindingButtonCancel ------------------------------ */
             int y = DeviceBindingName->GetY() + DeviceBindingName->GetTextHeight() + 20;
             DeviceBindingButtonCancel = CreateButton(111, y, 100, 100, "/user/res/SYSTEM_CheckOff.bin");

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp
index 3696552..3b9d00a 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp
@@ -207,7 +207,7 @@ namespace OHOS
             SedentaryReminderTitleLabel->SetText("久坐提醒");
 #endif
             SedentaryReminderTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
-            SedentaryReminderTitleLabel->SetRollSpeed(70);
+            SedentaryReminderTitleLabel->SetRollSpeed(23);
             SedentaryReminderTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
             SedentaryReminderTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
             /* --------------------------- SedentaryReminderImage --------------------------- */