闹钟界面适配多国语言

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h
index 7001111..7a4b22b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-09-02 20:04:12\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-09-10 16:31:01\r
+ * @LastEditTime: 2024-09-13 15:21:58\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h\r
  */\r
 \r
@@ -42,9 +42,9 @@ private:
     UILabelButtonExt* button1{nullptr};\r
     UILabelButtonExt* button2{nullptr};\r
     UILabelExt *labelTime{nullptr};\r
-    UILabel *labelSetTime{nullptr};\r
-    UILabel *labelDay{nullptr};\r
-    UILabel *labelSetWeek{nullptr};\r
+    UILabelExt *labelSetTime{nullptr};\r
+    UILabelExt *labelDay{nullptr};\r
+    UILabelExt *labelSetWeek{nullptr};\r
     char showtime[12]{0};\r
 };\r
 } // namespace OHOS\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h
index fa667ae..aae3aa8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h
@@ -11,7 +11,7 @@
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_ext.h"\r
-#include "components/ui_label_button.h"\r
+#include "components/ui_label_button_ext.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "font/ui_font.h"\r
 #include "components/ui_scroll_view.h"\r
@@ -33,14 +33,13 @@ public:
     void RefreshSetWeek2(uint8_t week);\r
 private:\r
     UIScrollView *group{nullptr};\r
-    UILabelButton *weekImage{nullptr};\r
-    UILabel *labelRespeat{nullptr};\r
+    UILabelButtonExt *weekImage{nullptr};\r
+    UILabelExt *labelRespeat{nullptr};\r
     UILabelButton *buttonWeek[7]{nullptr}; // 星期一共有7天，因此设置了七个星期的按钮\r
     void CreateWeekButton1(void);\r
     void CreateWeekButton2(void);\r
     void SetLabelButton(void);\r
-    UILabelButton *CreateUILabelButton(const char *buttonText, int16_t x, int16_t y);\r
-    UIView *CreateUIView(int16_t x, int16_t y);\r
+    UILabelButtonExt *CreateUILabelButton(const char *buttonText1,const char *buttonText2, int16_t x, int16_t y);\r
 };\r
 } // namespace OHOS\r
 #endif\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp
index 2799c22..60b91a3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp
@@ -12,7 +12,7 @@
 #include <sstream>\r
 #include "color.h"\r
 #include "ConfigModel.h"\r
-\r
+#include "ui_resource_string.h"\r
 namespace OHOS\r
 {\r
 #define SET_ALARM "编辑闹钟"\r
@@ -141,7 +141,8 @@ namespace OHOS
             }\r
         }\r
         editLabel->SetPosition(83, 50, 300, 35);\r
-        editLabel->SetText("编辑闹钟");\r
+        // editLabel->SetText("编辑闹钟");\r
+        editLabel->SetTextId(STR_ALARM);\r
         editLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
         editLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
         editLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
@@ -188,7 +189,8 @@ namespace OHOS
             }\r
         }\r
         labelSetTime->SetPosition(93, labelTime->GetY() + labelTime->GetHeight(), 250, 35);\r
-        labelSetTime->SetText("更改时间");\r
+        // labelSetTime->SetText("更改时间");\r
+        labelSetTime->SetTextId(STR_ALARM_TIME_CHANGE);\r
         labelSetTime->SetStyle(STYLE_TEXT_FONT, 30);\r
         labelSetTime->SetStyle(STYLE_LINE_HEIGHT, 35);\r
         labelSetTime->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));\r
@@ -222,7 +224,8 @@ namespace OHOS
             }\r
         }\r
         labelSetWeek->SetPosition(93, labelDay->GetY() + labelDay->GetHeight(), 250, 35);\r
-        labelSetWeek->SetText("更改星期");\r
+        // labelSetWeek->SetText("更改星期");\r
+        labelSetWeek->SetTextId(STR_ALARM_WEEK_CHANGE);\r
         labelSetWeek->SetStyle(STYLE_TEXT_FONT, 30);\r
         labelSetWeek->SetStyle(STYLE_LINE_HEIGHT, 35);\r
         labelSetWeek->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp
index 696562c..1603580 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp
@@ -12,6 +12,7 @@
 #include "alarm/include/AlarmPresenter.h"\r
 #include "alarm/include/MainAlarmView.h"\r
 #include "cmsis_os2.h"\r
+#include "ui_resource_string.h"\r
 \r
 namespace OHOS {\r
 #define MAX_INETERFACES "当前闹钟个数已达上限"\r
@@ -46,11 +47,17 @@ AlarmMaxClock::AlarmMaxClock()
 \r
 AlarmMaxClock::~AlarmMaxClock()\r
 {\r
-    container->RemoveAll();\r
-    delete labelText;\r
-    labelText = nullptr;\r
-    delete container;\r
-    container = nullptr;\r
+    if(container)\r
+    {\r
+        container->RemoveAll();\r
+        if(labelText)\r
+        {\r
+            delete labelText;\r
+            labelText = nullptr;\r
+        }\r
+        delete container;\r
+        container = nullptr;\r
+    }\r
     g_AlarmMaxClock = nullptr;\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmMaxClock::~AlarmMaxClock");\r
 }\r
@@ -90,7 +97,7 @@ UIScrollView *AlarmMaxClock::InitAlarmMax(void)
             }\r
         }\r
         labelText->SetPosition(83, 236, 360, 35);\r
-        labelText->SetText(MAX_INETERFACES);//当前闹钟个数已达上限\r
+        labelText->SetTextId(STR_ALARM_ADD_LIMIT_NOTE);//当前闹钟个数已达上限\r
         labelText->SetStyle(STYLE_TEXT_FONT, 30);\r
         labelText->SetStyle(STYLE_LINE_HEIGHT, 35);\r
         labelText->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp
index d07ae4d..77aed61 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp
@@ -5,10 +5,11 @@
  * Create: 2021-09-11\r
  */\r
 \r
-#include "AlarmSetWeekView.h"\r
+#include "alarm/include/AlarmSetWeekView.h"\r
 #include "common/screen.h"\r
 #include "components/ui_digital_clock.h"\r
-\r
+#include "ui_resource_string.h"\r
+#include "ConfigModel.h"\r
 namespace OHOS {\r
 // #define MON "星期一"\r
 // #define TUE "星期二"\r
@@ -24,6 +25,13 @@ namespace OHOS {
 #define FRI "五"\r
 #define SAT "六"\r
 #define SUN "日"\r
+#define MON_EN "Mon"\r
+#define TUE_EN "Tue"\r
+#define WED_EN "Wed"\r
+#define THUR_EN "Thu"\r
+#define FRI_EN "Fri"\r
+#define SAT_EN "Sat"\r
+#define SUN_EN "Sun"\r
 #define RESPEAT "重复"\r
 #define SURE "确认"\r
 \r
@@ -85,17 +93,29 @@ AlarmSetWeekView::AlarmSetWeekView()
 \r
 AlarmSetWeekView::~AlarmSetWeekView()\r
 {\r
-    group->RemoveAll();\r
-    delete labelRespeat;\r
-    labelRespeat = nullptr;\r
-    delete weekImage;\r
-    weekImage = nullptr;\r
-    for (int16_t alarmNum = 0; alarmNum < 7; alarmNum++) {\r
-        delete buttonWeek[alarmNum];\r
-        buttonWeek[alarmNum] = nullptr;\r
+    if(group)\r
+    {\r
+        group->RemoveAll();\r
+        if(labelRespeat) \r
+        {\r
+            delete labelRespeat;\r
+            labelRespeat = nullptr;\r
+        }\r
+        if(weekImage)\r
+        {\r
+            delete weekImage;\r
+            weekImage = nullptr;\r
+        }\r
+        for (int16_t alarmNum = 0; alarmNum < 7; alarmNum++) {\r
+            if(buttonWeek[alarmNum])\r
+            {\r
+                delete buttonWeek[alarmNum];\r
+                buttonWeek[alarmNum] = nullptr;\r
+            }\r
+        }\r
+        delete group;\r
+        group = nullptr;\r
     }\r
-    delete group;\r
-    group = nullptr;\r
     g_pAlarmSetWeekView = nullptr;\r
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::~AlarmSetWeekView");\r
 }\r
@@ -105,21 +125,27 @@ AlarmSetWeekView *AlarmSetWeekView::GetInstance(void)
     return g_pAlarmSetWeekView;\r
 }\r
 \r
-UILabelButton *AlarmSetWeekView::CreateUILabelButton(const char *buttonText, int16_t x, int16_t y)\r
+UILabelButtonExt *AlarmSetWeekView::CreateUILabelButton(const char *buttonText1,const char *buttonText2, int16_t x, int16_t y)\r
 {\r
-    if (buttonText == nullptr) {\r
+    if (buttonText1 == nullptr || buttonText2 == nullptr) {\r
         return nullptr;\r
     }\r
 \r
-    UILabelButton *labelButton = new UILabelButton();\r
+    UILabelButtonExt *labelButton = new UILabelButtonExt();\r
     if (labelButton == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new labelButton fail");\r
         return nullptr;\r
     }\r
-\r
+    int language = ConfigModel::GetInstance()->GetLanguage();\r
+    if(language == 0)\r
+    {\r
+        labelButton->SetText(buttonText1);\r
+    }\r
+    else\r
+    {\r
+        labelButton->SetText(buttonText2);\r
+    }\r
     labelButton->SetPosition(x, y);\r
-    labelButton->SetText(buttonText);\r
-    labelButton->SetViewId(buttonText);\r
     labelButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
     labelButton->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::PRESSED);\r
     labelButton->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::INACTIVE);\r
@@ -154,7 +180,7 @@ void AlarmSetWeekView::CreateWeekButton1(void)
     int viewPositionX = VIEW_POSITION_X;   // 60 150\r
     UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();\r
 \r
-    buttonWeek[WEEK_SUN] = CreateUILabelButton(SUN, viewPositionX, WEEK_Y1);\r
+    buttonWeek[WEEK_SUN] = CreateUILabelButton(SUN,SUN_EN, viewPositionX, WEEK_Y1);\r
     if (buttonWeek[WEEK_SUN] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonSun fail");\r
         return;\r
@@ -164,7 +190,7 @@ void AlarmSetWeekView::CreateWeekButton1(void)
     buttonWeek[WEEK_SUN]->SetViewId(SUNDAY);\r
     viewPositionX += WEEK_GAP_X;\r
 \r
-    buttonWeek[WEEK_MON] = CreateUILabelButton(MON, viewPositionX, WEEK_Y1);\r
+    buttonWeek[WEEK_MON] = CreateUILabelButton(MON,MON_EN, viewPositionX, WEEK_Y1);\r
     if (buttonWeek[WEEK_MON] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonMon fail");\r
         return;\r
@@ -174,7 +200,7 @@ void AlarmSetWeekView::CreateWeekButton1(void)
     buttonWeek[WEEK_MON]->SetViewId(MONDAY);\r
     viewPositionX += WEEK_GAP_X;\r
 \r
-    buttonWeek[WEEK_TUE] = CreateUILabelButton(TUE, viewPositionX, WEEK_Y1);\r
+    buttonWeek[WEEK_TUE] = CreateUILabelButton(TUE,TUE_EN, viewPositionX, WEEK_Y1);\r
     if (buttonWeek[WEEK_TUE] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonTue fail");\r
         return;\r
@@ -184,7 +210,7 @@ void AlarmSetWeekView::CreateWeekButton1(void)
     buttonWeek[WEEK_TUE]->SetViewId(TUESDAY);\r
     viewPositionX += WEEK_GAP_X;\r
 \r
-    buttonWeek[WEEK_WED] = CreateUILabelButton(WED, viewPositionX, WEEK_Y1);\r
+    buttonWeek[WEEK_WED] = CreateUILabelButton(WED,WED_EN, viewPositionX, WEEK_Y1);\r
     if (buttonWeek[WEEK_WED] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonWed fail");\r
         return;\r
@@ -199,7 +225,7 @@ void AlarmSetWeekView::CreateWeekButton2(void)
     int viewPositionX2 = VIEW_POSITION_X2; // 12 210\r
     UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();\r
 \r
-    buttonWeek[WEEK_THUR] = CreateUILabelButton(THUR, viewPositionX2, WEEK_Y2);\r
+    buttonWeek[WEEK_THUR] = CreateUILabelButton(THUR,THUR_EN, viewPositionX2, WEEK_Y2);\r
     if (buttonWeek[WEEK_THUR] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonThur fail");\r
         return;\r
@@ -209,7 +235,7 @@ void AlarmSetWeekView::CreateWeekButton2(void)
     buttonWeek[WEEK_THUR]->SetViewId(THURSDAY);\r
     viewPositionX2 += WEEK_GAP_X;\r
 \r
-    buttonWeek[WEEK_FRI] = CreateUILabelButton(FRI, viewPositionX2, WEEK_Y2);\r
+    buttonWeek[WEEK_FRI] = CreateUILabelButton(FRI,FRI_EN, viewPositionX2, WEEK_Y2);\r
     if (buttonWeek[WEEK_FRI] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonFri fail");\r
         return;\r
@@ -219,7 +245,7 @@ void AlarmSetWeekView::CreateWeekButton2(void)
     buttonWeek[WEEK_FRI]->SetViewId(FRIDAY);\r
     viewPositionX2 += WEEK_GAP_X;\r
 \r
-    buttonWeek[WEEK_SAT] = CreateUILabelButton(SAT, viewPositionX2, WEEK_Y2);\r
+    buttonWeek[WEEK_SAT] = CreateUILabelButton(SAT,SAT_EN, viewPositionX2, WEEK_Y2);\r
     if (buttonWeek[WEEK_SAT] == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new buttonSat fail");\r
         return;\r
@@ -246,74 +272,59 @@ void AlarmSetWeekView::SetLabelButton(void)
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new clickListener fail");\r
         return;\r
     }\r
-    weekImage = new UILabelButton();\r
+    weekImage = new UILabelButtonExt();\r
     if (weekImage == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmConfigView:: new weekImage fail");\r
         return;\r
     }\r
-    // weekImage->SetPosition(TIME_LABEL_BUTTON_X, TIME_LABEL_BUTTON_Y, BUTTON_WIDHT3, BUTTON_HEIGHT3);\r
-    // weekImage->SetText(SURE);\r
-    // weekImage->SetTouchable(true);\r
-    // weekImage->SetViewId(ALARM_WEEK_OK);\r
-    // weekImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, LABEL_WEEK_FONT);\r
-\r
     weekImage->SetPosition(0, 366, 466, 100);\r
     weekImage->SetViewId(ALARM_WEEK_OK);\r
-    weekImage->SetText(SURE);\r
+    weekImage->SetTextId(STR_OK);//确定\r
     weekImage->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
     weekImage->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));\r
     weekImage->SetImageSrc(PNG_BUTTON_466x100_IMAGE, PNG_BUTTON_466x100_IMAGE);\r
     weekImage->SetStyleForState(STYLE_BACKGROUND_COLOR, 0x00, UIButton::PRESSED);\r
     weekImage->SetTouchable(true);\r
-\r
-    if (OHOS::AlarmPresenter::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView:: new ShadowBlue fail");\r
-        return;\r
-    }\r
-    // weekImage->SetTextColor(OHOS::AlarmPresenter::GetInstance()->ShadowBlue());\r
     weekImage->SetOnClickListener(clickListener);\r
-    // weekImage->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE);\r
     group->Add(weekImage);\r
 }\r
 \r
 UIScrollView *AlarmSetWeekView::InitSetWeekView()\r
 {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::InitSetWeekView");\r
-\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::InitSetWeekView");\r
     group = new UIScrollView();\r
     if (group == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new group fail");\r
         return group;\r
     }\r
-\r
     group->SetPosition(CONTAINER_X, CONTAINER_Y, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    labelRespeat = new UILabel();\r
+    group->SetTouchable(true);\r
+    group->SetDraggable(true);\r
+    UIView::OnDragListener *setWeekDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance();\r
+    if (setWeekDragListener == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new setWeekDragListener fail");\r
+        return group;\r
+    }\r
+    group->SetOnDragListener(setWeekDragListener);\r
+    /* -------------------------------------------------------------------------- */\r
+    labelRespeat = new UILabelExt();\r
     if (labelRespeat == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new labelRespeat fail");\r
         return group;\r
     }\r
-    group->Add(labelRespeat);\r
-    labelRespeat->SetText(RESPEAT);\r
-    // labelRespeat->SetFont(DEFAULT_VECTOR_FONT_FILENAME, DEFAULT_FONT);\r
-    // labelRespeat->SetPosition(TITLE_X, TITLE_Y, HORIZONTAL_RESOLUTION / 2, LABEL_POSITION_SIZE);\r
+    labelRespeat->SetTextId(STR_ALARM_REPEAT);//重复\r
     labelRespeat->SetPosition(83, 50, 300, 35);\r
     labelRespeat->SetStyle(STYLE_TEXT_FONT, 30);\r
     labelRespeat->SetStyle(STYLE_LINE_HEIGHT, 35);\r
     labelRespeat->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
     labelRespeat->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+    group->Add(labelRespeat);\r
 \r
     CreateWeekButton1();\r
     CreateWeekButton2();\r
     SetLabelButton();\r
 \r
-    group->SetTouchable(true);\r
-    group->SetDraggable(true);\r
-    UIView::OnDragListener *setWeekDragListener = (UIView::OnDragListener *)OHOS::AlarmPresenter::GetInstance();\r
-    if (setWeekDragListener == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: new setWeekDragListener fail");\r
-        return group;\r
-    }\r
-    group->SetOnDragListener(setWeekDragListener);\r
+   \r
     return group;\r
 }\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
index 7711d23..6f58e6a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
@@ -476,7 +476,7 @@ void MainAlarmView::OnStart()
     }
     // group->SetPosition(CONTAINER_X, CONTAINER_Y, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);
     group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
-    group->SetScrollBlankSize(50);
+    group->SetScrollBlankSize(75);
     // group->SetMaxScrollDistance(1000); // 1000: max scroll distance
     // group->SetSwipeACCLevel(800);      // 800: compensation distance
     // group->SetDragACCLevel(5);         // 5: drag acceleration
@@ -721,7 +721,7 @@ bool MainAlarmView::ChangeMaxClock(int16_t thisView)
         container[thisView] = maxClockView->InitAlarmMax();
         RootView::GetInstance()->Add(container[thisView]);
     }
-    AlarmMaxClock::GetInstance()->AlarmMaxDelayExit();
+    // AlarmMaxClock::GetInstance()->AlarmMaxDelayExit();
     return true;
 }
 
@@ -755,7 +755,7 @@ void MainAlarmView::DropView(UIView& view)
     } else if (&view == container[CHANGE_INTERFACE_MAXCLOCK]) {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::DropView::container[CHANGE_INTERFACE_MAXCLOCK]");
         ChangeView(CHANGE_INTERFACE_MAXCLOCK, MAIN_INTERFACE);
-        CancelScanHandle();
+        // CancelScanHandle();
     } else if (&view == container[MAIN_INTERFACE]) {
         // uint16_t preSlice = AlarmClockModel::GetInstance()->JudgePreSlice();
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::DropView::container[MAIN_INTERFACE]");