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

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