Merge #1421 into sdk602patch0911 from refs/changes/1421/head

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 <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1421

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 103e333..22f951d 100644 (file)
--- 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 8dc96cc..a6ad782 100644 (file)
--- 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*/\r
   InitRollLabel(labeltitle, 83, 50, 300, 35, "labletitle", STR_POWER_SAVE_MODE,\r
                 DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-  //TODO:多国语言\r
+  // TODO:多国语言\r
   InitLabelExt(labelnote, 53, 217, 360, 200, "labletitle", STR_SAVENOTE,\r
                DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-  InitLabelExt(labelkown, 53, 385, 360, 100, "labelrecord", STR_SAVEBACK,\r
+  labelnote->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
+\r
+  InitLabelExt(labelkown, 53, labelnote->GetY() + labelnote->GetHeight() + 20,\r
+               360, 100, "labelrecord", STR_SAVEBACK,\r
                DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+  labelkown->SetLineBreakMode(UILabel::LINE_BREAK_WRAP);\r
   labelkown->SetTextColor(Color::Orange());\r
 \r
   /*初始化图片*/\r
   InitImageView(iamgeicon, 188, 121, 80, 90, "saveicon", iconImgPath);\r
 \r
   /*初始化按键*/\r
-  InitButton(buttonno, 110, 501, 100, 100, SAVEBUTTONNO);\r
+  InitButton(buttonno, 110, labelkown->GetY() + labelkown->GetHeight() + 40,\r
+             100, 100, SAVEBUTTONNO);\r
   buttonno->SetImageSrc(butnoImgPath, butnoImgPath);\r
   buttonno->SetOnClickListener(presenter_);\r
 \r
-  InitButton(buttonok, 255, 501, 100, 100, SAVEBUTTONOK);\r
+  InitButton(buttonok, 255, labelkown->GetY() + labelkown->GetHeight() + 40,\r
+             100, 100, SAVEBUTTONOK);\r
   buttonok->SetImageSrc(butokImgPath, butokImgPath);\r
   buttonok->SetOnClickListener(presenter_);\r
 \r