倒计时配置多国语言

diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
index d9284b7..4c32e7d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
@@ -272,7 +272,7 @@ namespace OHOS
         {\r
             StopWatchModel::GetInstance()->StopWatch_PauseTimer(); // 暂停定时器\r
             m_button->SetViewId(ResetOrMarkButton_RESET2_VIEWID);\r
-            m_button->SetImageSrc(ResetOrMarkButtonImg_Reset2, nullptr);\r
+            m_button->SetImageSrc(ResetOrMarkButtonImg_Reset2, ResetOrMarkButtonImg_Reset2);\r
             m_button->Invalidate();\r
         }\r
         return true;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp
index 165ae02..cfac70d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchView.cpp
@@ -30,78 +30,83 @@ namespace OHOS
 \r
     void MainStopWatchView::ClearAll()\r
     {\r
-        group->RemoveAll();\r
-        scrollView[MAIN_STOPWATCH]->RemoveAll();\r
-\r
-        if (stopWatchlabel != nullptr)\r
+        if (group != nullptr)\r
         {\r
-            delete stopWatchlabel;\r
-            stopWatchlabel = nullptr;\r
-        }\r
+            group->RemoveAll();\r
+            scrollView[MAIN_STOPWATCH]->RemoveAll();\r
 \r
-        if (showTimelabel != nullptr)\r
-        {\r
-            delete showTimelabel;\r
-            showTimelabel = nullptr;\r
-        }\r
+            if (stopWatchlabel != nullptr)\r
+            {\r
+                delete stopWatchlabel;\r
+                stopWatchlabel = nullptr;\r
+            }\r
 \r
-        if (PlayOrPausecheckBox != nullptr)\r
-        {\r
-            delete PlayOrPausecheckBox;\r
-            PlayOrPausecheckBox = nullptr;\r
-        }\r
+            if (showTimelabel != nullptr)\r
+            {\r
+                delete showTimelabel;\r
+                showTimelabel = nullptr;\r
+            }\r
 \r
-        if (ResetOrMarkbutton != nullptr)\r
-        {\r
-            delete ResetOrMarkbutton;\r
-            ResetOrMarkbutton = nullptr;\r
-        }\r
+            if (PlayOrPausecheckBox != nullptr)\r
+            {\r
+                delete PlayOrPausecheckBox;\r
+                PlayOrPausecheckBox = nullptr;\r
+            }\r
 \r
-        if (LineImage != nullptr)\r
-        {\r
-            delete LineImage;\r
-            LineImage = nullptr;\r
-        }\r
+            if (ResetOrMarkbutton != nullptr)\r
+            {\r
+                delete ResetOrMarkbutton;\r
+                ResetOrMarkbutton = nullptr;\r
+            }\r
 \r
-        if (list != nullptr)\r
-        {\r
-            delete list;\r
-            list = nullptr;\r
-        }\r
+            if (LineImage != nullptr)\r
+            {\r
+                delete LineImage;\r
+                LineImage = nullptr;\r
+            }\r
 \r
-        if (listadapter != nullptr)\r
-        {\r
-            delete listadapter;\r
-            listadapter = nullptr;\r
-        }\r
+            if (list != nullptr)\r
+            {\r
+                delete list;\r
+                list = nullptr;\r
+            }\r
 \r
-        if (listdata != nullptr)\r
-        {\r
-            listdata->Clear();\r
-            delete listdata;\r
-            listdata = nullptr;\r
-        }\r
+            if (listadapter != nullptr)\r
+            {\r
+                delete listadapter;\r
+                listadapter = nullptr;\r
+            }\r
 \r
-        if (scrollView[MAIN_STOPWATCH] != nullptr)\r
-        {\r
-            delete scrollView[MAIN_STOPWATCH];\r
-            scrollView[MAIN_STOPWATCH] = nullptr;\r
-        }\r
+            if (listdata != nullptr)\r
+            {\r
+                listdata->Clear();\r
+                delete listdata;\r
+                listdata = nullptr;\r
+            }\r
 \r
-        if (p_StopWatchRecordCycleToLimitView != nullptr)\r
-        {\r
-            delete p_StopWatchRecordCycleToLimitView;\r
-            p_StopWatchRecordCycleToLimitView = nullptr;\r
-        }\r
+            if (scrollView[MAIN_STOPWATCH] != nullptr)\r
+            {\r
+                delete scrollView[MAIN_STOPWATCH];\r
+                scrollView[MAIN_STOPWATCH] = nullptr;\r
+            }\r
 \r
-        if (p_StopWatchRecordTimeToLimitView != nullptr)\r
-        {\r
-            delete p_StopWatchRecordTimeToLimitView;\r
-            p_StopWatchRecordTimeToLimitView = nullptr;\r
-        }\r
+            if (p_StopWatchRecordCycleToLimitView != nullptr)\r
+            {\r
+                delete p_StopWatchRecordCycleToLimitView;\r
+                p_StopWatchRecordCycleToLimitView = nullptr;\r
+            }\r
+\r
+            if (p_StopWatchRecordTimeToLimitView != nullptr)\r
+            {\r
+                delete p_StopWatchRecordTimeToLimitView;\r
+                p_StopWatchRecordTimeToLimitView = nullptr;\r
+            }\r
+\r
+            for (int i = MAIN_STOPWATCH; i < STOPWATCH_MAXVIEWID; i++)\r
+            {\r
+                scrollView[MAIN_STOPWATCH] = nullptr;\r
+            }\r
 \r
-        if (group != nullptr)\r
-        {\r
             delete group;\r
             group = nullptr;\r
         }\r
@@ -251,13 +256,13 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "stopWatchlabel new fail!!");\r
                 return;\r
             }\r
-            stopWatchlabel->SetPosition(83, 52, 300, 40);\r
+            stopWatchlabel->SetPosition(83, 50, 300, 35);\r
             stopWatchlabel->SetStyle(STYLE_TEXT_FONT, 30);\r
             stopWatchlabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-            stopWatchlabel->SetText("秒表");\r
-            stopWatchlabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+            stopWatchlabel->SetTextId(STR_STOPWATCH); // 秒表\r
+            stopWatchlabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             stopWatchlabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            stopWatchlabel->SetRollSpeed(40);\r
+            stopWatchlabel->SetRollSpeed(70);\r
             stopWatchlabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             stopWatchlabel->SetVisible(true);\r
             /* ------------------------------ showTimelabel ----------------------------- */\r
@@ -295,6 +300,11 @@ namespace OHOS
             list->SetPosition(56, 170, 360, 100);\r
             list->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);\r
             list->SetReboundSize(30);\r
+            list->SetThrowDrag(true);\r
+            list->SetIntercept(true);\r
+            list->SetMaxScrollDistance(1000);\r
+            list->SetDragACCLevel(5);\r
+            list->SetSwipeACCLevel(800); /*设置手指抬起屏幕后的补偿距离。*/\r
             list->SetVisible(false);\r
             /* ------------------------------- listadapter ------------------------------ */\r
             listadapter = new TextAdapter();\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchModel.cpp
index 3b64f18..d7276cf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchModel.cpp
@@ -82,7 +82,7 @@ namespace OHOS
     static void StopWatch_TimerCallbackProc(int data)\r
     {\r
         g_StopWatchTimes += 10; // 每次回调增加10毫秒\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "g_StopWatchTimes:%d\n", g_StopWatchTimes);\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_StopWatchTimes:%d\n", g_StopWatchTimes);\r
 \r
         if (MainStopWatchView::GetInstance() == nullptr)\r
         {\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordCycleToLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordCycleToLimitView.cpp
index feca45e..276d7f9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordCycleToLimitView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordCycleToLimitView.cpp
@@ -1,6 +1,7 @@
 #include "stopwatch/include/StopWatchRecordCycleToLimitView.h"\r
 #include "stopwatch/include/MainStopWatchPresenter.h"\r
 #include "UiConfig.h"\r
+#include "wearable_log.h"\r
 /*弹窗视图：到达最高圈数99时弹出*/\r
 namespace OHOS\r
 {\r
@@ -9,19 +10,19 @@ namespace OHOS
 \r
     StopWatchRecordCycleToLimitView::StopWatchRecordCycleToLimitView()\r
     {\r
-\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StopWatchRecordCycleToLimitView::StopWatchRecordCycleToLimitView");\r
         g_pStopWatchRecordCycleToLimitView = this;\r
     }\r
 \r
     StopWatchRecordCycleToLimitView::~StopWatchRecordCycleToLimitView()\r
     {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StopWatchRecordCycleToLimitView::~StopWatchRecordCycleToLimitView");\r
         ClearAll();\r
         g_pStopWatchRecordCycleToLimitView = nullptr;\r
     }\r
 \r
     StopWatchRecordCycleToLimitView *StopWatchRecordCycleToLimitView::GetInstance()\r
     {\r
-\r
         return g_pStopWatchRecordCycleToLimitView;\r
     }\r
     // 初始化秒表到达最高圈数时弹出的视图\r
@@ -37,19 +38,29 @@ namespace OHOS
             if (Title == nullptr)\r
             {\r
                 Title = new UILabelExt();\r
+                if (Title == nullptr)\r
+                {\r
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail");\r
+                    return nullptr;\r
+                }\r
             }\r
-            Title->SetPosition(83, 52, 300, 40);\r
+            Title->SetPosition(83, 50, 300, 35);\r
             Title->SetStyle(STYLE_TEXT_FONT, 30);\r
             Title->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-            Title->SetText("秒表");\r
-            Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+            Title->SetTextId(STR_STOPWATCH); // 秒表\r
+            Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            Title->SetRollSpeed(40);\r
+            Title->SetRollSpeed(70);\r
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             if (AttentionImage == nullptr)\r
             {\r
                 AttentionImage = new UIImageView();\r
+                if (AttentionImage == nullptr)\r
+                {\r
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AttentionImage new fail");\r
+                    return nullptr;\r
+                }\r
             }\r
             AttentionImage->SetPosition(193, 121, 100, 100);\r
             AttentionImage->SetStyle(STYLE_BORDER_RADIUS, 100);\r
@@ -58,29 +69,44 @@ namespace OHOS
             if (AttentionLabel == nullptr)\r
             {\r
                 AttentionLabel = new UILabelExt();\r
+                if (AttentionLabel == nullptr)\r
+                {\r
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AttentionLabel new fail");\r
+                    return nullptr;\r
+                }\r
             }\r
-            AttentionLabel->SetPosition(83, 253, 300, 40);\r
+            AttentionLabel->SetPosition(83, 253, 300, 35);\r
             AttentionLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
             AttentionLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-            AttentionLabel->SetText("当前已达到了最高圈数");\r
-            AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+            AttentionLabel->SetTextId(STR_TMCHBR); // 当前已达到了最高计数\r
+            AttentionLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             AttentionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
             AttentionLabel->SetTextColor(Color::GetColorFromRGBA(0xaa, 0xaa, 0xaa, 0xff));\r
-            AttentionLabel->SetRollSpeed(40);\r
+            AttentionLabel->SetRollSpeed(70);\r
             AttentionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             if (button == nullptr)\r
             {\r
                 button = new UILabelButtonExt();\r
+                if (button == nullptr)\r
+                {\r
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "button new fail");\r
+                    return nullptr;\r
+                }\r
             }\r
             button->SetPosition(0, 366, 466, 100);\r
             button->SetViewId(CycleToLimitReturnButton_VIEWID);\r
             button->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE);\r
-            button->SetText("知道了");\r
+            button->SetTextId(STR_KONW);\r
             button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             button->SetStyle(STYLE_LINE_HEIGHT, 35);\r
             button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED);\r
             UIView::OnClickListener *buttonClick = static_cast<UIView::OnClickListener *>(MainStopWatchPresenter::GetInstance());\r
+            if (buttonClick == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "buttonClick new fail");\r
+                return nullptr;\r
+            }\r
             button->SetOnClickListener(buttonClick);\r
             /* ----------------------------------- Add ---------------------------------- */\r
             scrollView->Add(Title);\r
@@ -93,30 +119,29 @@ namespace OHOS
 \r
     void StopWatchRecordCycleToLimitView::ClearAll()\r
     {\r
-        scrollView->RemoveAll();\r
-\r
-        if (Title != nullptr)\r
-        {\r
-            delete Title;\r
-            Title = nullptr;\r
-        }\r
-        if (AttentionImage != nullptr)\r
-        {\r
-            delete AttentionImage;\r
-            AttentionImage = nullptr;\r
-        }\r
-        if (AttentionLabel != nullptr)\r
-        {\r
-            delete AttentionLabel;\r
-            AttentionLabel = nullptr;\r
-        }\r
-        if (button != nullptr)\r
-        {\r
-            delete button;\r
-            button = nullptr;\r
-        }\r
         if (scrollView != nullptr)\r
         {\r
+            scrollView->RemoveAll();\r
+            if (Title != nullptr)\r
+            {\r
+                delete Title;\r
+                Title = nullptr;\r
+            }\r
+            if (AttentionImage != nullptr)\r
+            {\r
+                delete AttentionImage;\r
+                AttentionImage = nullptr;\r
+            }\r
+            if (AttentionLabel != nullptr)\r
+            {\r
+                delete AttentionLabel;\r
+                AttentionLabel = nullptr;\r
+            }\r
+            if (button != nullptr)\r
+            {\r
+                delete button;\r
+                button = nullptr;\r
+            }\r
             delete scrollView;\r
             scrollView = nullptr;\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp
index 241bd2c..8df7a03 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp
@@ -1,7 +1,7 @@
 #include "stopwatch/include/StopWatchRecordTimeToLimitView.h"\r
 #include "stopwatch/include/MainStopWatchPresenter.h"\r
 #include "UiConfig.h"\r
-\r
+#include "wearable_log.h"\r
 /*弹窗视图：到达最高时间99：59.99时弹出*/\r
 namespace OHOS\r
 {\r
@@ -10,11 +10,13 @@ namespace OHOS
 \r
     StopWatchRecordTimeToLimitView::StopWatchRecordTimeToLimitView()\r
     {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StopWatchRecordTimeToLimitView::StopWatchRecordTimeToLimitView");\r
         g_pStopWatchRecordTimeToLimitView = this;\r
     }\r
 \r
     StopWatchRecordTimeToLimitView::~StopWatchRecordTimeToLimitView()\r
     {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StopWatchRecordTimeToLimitView::~StopWatchRecordTimeToLimitView");\r
         ClearAll();\r
         g_pStopWatchRecordTimeToLimitView = nullptr;\r
     }\r
@@ -36,19 +38,29 @@ namespace OHOS
             if (Title == nullptr)\r
             {\r
                 Title = new UILabelExt();\r
+                if (Title == nullptr)\r
+                {\r
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Title new fail");\r
+                    return nullptr;\r
+                }\r
             }\r
-            Title->SetPosition(83, 52, 300, 40);\r
+            Title->SetPosition(83, 50, 300, 35);\r
             Title->SetStyle(STYLE_TEXT_FONT, 30);\r
             Title->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-            Title->SetText("秒表");\r
-            Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+            Title->SetTextId(STR_STOPWATCH); // 秒表\r
+            Title->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-            Title->SetRollSpeed(40);\r
+            Title->SetRollSpeed(70);\r
             Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             if (AttentionImage == nullptr)\r
             {\r
                 AttentionImage = new UIImageView();\r
+                if (AttentionImage == nullptr)\r
+                {\r
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AttentionImage new fail");\r
+                    return nullptr;\r
+                }\r
             }\r
             AttentionImage->SetPosition(193, 121, 100, 100);\r
             AttentionImage->SetStyle(STYLE_BORDER_RADIUS, 100);\r
@@ -57,43 +69,63 @@ namespace OHOS
             if (AttentionLabel_1 == nullptr)\r
             {\r
                 AttentionLabel_1 = new UILabelExt();\r
+                if (AttentionLabel_1 == nullptr)\r
+                {\r
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AttentionLabel_1 new fail");\r
+                    return nullptr;\r
+                }\r
             }\r
-            AttentionLabel_1->SetPosition(83, 235, 300, 40);\r
+            AttentionLabel_1->SetPosition(83, 235, 300, 35);\r
             AttentionLabel_1->SetStyle(STYLE_TEXT_FONT, 30);\r
             AttentionLabel_1->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-            AttentionLabel_1->SetText("当前已达到了最长时间");\r
-            AttentionLabel_1->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+            AttentionLabel_1->SetTextId(STR_MAXIMUM_TIME_REACH_NOTE); // 当前已达到了最长时间\r
+            AttentionLabel_1->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             AttentionLabel_1->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
             AttentionLabel_1->SetTextColor(Color::GetColorFromRGBA(0xaa, 0xaa, 0xaa, 0xff));\r
-            AttentionLabel_1->SetRollSpeed(40);\r
+            AttentionLabel_1->SetRollSpeed(70);\r
             AttentionLabel_1->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* ---------------------------- AttentionLabel_2 ---------------------------- */\r
             if (AttentionLabel_2 == nullptr)\r
             {\r
                 AttentionLabel_2 = new UILabelExt();\r
+                if (AttentionLabel_2 == nullptr)\r
+                {\r
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AttentionLabel_2 new fail");\r
+                    return nullptr;\r
+                }\r
             }\r
-            AttentionLabel_2->SetPosition(33, 279, 400, 40);\r
+            AttentionLabel_2->SetPosition(53, 279, 360, 35);\r
             AttentionLabel_2->SetStyle(STYLE_TEXT_FONT, 30);\r
             AttentionLabel_2->SetStyle(STYLE_LINE_HEIGHT, 35);\r
-            AttentionLabel_2->SetText("表秒自动暂停，请重新开始");\r
-            AttentionLabel_2->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);\r
+            AttentionLabel_2->SetTextId(STR_STOPWATCH_STOP_NOTE); // 秒表自动暂停，请重新开始\r
+            AttentionLabel_2->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
             AttentionLabel_2->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
             AttentionLabel_2->SetTextColor(Color::GetColorFromRGBA(0xaa, 0xaa, 0xaa, 0xff));\r
-            AttentionLabel_2->SetRollSpeed(40);\r
+            AttentionLabel_2->SetRollSpeed(70);\r
             AttentionLabel_2->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             /* -------------------------------------------------------------------------- */\r
             if (button == nullptr)\r
             {\r
                 button = new UILabelButtonExt();\r
+                if (button == nullptr)\r
+                {\r
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "button new fail");\r
+                    return nullptr;\r
+                }\r
             }\r
             button->SetPosition(0, 366, 466, 100);\r
             button->SetViewId(TimeToLimitReturnButton_VIEWID);\r
             button->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE);\r
-            button->SetText("知道了");\r
+            button->SetTextId(STR_KONW);\r
             button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
             button->SetStyle(STYLE_LINE_HEIGHT, 35);\r
             button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED);\r
             UIView::OnClickListener *buttonClick = static_cast<UIView::OnClickListener *>(MainStopWatchPresenter::GetInstance());\r
+            if (buttonClick == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "buttonClick new fail");\r
+                return nullptr;\r
+            }\r
             button->SetOnClickListener(buttonClick);\r
             /* ----------------------------------- Add ---------------------------------- */\r
             scrollView->Add(Title);\r
@@ -107,29 +139,30 @@ namespace OHOS
 \r
     void StopWatchRecordTimeToLimitView::ClearAll()\r
     {\r
-        scrollView->RemoveAll();\r
-        if (Title != nullptr)\r
-        {\r
-            delete Title;\r
-            Title = nullptr;\r
-        }\r
-        if (AttentionImage != nullptr)\r
-        {\r
-            delete AttentionImage;\r
-            AttentionImage = nullptr;\r
-        }\r
-        if (AttentionLabel_1 != nullptr)\r
-        {\r
-            delete AttentionLabel_1;\r
-            AttentionLabel_1 = nullptr;\r
-        }\r
-        if (button != nullptr)\r
-        {\r
-            delete button;\r
-            button = nullptr;\r
-        }\r
         if (scrollView != nullptr)\r
         {\r
+            scrollView->RemoveAll();\r
+            if (Title != nullptr)\r
+            {\r
+                delete Title;\r
+                Title = nullptr;\r
+            }\r
+            if (AttentionImage != nullptr)\r
+            {\r
+                delete AttentionImage;\r
+                AttentionImage = nullptr;\r
+            }\r
+            if (AttentionLabel_1 != nullptr)\r
+            {\r
+                delete AttentionLabel_1;\r
+                AttentionLabel_1 = nullptr;\r
+            }\r
+            if (button != nullptr)\r
+            {\r
+                delete button;\r
+                button = nullptr;\r
+            }\r
+\r
             delete scrollView;\r
             scrollView = nullptr;\r
         }\r