From d7f9c6c02496ca928f861d7f7e79959d77b6f8d5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com> Date: Mon, 18 Nov 2024 10:24:13 +0000 Subject: [PATCH] Merge #1421 into sdk602patch0911 from refs/changes/1421/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 袁清梦 * refs/changes/1421/head: (2 commits squashed) - 省电模式:优化提醒界面 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1421 --- .../fd230app/nativeui/applist/src/ApplistView.cpp | 2 +- .../fd230app/nativeui/saveele/src/SaveEleView.cpp | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp index 103e3334e..22f951d1f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp @@ -945,7 +945,7 @@ void ApplistView::CircleListStyleOnStart(void) } /* -------------------------------------------------------------------------- */ uint16_t presliceId = NativeAbility::GetInstance().GetPreSliceId(); - if (presliceId == VIEW_MAIN) //如果是从主页进入的，那么 startangle = 0 + if (presliceId == VIEW_MAIN || presliceId == VIEW_THEME_STYLE) //如果是从主页进入的，那么 startangle = 0 { ApplistModel::GetInstance().SetCircleListStartAngle(0); ApplistModel::GetInstance().SetCurselectImageIndex(6); diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleView.cpp index 8dc96cc51..a6ad78222 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveEleView.cpp @@ -74,22 +74,28 @@ void SaveEleView::InitView() { /*初始化label*/ InitRollLabel(labeltitle, 83, 50, 300, 35, "labletitle", STR_POWER_SAVE_MODE, DEFAULT_VECTOR_FONT_FILENAME, 30); - //TODO:多国语言 + // TODO:多国语言 InitLabelExt(labelnote, 53, 217, 360, 200, "labletitle", STR_SAVENOTE, DEFAULT_VECTOR_FONT_FILENAME, 30); - InitLabelExt(labelkown, 53, 385, 360, 100, "labelrecord", STR_SAVEBACK, + labelnote->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); + + InitLabelExt(labelkown, 53, labelnote->GetY() + labelnote->GetHeight() + 20, + 360, 100, "labelrecord", STR_SAVEBACK, DEFAULT_VECTOR_FONT_FILENAME, 30); + labelkown->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); labelkown->SetTextColor(Color::Orange()); /*初始化图片*/ InitImageView(iamgeicon, 188, 121, 80, 90, "saveicon", iconImgPath); /*初始化按键*/ - InitButton(buttonno, 110, 501, 100, 100, SAVEBUTTONNO); + InitButton(buttonno, 110, labelkown->GetY() + labelkown->GetHeight() + 40, + 100, 100, SAVEBUTTONNO); buttonno->SetImageSrc(butnoImgPath, butnoImgPath); buttonno->SetOnClickListener(presenter_); - InitButton(buttonok, 255, 501, 100, 100, SAVEBUTTONOK); + InitButton(buttonok, 255, labelkown->GetY() + labelkown->GetHeight() + 40, + 100, 100, SAVEBUTTONOK); buttonok->SetImageSrc(butokImgPath, butokImgPath); buttonok->SetOnClickListener(presenter_); -- 2.17.1