From: Caisking <3449750381@qq.com> Date: Sat, 7 Sep 2024 03:07:58 +0000 (+0800) Subject: #447 运动结束界面添加提示语 X-Git-Tag: release_V1.2.70_20241020_135402~524^2~1^2~13 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=0911687b156a99756d749d1d55712026e6cc4c70;p=mirrors%2FFD230.git #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 12c67b4b6..704b05912 100644 --- 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 /*结束弹窗*/ UILabelExt *endtitle{nullptr}; // 结束弹窗title UILabelExt *notelabel{nullptr}; // 提醒label + UILabelExt *endnote{nullptr}; // 是否结束 UILabelExt *endnotelabel{nullptr}; UIButton *exit{nullptr}; // 退出按键 UIButton *back{nullptr}; // 返回按键 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 ee3da6802..c2b51d4e6 100644 --- 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; delete endnotelabel; endnotelabel = nullptr; + delete endnote; + endnote = nullptr; delete labeltitle; labeltitle = nullptr; delete labeltag; @@ -333,9 +335,13 @@ namespace OHOS endView->SetReboundSize(50); endView->SetDirection(1); - InitLabelExt(endtitle, 83, 50, 300, 35, "label1", STR_LOOK_OUT, DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabelExt(notelabel, 56, 167, 360, 80, "label2", STR_INSUFFICIENT_EXERCISE_AMOUNT, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitRollLabel(endtitle, 83, 50, 300, 35, "label1", STR_LOOK_OUT, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitRollLabel(notelabel, 56, 167, 360, 80, "label2", STR_INSUFFICIENT_EXERCISE_AMOUNT, DEFAULT_VECTOR_FONT_FILENAME, 30); + /*隐藏是否结束运动title*/ + InitRollLabel(endnote, 56, 207, 360, 80, "label3", STR_END_THIS_MOVEMENT, DEFAULT_VECTOR_FONT_FILENAME, 30); + endnote->SetVisible(false); + endView->Add(endnote); endView->Add(endtitle); endView->Add(notelabel); @@ -369,9 +375,9 @@ namespace OHOS getView->SetDirection(1); // 初始化Lable - InitLabelExt(labeltitle, 83, 50, 300, 35, "label1", STR_GOAL_ACHIEVED, DEFAULT_VECTOR_FONT_FILENAME, 35); + InitRollLabel(labeltitle, 83, 50, 300, 35, "label1", STR_GOAL_ACHIEVED, DEFAULT_VECTOR_FONT_FILENAME, 35); getView->Add(labeltitle); - InitLabelExt(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitRollLabel(labelgettag, 103, 307, 200, 35, "label3", STR_ACCOMPLISH_GOAL, DEFAULT_VECTOR_FONT_FILENAME, 30); getView->Add(labelgettag); InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%", DEFAULT_VECTOR_FONT_FILENAME, 30); getView->Add(labelpre); @@ -405,7 +411,7 @@ namespace OHOS heartView->SetDirection(1); // 初始化Lable - InitLabelExt(hearttitle, 83, 50, 300, 35, "label1", STR_HEARTTITLE, DEFAULT_VECTOR_FONT_FILENAME, 35); + InitRollLabel(hearttitle, 83, 50, 300, 35, "label1", STR_HEARTTITLE, DEFAULT_VECTOR_FONT_FILENAME, 35); heartView->Add(hearttitle); int maxheart = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_TRAINING_HEART_MAX); @@ -438,6 +444,7 @@ namespace OHOS if (momentumFlag) { // 正常结束 + endnote->SetVisible(false); endtitle->SetTextId(STR_END_MOVEMENT); notelabel->SetTextId(STR_END_THIS_MOVEMENT); } @@ -445,6 +452,7 @@ namespace OHOS { endtitle->SetTextId(STR_LOOK_OUT); notelabel->SetTextId(STR_INSUFFICIENT_EXERCISE_AMOUNT); + endnote->SetVisible(true); } return momentumFlag; }