Merge #906 into sdk602patch0626 from refs/changes/906/head

Code review from 袁清梦

* refs/changes/906/head: (9 commits squashed)

  - 增加多国语言自动翻译脚本：待完善

  - 修复心率测量发生的死机

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - #440运动-健身类-少了循环训练

  - #439运动-健身类 排序问题 室外走路，跑步，骑行不在顶部，需要把常用的放在顶部

  - #445 运动-休闲运动-少了对战游戏

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - #447 运动结束界面添加提示语

  - #441运动-健身类有遮挡

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/906

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h
index 12c67b4..704b059 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h
@@ -114,6 +114,7 @@ namespace OHOS
         /*结束弹窗*/\r
         UILabelExt *endtitle{nullptr};  // 结束弹窗title\r
         UILabelExt *notelabel{nullptr}; // 提醒label\r
+        UILabelExt *endnote{nullptr};   // 是否结束\r
         UILabelExt *endnotelabel{nullptr};\r
         UIButton *exit{nullptr}; // 退出按键\r
         UIButton *back{nullptr}; // 返回按键\r

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 ee3da68..c2b51d4 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
@@ -156,6 +156,8 @@ namespace OHOS
         notelabel = nullptr;\r
         delete endnotelabel;\r
         endnotelabel = nullptr;\r
+        delete endnote;\r
+        endnote = nullptr;\r
         delete labeltitle;\r
         labeltitle = nullptr;\r
         delete labeltag;\r
@@ -333,9 +335,13 @@ namespace OHOS
         endView->SetReboundSize(50);\r
         endView->SetDirection(1);\r
 \r
-        InitLabelExt(endtitle, 83, 50, 300, 35, "label1", STR_LOOK_OUT, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-        InitLabelExt(notelabel, 56, 167, 360, 80, "label2", STR_INSUFFICIENT_EXERCISE_AMOUNT, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitRollLabel(endtitle, 83, 50, 300, 35, "label1", STR_LOOK_OUT, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitRollLabel(notelabel, 56, 167, 360, 80, "label2", STR_INSUFFICIENT_EXERCISE_AMOUNT, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        /*隐藏是否结束运动title*/\r
+        InitRollLabel(endnote, 56, 207, 360, 80, "label3", STR_END_THIS_MOVEMENT, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        endnote->SetVisible(false);\r
 \r
+        endView->Add(endnote);\r
         endView->Add(endtitle);\r
         endView->Add(notelabel);\r
 \r
@@ -369,9 +375,9 @@ namespace OHOS
         getView->SetDirection(1);\r
 \r
         // 初始化Lable\r
-        InitLabelExt(labeltitle, 83, 50, 300, 35, "label1", STR_GOAL_ACHIEVED, DEFAULT_VECTOR_FONT_FILENAME, 35);\r
+        InitRollLabel(labeltitle, 83, 50, 300, 35, "label1", STR_GOAL_ACHIEVED, DEFAULT_VECTOR_FONT_FILENAME, 35);\r
         getView->Add(labeltitle);\r
-        InitLabelExt(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitRollLabel(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         getView->Add(labelgettag);\r
         InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         getView->Add(labelpre);\r
@@ -405,7 +411,7 @@ namespace OHOS
         heartView->SetDirection(1);\r
 \r
         // 初始化Lable\r
-        InitLabelExt(hearttitle, 83, 50, 300, 35, "label1", STR_HEARTTITLE, DEFAULT_VECTOR_FONT_FILENAME, 35);\r
+        InitRollLabel(hearttitle, 83, 50, 300, 35, "label1", STR_HEARTTITLE, DEFAULT_VECTOR_FONT_FILENAME, 35);\r
         heartView->Add(hearttitle);\r
 \r
         int maxheart = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_TRAINING_HEART_MAX);\r
@@ -438,6 +444,7 @@ namespace OHOS
         if (momentumFlag)\r
         {\r
             // 正常结束\r
+            endnote->SetVisible(false);\r
             endtitle->SetTextId(STR_END_MOVEMENT);\r
             notelabel->SetTextId(STR_END_THIS_MOVEMENT);\r
         }\r
@@ -445,6 +452,7 @@ namespace OHOS
         {\r
             endtitle->SetTextId(STR_LOOK_OUT);\r
             notelabel->SetTextId(STR_INSUFFICIENT_EXERCISE_AMOUNT);\r
+            endnote->SetVisible(true);\r
         }\r
         return momentumFlag;\r
     }\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 a6593f8..cb8bc12 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
@@ -1,4 +1,10 @@
 /*** 
+ * @Date: 2024-04-15 10:55:58
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-09-07 11:34:38
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp
+ */
+/***
  * @Author: Caisking 3449750381@qq.com
  * @Date: 2024-03-29 17:42:13
  * @LastEditors: Caisking 3449750381@qq.com
@@ -7,7 +13,6 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 
-
 #include "traing/training_list_aquatic/include/TraingAquaticItemView.h"
 #include "traing/include/TraingModel.h"
 #include "uicomponents/UIComponents.h"
@@ -54,10 +59,11 @@ namespace OHOS
         sicon.SetSrc(ICON_IMAGE);
         sicon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
-        sLabel.SetPosition(50, 10, 300, 80);
-        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        sLabel.SetRollSpeed(0);
+           sLabel.SetPosition(40, 33, 240, 35);
+        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
+        sLabel.SetRollSpeed(70);
+//sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+
         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 7ccc5b8..9792574 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
@@ -1,4 +1,9 @@
-
+/***
+ * @Date: 2024-04-15 10:55:58
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-09-07 12:09:40
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp
+ */
 
 #include "traing/training_list_ball/include/TraingBallItemView.h"
 #include "traing/include/TraingModel.h"
@@ -46,10 +51,11 @@ namespace OHOS
         sicon.SetSrc(ICON_IMAGE);
         sicon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
-        sLabel.SetPosition(50, 10, 300, 80);
-        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        sLabel.SetRollSpeed(0);
+        sLabel.SetPosition(40, 33, 240, 35);
+            sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
+        sLabel.SetRollSpeed(70);
+        // sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+
         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 9bdc74e..3cc349c 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
@@ -1,4 +1,4 @@
-/*** 
+/***
  * @Author: Caisking 3449750381@qq.com
  * @Date: 2024-03-27 15:25:02
  * @LastEditors: Caisking 3449750381@qq.com
@@ -53,10 +53,11 @@ namespace OHOS
         sicon.SetSrc(ICON_IMAGE);
         sicon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
-        sLabel.SetPosition(50, 10, 300, 80);
-        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        sLabel.SetRollSpeed(0);
+           sLabel.SetPosition(40, 33, 240, 35);
+        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
+        sLabel.SetRollSpeed(70);
+//sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+
         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 1e51f95..c9172ce 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
@@ -43,10 +43,11 @@ namespace OHOS
         sicon.SetSrc(ICON_IMAGE);
         sicon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
-        sLabel.SetPosition(50, 10, 300, 80);
-        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        sLabel.SetRollSpeed(0);
+           sLabel.SetPosition(40, 33, 240, 35);
+        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
+        sLabel.SetRollSpeed(70);
+//sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+
         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 4c5d1d1..1669f9f 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
@@ -53,10 +53,11 @@ namespace OHOS
         sicon.SetSrc(ICON_IMAGE);
         sicon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
-        sLabel.SetPosition(50, 10, 300, 80);
-        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        sLabel.SetRollSpeed(0);
+           sLabel.SetPosition(40, 33, 240, 35);
+        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
+        sLabel.SetRollSpeed(70);
+//sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+
         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 6b15b03..31c2567 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
@@ -53,10 +53,11 @@ namespace OHOS
         sicon.SetSrc(ICON_IMAGE);
         sicon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
-        sLabel.SetPosition(50, 10, 300, 80);
-        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        sLabel.SetRollSpeed(0);
+           sLabel.SetPosition(40, 33, 240, 35);
+        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
+        sLabel.SetRollSpeed(70);
+//sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+
         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 1b9fbe8..dd80467 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
@@ -52,16 +52,16 @@ namespace OHOS
     {
         sbackground.SetSrc(PNG_SETTING_BACKGROUND_IMAGE);
 
-        slogo.SetPosition(60, 35);
+        slogo.SetPosition(40, 32);
         slogo.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
         sicon.SetPosition(330, 40);
         sicon.SetSrc(ICON_IMAGE);
         sicon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
-        sLabel.SetPosition(50, 10, 300, 80);
+        sLabel.SetPosition(105, 33, 200, 35);
         sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+        // sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         sLabel.SetRollSpeed(0);
         sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp
index 8e661f5..273aca6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp
@@ -155,6 +155,7 @@ namespace OHOS
         scrollView->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT);\r
         RootView::GetInstance()->Add(scrollView);\r
         TraingMoreList->SetAdapter(p_TraingMoreListAdapter);\r
+        TraingMoreList->SetIntercept(true);\r
         // TraingMoreList->RefreshList(); // 刷新列表\r
         Draw();\r
     }\r

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 df82d9f..b33393a 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
@@ -1,4 +1,10 @@
 /*** 
+ * @Date: 2024-04-15 10:55:58
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-09-07 11:28:23
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp
+ */
+/***
  * @Author: Caisking 3449750381@qq.com
  * @Date: 2024-03-29 17:42:13
  * @LastEditors: Caisking 3449750381@qq.com
@@ -7,7 +13,6 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 
-
 #include "traing/training_list_other/include/TraingOtherItemView.h"
 #include "traing/include/TraingModel.h"
 #include "uicomponents/UIComponents.h"
@@ -54,10 +59,11 @@ namespace OHOS
         sicon.SetSrc(ICON_IMAGE);
         sicon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
-        sLabel.SetPosition(50, 10, 300, 80);
-        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        sLabel.SetRollSpeed(0);
+           sLabel.SetPosition(40, 33, 240, 35);
+        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
+        sLabel.SetRollSpeed(70);
+//sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+
         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 c83ee9a..edaaaa7 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
@@ -1,9 +1,15 @@
 /*** 
+ * @Date: 2024-04-15 10:55:58
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-09-07 11:27:11
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp
+ */
+/***
  * @Author: Caisking 3449750381@qq.com
  * @Date: 2024-03-29 15:19:06
  * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-03-29 15:56:04
- * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp
+ * @LastEditTime: 2024-09-07 11:24:37
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 /***
@@ -61,10 +67,11 @@ namespace OHOS
         sicon.SetSrc(ICON_IMAGE);
         sicon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
-        sLabel.SetPosition(50, 10, 300, 80);
-        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        sLabel.SetRollSpeed(0);
+           sLabel.SetPosition(40, 33, 240, 35);
+        sLabel.SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);
+        sLabel.SetRollSpeed(70);
+//sLabel.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+
         sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
     }