#441运动-健身类有遮挡

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);
     }