From: Caisking <3449750381@qq.com>
Date: Mon, 18 Nov 2024 10:16:31 +0000 (+0800)
Subject: 省电模式:优化提醒界面
X-Git-Tag: fd230_release_V1.3.102~63
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=98520cce38a97e99dd763a97b8800f999ef8f0e7;p=mirrors%2FFD230.git

省电模式:优化提醒界面
---

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