添加Homepage

diff --git a/code/sdk/application/wearable/nativeapp/CMakeLists.txt b/code/sdk/application/wearable/nativeapp/CMakeLists.txt
index 677cb5e..4f1e9c3 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/CMakeLists.txt
+++ b/code/sdk/application/wearable/nativeapp/CMakeLists.txt
@@ -244,7 +244,7 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/dial/src/DialView.cpp\r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/dial/src/DialPresenter.cpp\r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/dial/src/Digital_clockView.cpp\r
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/dial/src/Digital_clockPresenter.cpp\r
+\r
 \r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartRemindView.cpp\r
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heartrate/src/HeartRemindPresenter.cpp\r

diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
index 9d1fade..af94125 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
@@ -55,7 +55,7 @@ public:
     void InitBloodErrorSlice(void);\r
     void InitBloodNoteSlice(void);\r
        void InitDialSlice(void);\r
-    void InitDigitalSlice(void);\r
+\r
     void InitHeartRemindSlice(void);\r
        void InitPhoneSlice(void);\r
        void InitPhoneCallSlice(void);\r

diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
index 626b507..629e195 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
@@ -99,8 +99,7 @@
 #include "blood/include/BloodNotePresenter.h"\r
 #include "dial/include/DialPresenter.h"\r
 #include "dial/include/DialView.h"\r
-#include "dial/include/Digital_clockPresenter.h"\r
-#include "dial/include/Digital_clockView.h"\r
+\r
 #include "heartrate/include/HeartRemindPresenter.h"\r
 #include "heartrate/include/HeartRemindView.h"\r
 #include "traing/include/TraingPresenter.h"\r
@@ -292,7 +291,7 @@ static const AppViewMapper SLICE_MAPPER[] = {
     {VIEW_BLOODERROR, &NativeLauncher::InitBloodErrorSlice},\r
     {VIEW_BLOODNOTE, &NativeLauncher::InitBloodNoteSlice},     \r
        {VIEW_DIAL, &NativeLauncher::InitDialSlice},                                //表盘\r
-    {VIEW_DIGITAL,&NativeLauncher::InitDigitalSlice},\r
+ \r
     {VIEW_HEARTRATEREMIND, &NativeLauncher::InitHeartRemindSlice}, \r
 \r
     {VIEW_TRAINING, &NativeLauncher::InitTraingSlice},                          //训练\r
@@ -891,17 +890,7 @@ void NativeLauncher::InitDialSlice(void)
     }\r
     NativeAbility::GetInstance().AddSliceProxy(VIEW_DIAL, dialview);\r
 }\r
-void NativeLauncher::InitDigitalSlice(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitBloodSlice");\r
-    SliceProxy *digital_clockview = new AbilitySliceProxy<Digital_clockView, Digital_clockPresenter>;\r
-    if (digital_clockview == nullptr)\r
-    {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "digital_clockview");\r
-        return;\r
-    }\r
-    NativeAbility::GetInstance().AddSliceProxy(VIEW_DIGITAL, digital_clockview);\r
-}\r
+\r
 \r
 void NativeLauncher::InitHeartRemindSlice(void)\r
 {\r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/clock/src/MainClockView.cpp
index 73632db..c93c7ee 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/clock/src/MainClockView.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/clock/src/MainClockView.cpp
@@ -13,103 +13,106 @@
 #include "common/image_cache_manager.h"\r
 #include <time.h>\r
 \r
-namespace OHOS {\r
-static MainClockView *g_pMainClockView = nullptr;\r
-\r
-static constexpr uint16_t FONT_DEFAULT_SIZE = 25;\r
-static constexpr uint16_t FONT_TEXT_SIZE = 24;\r
-static constexpr uint16_t STEP_LABEL_X = 100;\r
-static constexpr uint16_t STEP_LABEL_Y = 230;\r
-static constexpr uint16_t BATTERYP_LABEL_X = 315;\r
-static constexpr uint16_t BATTERYP_LABEL_Y = 230;\r
-static constexpr uint16_t TEXT_WIDTH = 60;\r
-static constexpr uint16_t TEXT_HEIGHT = 35;\r
-static constexpr uint16_t POINT_POSITION_X = 202;\r
-static constexpr uint16_t POINT_POSITION_Y = 16;\r
-static constexpr uint16_t SECOND_POINT_POSITION_Y = 16;\r
-static constexpr uint16_t POINT_CENTER_X = 25;\r
-static constexpr uint16_t POINT_CENTER_Y = 211;\r
-static constexpr uint16_t STEP_CHAR_NUM = 255;\r
-static constexpr int16_t STEP_LABLE_WIDTH = 75;\r
-static constexpr int16_t STEP_LABLE_SIZE = 35;\r
-static constexpr uint16_t WEEKLABEL_POSITION_X = 247;\r
-static constexpr uint16_t WEEKLABEL_POSITION_Y = 122;\r
-static constexpr uint16_t HEARTRATELABEL_POSITION_X = 198;\r
-static constexpr uint16_t HEARTRATELABEL_POSITION_Y = 330;\r
-static constexpr uint16_t HEARTRATE_POSITION_X = 156;\r
-static constexpr uint16_t HEARTRATE_POSITION_Y = 260;\r
-static constexpr uint16_t PROGRESS_POSITION_X = 53;\r
-static constexpr uint16_t PROGRESS_POSITION_Y = 54;\r
-static constexpr uint16_t BIGCIRCLE_POSITION_X = 202;\r
-static constexpr uint16_t BIGCIRCLE_POSITION_Y = 202;\r
-static constexpr uint16_t MEDCIRCLE_POSITION_X = 202;\r
-static constexpr uint16_t MEDCIRCLE_POSITION_Y = 202;\r
-static constexpr uint16_t SMALLCIRCLE_POSITION_X = 202;\r
-static constexpr uint16_t SMALLCIRCLE_POSITION_Y = 202;\r
-static constexpr uint16_t WEEKDAY_POSITION_X = 193;\r
-static constexpr uint16_t WEEKDAY_POSITION_Y = 127;\r
-\r
-MainClockView::MainClockView()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainClockView::MainClockView");\r
-    SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-    g_pMainClockView = this;\r
-}\r
-\r
-MainClockView::~MainClockView()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainClockView::~MainClockView");\r
-    if (clockAnimator != nullptr) {\r
-        clockAnimator->Stop();\r
-        delete clockAnimator;\r
-        clockAnimator = nullptr;\r
-    }\r
-    mainSweepClock->RemoveAll();\r
-    delete curFace;\r
-    curFace = nullptr;\r
-    delete stepLabel;\r
-    stepLabel = nullptr;\r
-    delete batteryLabel;\r
-    batteryLabel = nullptr;\r
-    delete callBack;\r
-    callBack = nullptr;\r
-    delete secondHand;\r
-    secondHand = nullptr;\r
-    delete minuteHand;\r
-    minuteHand = nullptr;\r
-    delete hourHand;\r
-    hourHand = nullptr;\r
-    delete weekLabel;\r
-    weekLabel = nullptr;\r
-    delete heartRateLabel;\r
-    heartRateLabel = nullptr;\r
-    delete heartRate;\r
-    heartRate = nullptr;\r
-    delete hand24Hour;\r
-    hand24Hour = nullptr;\r
-    delete weekDay;\r
-    weekDay = nullptr;\r
-    delete progress;\r
-    progress = nullptr;\r
-    delete bigCircle;\r
-    bigCircle = nullptr;\r
-    delete medCircle;\r
-    medCircle = nullptr;\r
-    delete smallCircle;\r
-    smallCircle = nullptr;\r
-    Remove(mainSweepClock);\r
-    delete mainSweepClock;\r
-    mainSweepClock = nullptr;\r
-    g_pMainClockView = nullptr;\r
-}\r
-\r
-MainClockView *MainClockView::GetInstance(void)\r
-{\r
-    return g_pMainClockView;\r
-}\r
-\r
-void MainClockView::InitStepValue()\r
+namespace OHOS\r
 {\r
+    static MainClockView *g_pMainClockView = nullptr;\r
+\r
+    static constexpr uint16_t FONT_DEFAULT_SIZE = 25;\r
+    static constexpr uint16_t FONT_TEXT_SIZE = 24;\r
+    static constexpr uint16_t STEP_LABEL_X = 100;\r
+    static constexpr uint16_t STEP_LABEL_Y = 230;\r
+    static constexpr uint16_t BATTERYP_LABEL_X = 315;\r
+    static constexpr uint16_t BATTERYP_LABEL_Y = 230;\r
+    static constexpr uint16_t TEXT_WIDTH = 60;\r
+    static constexpr uint16_t TEXT_HEIGHT = 35;\r
+    static constexpr uint16_t POINT_POSITION_X = 202;\r
+    static constexpr uint16_t POINT_POSITION_Y = 16;\r
+    static constexpr uint16_t SECOND_POINT_POSITION_Y = 16;\r
+    static constexpr uint16_t POINT_CENTER_X = 25;\r
+    static constexpr uint16_t POINT_CENTER_Y = 211;\r
+    static constexpr uint16_t STEP_CHAR_NUM = 255;\r
+    static constexpr int16_t STEP_LABLE_WIDTH = 75;\r
+    static constexpr int16_t STEP_LABLE_SIZE = 35;\r
+    static constexpr uint16_t WEEKLABEL_POSITION_X = 247;\r
+    static constexpr uint16_t WEEKLABEL_POSITION_Y = 122;\r
+    static constexpr uint16_t HEARTRATELABEL_POSITION_X = 198;\r
+    static constexpr uint16_t HEARTRATELABEL_POSITION_Y = 330;\r
+    static constexpr uint16_t HEARTRATE_POSITION_X = 156;\r
+    static constexpr uint16_t HEARTRATE_POSITION_Y = 260;\r
+    static constexpr uint16_t PROGRESS_POSITION_X = 53;\r
+    static constexpr uint16_t PROGRESS_POSITION_Y = 54;\r
+    static constexpr uint16_t BIGCIRCLE_POSITION_X = 202;\r
+    static constexpr uint16_t BIGCIRCLE_POSITION_Y = 202;\r
+    static constexpr uint16_t MEDCIRCLE_POSITION_X = 202;\r
+    static constexpr uint16_t MEDCIRCLE_POSITION_Y = 202;\r
+    static constexpr uint16_t SMALLCIRCLE_POSITION_X = 202;\r
+    static constexpr uint16_t SMALLCIRCLE_POSITION_Y = 202;\r
+    static constexpr uint16_t WEEKDAY_POSITION_X = 193;\r
+    static constexpr uint16_t WEEKDAY_POSITION_Y = 127;\r
+\r
+    MainClockView::MainClockView()\r
+    {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainClockView::MainClockView");\r
+        SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
+        g_pMainClockView = this;\r
+    }\r
+\r
+    MainClockView::~MainClockView()\r
+    {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainClockView::~MainClockView");\r
+        if (clockAnimator != nullptr)\r
+        {\r
+            clockAnimator->Stop();\r
+            delete clockAnimator;\r
+            clockAnimator = nullptr;\r
+        }\r
+        mainSweepClock->RemoveAll();\r
+        delete curFace;\r
+        curFace = nullptr;\r
+        delete stepLabel;\r
+        stepLabel = nullptr;\r
+        delete batteryLabel;\r
+        batteryLabel = nullptr;\r
+        delete callBack;\r
+        callBack = nullptr;\r
+        delete secondHand;\r
+        secondHand = nullptr;\r
+        delete minuteHand;\r
+        minuteHand = nullptr;\r
+        delete hourHand;\r
+        hourHand = nullptr;\r
+        delete weekLabel;\r
+        weekLabel = nullptr;\r
+        delete heartRateLabel;\r
+        heartRateLabel = nullptr;\r
+        delete heartRate;\r
+        heartRate = nullptr;\r
+        delete hand24Hour;\r
+        hand24Hour = nullptr;\r
+        delete weekDay;\r
+        weekDay = nullptr;\r
+        delete progress;\r
+        progress = nullptr;\r
+        delete bigCircle;\r
+        bigCircle = nullptr;\r
+        delete medCircle;\r
+        medCircle = nullptr;\r
+        delete smallCircle;\r
+        smallCircle = nullptr;\r
+        Remove(mainSweepClock);\r
+        delete mainSweepClock;\r
+        mainSweepClock = nullptr;\r
+        g_pMainClockView = nullptr;\r
+    }\r
+\r
+    MainClockView *MainClockView::GetInstance(void)\r
+    {\r
+        return g_pMainClockView;\r
+    }\r
+\r
+    void MainClockView::InitStepValue()\r
+    {\r
+#if 0\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainClockView::InitStepValue");\r
     uint32_t stepValue;\r
     int weekToday = ActivityModel::GetInstance()->GetWeekToday();\r
@@ -127,356 +130,387 @@ void MainClockView::InitStepValue()
     stepLabel->SetStyleForState(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT, UIButton::RELEASED);\r
     stepLabel->SetStyleForState(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT, UIButton::PRESSED);\r
     stepLabel->SetStyleForState(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT, UIButton::INACTIVE);\r
-}\r
-\r
-bool MainClockView::InitLabelView(void)\r
-{\r
-    //UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::MainPresenterSample::GetInstance();\r
-    // 创建长按事件监听器对象\r
-    //UIView::OnLongPressListener* longPressListener = (UIView::OnLongPressListener*)OHOS::MainPresenterSample::GetInstance();\r
-\r
-\r
-    stepLabel = new UILabelButton();\r
-    if (stepLabel == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "stepLabel new fail");\r
-        return false;\r
-    }\r
-    stepLabel->SetPosition(STEP_LABEL_X, STEP_LABEL_Y);\r
-    stepLabel->Resize(STEP_LABLE_WIDTH, STEP_LABLE_SIZE);\r
-    stepLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
-    stepLabel->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT);\r
-    stepLabel->SetViewId(MAIN_CLICK_ACTIVITY);\r
-    stepLabel->SetTouchable(true);\r
-    //stepLabel->SetOnClickListener(clickListener);\r
-    //stepLabel->SetOnLongPressListener(longPressListener);\r
-    InitStepValue();\r
-\r
-    batteryLabel = new UILabel();\r
-    if (batteryLabel == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "batteryLabel new fail");\r
-        return false;\r
-    }\r
-    batteryLabel->SetPosition(BATTERYP_LABEL_X, BATTERYP_LABEL_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
-    batteryLabel->SetText("90%");\r
-    batteryLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-    batteryLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
-    batteryLabel->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
-\r
-    heartRateLabel = new UILabel();\r
-    if (heartRateLabel == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateLabel new fail");\r
-        return false;\r
-    }\r
-    heartRateLabel->SetPosition(HEARTRATELABEL_POSITION_X, HEARTRATELABEL_POSITION_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
-    heartRateLabel->SetText("--");\r
-    heartRateLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-    heartRateLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
-    heartRateLabel->SetStyle(STYLE_BACKGROUND_COLOR, OPA_OPAQUE);\r
-\r
-    weekLabel = new UILabel();\r
-    if (weekLabel == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "weekLabel new fail");\r
-        return false;\r
-    }\r
-    weekLabel->SetPosition(WEEKLABEL_POSITION_X, WEEKLABEL_POSITION_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
-    weekLabel->SetText("2");\r
-    weekLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_TEXT_SIZE);\r
-    weekLabel->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
-    return true;\r
-}\r
-\r
-bool MainClockView::InitCenterCircleView(void)\r
-{\r
-    bigCircle = new Image();\r
-    if (bigCircle == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bigCircle new fail");\r
-        return false;\r
-    }\r
-    if (LoadClockImage(bigCircle, CLOCK_BIGCIRCLE_IMAGE_PATH) == false) {\r
-        return false;\r
-    }\r
-\r
-    medCircle = new Image();\r
-    if (medCircle == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "medCircle new fail");\r
-        return false;\r
-    }\r
-    if (LoadClockImage(medCircle, CLOCK_MEDCIRCLE_IMAGE_PATH) == false) {\r
-        return false;\r
-    }\r
-\r
-    smallCircle = new Image();\r
-    if (smallCircle == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "smallCircle new fail");\r
-        return false;\r
-    }\r
-    if (LoadClockImage(smallCircle, CLOCK_CIRCLE_IMAGE_PATH) == false) {\r
-        return false;\r
-    }\r
-    return true;\r
-}\r
-\r
-bool MainClockView::InitHandView(void)\r
-{\r
-    secondHand = new Image();\r
-    if (secondHand == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "secondHand new fail");\r
-        return false;\r
-    }\r
-    if (LoadClockImage(secondHand, CLOCK_SECONDHAND) == false) {\r
-        return false;\r
-    }\r
-\r
-    minuteHand = new Image();\r
-    if (minuteHand == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "minuteHand new fail");\r
-        return false;\r
-    }\r
-    if (LoadClockImage(minuteHand, CLOCK_MINUTEHAND) == false) {\r
-        return false;\r
-    }\r
-    hourHand = new Image();\r
-    if (hourHand == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "hourHand new fail");\r
-        return false;\r
-    }\r
-    if (LoadClockImage(hourHand, CLOCK_HOURHAND) == false) {\r
-        return false;\r
-    }\r
-\r
-    hand24Hour = new Image();\r
-    if (hand24Hour == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "hand24Hour new fail");\r
-        return false;\r
-    }\r
-    if (LoadClockImage(hand24Hour, CLOCK_HAND24HOUR_IMAGE_PATH) == false) {\r
-        return false;\r
-    }\r
-    return true;\r
-}\r
-\r
-bool MainClockView::LoadClockImage(Image *view, uint32_t resId)\r
-{\r
-    std::string file = CLOCK_IAMGES;\r
-    ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file);\r
-    if (image == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadClockImage %x fail", resId);\r
-        return false;\r
-    }\r
-    view->SetSrc(image);\r
-    return true;\r
-}\r
-\r
-bool MainClockView::LoadClockImage(UIImageView *view, uint32_t resId)\r
-{\r
-    std::string file = CLOCK_IAMGES;\r
-    ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file);\r
-    if (image == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadClockImage %x fail", resId);\r
-        return false;\r
+#endif\r
+    }\r
+\r
+    bool MainClockView::InitLabelView(void)\r
+    {\r
+        // UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::MainPresenterSample::GetInstance();\r
+        //  创建长按事件监听器对象\r
+        // UIView::OnLongPressListener* longPressListener = (UIView::OnLongPressListener*)OHOS::MainPresenterSample::GetInstance();\r
+\r
+        stepLabel = new UILabelButton();\r
+        if (stepLabel == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "stepLabel new fail");\r
+            return false;\r
+        }\r
+        stepLabel->SetPosition(STEP_LABEL_X, STEP_LABEL_Y);\r
+        stepLabel->Resize(STEP_LABLE_WIDTH, STEP_LABLE_SIZE);\r
+        stepLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
+        stepLabel->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT);\r
+        stepLabel->SetViewId(MAIN_CLICK_ACTIVITY);\r
+        stepLabel->SetTouchable(true);\r
+        // stepLabel->SetOnClickListener(clickListener);\r
+        // stepLabel->SetOnLongPressListener(longPressListener);\r
+        InitStepValue();\r
+\r
+        batteryLabel = new UILabel();\r
+        if (batteryLabel == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "batteryLabel new fail");\r
+            return false;\r
+        }\r
+        batteryLabel->SetPosition(BATTERYP_LABEL_X, BATTERYP_LABEL_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
+        batteryLabel->SetText("90%");\r
+        batteryLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+        batteryLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
+        batteryLabel->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
+\r
+        heartRateLabel = new UILabel();\r
+        if (heartRateLabel == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateLabel new fail");\r
+            return false;\r
+        }\r
+        heartRateLabel->SetPosition(HEARTRATELABEL_POSITION_X, HEARTRATELABEL_POSITION_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
+        heartRateLabel->SetText("--");\r
+        heartRateLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+        heartRateLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);\r
+        heartRateLabel->SetStyle(STYLE_BACKGROUND_COLOR, OPA_OPAQUE);\r
+\r
+        weekLabel = new UILabel();\r
+        if (weekLabel == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "weekLabel new fail");\r
+            return false;\r
+        }\r
+        weekLabel->SetPosition(WEEKLABEL_POSITION_X, WEEKLABEL_POSITION_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
+        weekLabel->SetText("2");\r
+        weekLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_TEXT_SIZE);\r
+        weekLabel->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);\r
+        return true;\r
+    }\r
+\r
+    bool MainClockView::InitCenterCircleView(void)\r
+    {\r
+#if 0\r
+        bigCircle = new Image();\r
+        if (bigCircle == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bigCircle new fail");\r
+            return false;\r
+        }\r
+        if (LoadClockImage(bigCircle, CLOCK_BIGCIRCLE_IMAGE_PATH) == false)\r
+        {\r
+            return false;\r
+        }\r
+\r
+        medCircle = new Image();\r
+        if (medCircle == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "medCircle new fail");\r
+            return false;\r
+        }\r
+        if (LoadClockImage(medCircle, CLOCK_MEDCIRCLE_IMAGE_PATH) == false)\r
+        {\r
+            return false;\r
+        }\r
+\r
+        smallCircle = new Image();\r
+        if (smallCircle == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "smallCircle new fail");\r
+            return false;\r
+        }\r
+        if (LoadClockImage(smallCircle, CLOCK_CIRCLE_IMAGE_PATH) == false)\r
+        {\r
+            return false;\r
+        }\r
+#endif\r
+        return true;\r
+    }\r
+\r
+    bool MainClockView::InitHandView(void)\r
+    {\r
+#if 1\r
+        secondHand = new Image();\r
+        if (secondHand == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "secondHand new fail");\r
+            return false;\r
+        }\r
+        if (LoadClockImage(secondHand, CLOCK_SECONDHAND) == false)\r
+        {\r
+            return false;\r
+        }\r
+\r
+        minuteHand = new Image();\r
+        if (minuteHand == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "minuteHand new fail");\r
+            return false;\r
+        }\r
+        if (LoadClockImage(minuteHand, CLOCK_MINUTEHAND) == false)\r
+        {\r
+            return false;\r
+        }\r
+        hourHand = new Image();\r
+        if (hourHand == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "hourHand new fail");\r
+            return false;\r
+        }\r
+        if (LoadClockImage(hourHand, CLOCK_HOURHAND) == false)\r
+        {\r
+            return false;\r
+        }\r
+\r
+        hand24Hour = new Image();\r
+        if (hand24Hour == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "hand24Hour new fail");\r
+            return false;\r
+        }\r
+        if (LoadClockImage(hand24Hour, CLOCK_HAND24HOUR_IMAGE_PATH) == false)\r
+        {\r
+            return false;\r
+        }\r
+#endif\r
+        return true;\r
+    }\r
+\r
+    bool MainClockView::LoadClockImage(Image *view, uint32_t resId)\r
+    {\r
+        std::string file = CLOCK_IAMGES;\r
+        ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file);\r
+        if (image == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadClockImage %x fail", resId);\r
+            return false;\r
+        }\r
+        view->SetSrc(image);\r
+        return true;\r
+    }\r
+\r
+    bool MainClockView::LoadClockImage(UIImageView *view, uint32_t resId)\r
+    {\r
+        std::string file = CLOCK_IAMGES;\r
+        ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file);\r
+        if (image == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadClockImage %x fail", resId);\r
+            return false;\r
+        }\r
+        view->SetSrc(image);\r
+        return true;\r
+    }\r
+\r
+    bool MainClockView::InitSweepClock(void)\r
+    {\r
+        curFace = new UIImageView();\r
+        if (curFace == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "curFace new fail");\r
+            return false;\r
+        }\r
+        curFace->SetPosition(0, 0);\r
+\r
+        \r
+        if (LoadClockImage(curFace, CLOCK_MAIN_FACE_IMAGE) == false)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "curFace LoadClockImage CLOCK_MAIN_FACE_IMAGE fail");\r
+            return false;\r
+        }\r
+\r
+#if 0\r
+        if (InitLabelView() == false)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelView() fail");\r
+            return false;\r
+        }\r
+        if (InitCenterCircleView() == false)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitCenterCircleView() fail");\r
+            return false;\r
+        }\r
+        heartRate = new UIImageView();\r
+        if (heartRate == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRate new fail");\r
+            return false;\r
+        }\r
+        heartRate->SetPosition(HEARTRATE_POSITION_X, HEARTRATE_POSITION_Y);\r
+        if (LoadClockImage(heartRate, CLOCK_HEARTRATE_IMAGE_PATH) == false)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRate LoadClockImage CLOCK_HEARTRATE_IMAGE_PATH fail");\r
+            return false;\r
+        }\r
+\r
+        progress = new UIImageView();\r
+        if (progress == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "progress new fail");\r
+            return false;\r
+        }\r
+        progress->SetPosition(PROGRESS_POSITION_X, PROGRESS_POSITION_Y);\r
+        if (LoadClockImage(progress, CLOCK_PROGRESS_IMAGE_PATH) == false)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "progress LoadClockImage CLOCK_PROGRESS_IMAGE_PATH fail");\r
+            return false;\r
+        }\r
+        weekDay = new UIImageView();\r
+        if (weekDay == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "weekDay new fail");\r
+            return false;\r
+        }\r
+        weekDay->SetPosition(WEEKDAY_POSITION_X, WEEKDAY_POSITION_Y);\r
+        if (LoadClockImage(weekDay, CLOCK_THURSDAY_IMAGE_PATH) == false)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "weekDay LoadClockImage CLOCK_THURSDAY_IMAGE_PATH fail");\r
+            return false;\r
+        }\r
+#endif\r
+        InitHandView();\r
+        return true;\r
+    }\r
+\r
+    void MainClockView::PreLoad(void)\r
+    {\r
+        if (!viewiInitStatus)\r
+        {\r
+            InitView();\r
+            viewiInitStatus = true;\r
+        }\r
+    }\r
+\r
+    void MainClockView::UnLoad(void)\r
+    {\r
+        // Main clock view is commonly used page, so we do not release it's resources inner slice.\r
+    }\r
+\r
+    bool MainClockView::InitView(void)\r
+    {\r
+\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainClockView::InitView");\r
+        mainSweepClock = new UISweepClock();\r
+        if (mainSweepClock == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "mainSweepClock new fail");\r
+            return false;\r
+        }\r
+\r
+\r
+        // UIView::OnLongPressListener* longPressListener = (UIView::OnLongPressListener*)OHOS::MainPresenterSample::GetInstance();\r
+        // mainSweepClock->SetOnLongPressListener(longPressListener);\r
+\r
+        if (InitSweepClock() == false)\r
+        {\r
+            return false;\r
+        }\r
+\r
+        mainSweepClock->Add(button1_);\r
+        mainSweepClock->Add(curFace);\r
+        /*\r
+            mainSweepClock->Add(stepLabel);\r
+            mainSweepClock->Add(heartRate);\r
+            mainSweepClock->Add(weekLabel);\r
+            mainSweepClock->Add(heartRateLabel);\r
+            mainSweepClock->Add(weekDay);\r
+            mainSweepClock->Add(progress);\r
+            mainSweepClock->Add(batteryLabel);\r
+        */\r
+\r
+        Add(mainSweepClock);\r
+\r
+        mainSweepClock->SetDragParentInstead(true);\r
+        // mainSweepClock->SetOnLongPressListener(longPressListener);\r
+        mainSweepClock->SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
+\r
+        // {214, 3}: position x, y {14, 223}: center x, y\r
+        mainSweepClock->SetHandImage(UISweepClock::HandType::SECOND_HAND, *secondHand,\r
+                                     {POINT_POSITION_X, SECOND_POINT_POSITION_Y}, {POINT_CENTER_X, POINT_CENTER_Y});\r
+        mainSweepClock->SetHandImage(UISweepClock::HandType::MINUTE_HAND, *minuteHand,\r
+                                     {POINT_POSITION_X, POINT_POSITION_Y}, {POINT_CENTER_X, POINT_CENTER_Y});\r
+        mainSweepClock->SetHandImage(UISweepClock::HandType::HOUR_HAND, *hourHand, {POINT_POSITION_X, POINT_POSITION_Y},\r
+                                     {POINT_CENTER_X, POINT_CENTER_Y});\r
+        mainSweepClock->SetHandCircleImage(UISweepClock::HandType::SECOND_HAND, *smallCircle,\r
+                                           {SMALLCIRCLE_POSITION_X, SMALLCIRCLE_POSITION_Y});\r
+        mainSweepClock->SetHandCircleImage(UISweepClock::HandType::MINUTE_HAND, *medCircle,\r
+                                           {MEDCIRCLE_POSITION_X, MEDCIRCLE_POSITION_Y});\r
+        mainSweepClock->SetHandCircleImage(UISweepClock::HandType::HOUR_HAND, *bigCircle,\r
+                                           {BIGCIRCLE_POSITION_X, BIGCIRCLE_POSITION_Y});\r
+\r
+        mainSweepClock->SetInitTime24Hour(0, 0, 0);\r
+        mainSweepClock->SetWorkMode(UISweepClock::WorkMode::NORMAL);\r
+        InitDateTime();\r
+\r
+        callBack = new ClockAnimatorCallback(mainSweepClock);\r
+        if (callBack == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "callBack new fail");\r
+            return false;\r
+        }\r
+        clockAnimator = new Animator(callBack, mainSweepClock, 0, true);\r
+        if (clockAnimator == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "clockAnimator new fail");\r
+            return false;\r
+        }\r
+        clockAnimator->Start();\r
+        SetCoverable(true);\r
+        return true;\r
     }\r
-    view->SetSrc(image);\r
-    return true;\r
-}\r
 \r
-bool MainClockView::InitSweepClock(void)\r
-{\r
-    curFace = new UIImageView();\r
-    if (curFace == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "curFace new fail");\r
-        return false;\r
-    }\r
-    curFace->SetPosition(0, 0);\r
+    void MainClockView::RefreshStep(int step)\r
+    {\r
+#if 0\r
+        char stepChar[STEP_CHAR_NUM] = {0};\r
 \r
-    if (LoadClockImage(curFace, CLOCK_MAIN_FACE_IMAGE) == false) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "curFace LoadClockImage CLOCK_MAIN_FACE_IMAGE fail");\r
-        return false;\r
+        (void)sprintf_s(stepChar, STEP_CHAR_NUM, "%d", step);\r
+        stepLabel->SetText(stepChar);\r
+#endif\r
     }\r
 \r
-    if (InitLabelView() == false) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLabelView() fail");\r
-        return false;\r
-    }\r
-    if (InitCenterCircleView() == false) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitCenterCircleView() fail");\r
-        return false;\r
-    }\r
-    heartRate = new UIImageView();\r
-    if (heartRate == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRate new fail");\r
-        return false;\r
-    }\r
-    heartRate->SetPosition(HEARTRATE_POSITION_X, HEARTRATE_POSITION_Y);\r
-    if (LoadClockImage(heartRate, CLOCK_HEARTRATE_IMAGE_PATH) == false) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRate LoadClockImage CLOCK_HEARTRATE_IMAGE_PATH fail");\r
-        return false;\r
-    }\r
+    void MainClockView::RefreshHeartRate(int value)\r
+    {\r
+#if 0\r
+        if (value == 0)\r
+        {\r
+            heartRateLabel->SetText("--");\r
+            return;\r
+        }\r
+        char heartRateChar[STEP_CHAR_NUM] = {0};\r
 \r
-    progress = new UIImageView();\r
-    if (progress == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "progress new fail");\r
-        return false;\r
-    }\r
-    progress->SetPosition(PROGRESS_POSITION_X, PROGRESS_POSITION_Y);\r
-    if (LoadClockImage(progress, CLOCK_PROGRESS_IMAGE_PATH) == false) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "progress LoadClockImage CLOCK_PROGRESS_IMAGE_PATH fail");\r
-        return false;\r
+        (void)sprintf_s(heartRateChar, STEP_CHAR_NUM, "%d", value);\r
+        heartRateLabel->SetText(heartRateChar);\r
+#endif\r
     }\r
 \r
-    InitHandView();\r
-    weekDay = new UIImageView();\r
-    if (weekDay == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "weekDay new fail");\r
-        return false;\r
-    }\r
-    weekDay->SetPosition(WEEKDAY_POSITION_X, WEEKDAY_POSITION_Y);\r
-    if (LoadClockImage(weekDay, CLOCK_THURSDAY_IMAGE_PATH) == false) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "weekDay LoadClockImage CLOCK_THURSDAY_IMAGE_PATH fail");\r
-        return false;\r
+    void MainClockView::InitDateTime(void)\r
+    {\r
+        struct tm pTM;\r
+        time_t seconds;\r
+        time(&seconds);\r
+        localtime_r(&seconds, &pTM);\r
+        mainSweepClock->SetTime24Hour(pTM.tm_hour, pTM.tm_min, pTM.tm_sec);\r
     }\r
-    return true;\r
-}\r
 \r
-void MainClockView::PreLoad(void)\r
-{\r
-    if (!viewiInitStatus) {\r
-        InitView();\r
-        viewiInitStatus = true;\r
-    }\r
-}\r
-\r
-void MainClockView::UnLoad(void)\r
-{\r
-    // Main clock view is commonly used page, so we do not release it's resources inner slice.\r
-}\r
-\r
-bool MainClockView::InitView(void)\r
-{\r
-   \r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainClockView::InitView");\r
-    mainSweepClock = new UISweepClock();\r
-    if (mainSweepClock == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "mainSweepClock new fail");\r
-        return false;\r
-    } \r
-\r
-     // Add Button to App\r
-    if (button1_ == nullptr) {\r
-        button1_ = new UIButton();\r
-    }\r
-    button1_->SetPosition(0, 0);         // widget's left position and top position\r
-    button1_->Resize(466, 466);          // widget's width and height\r
-    button1_->SetViewId("button1");// Set style\r
-    button1_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);\r
-    button1_->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
-\r
-    // Set additional property\r
-    button1_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED);\r
-    button1_->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
-\r
-    // Add the CallBack about events\r
-    UIView::OnLongPressListener* button3LongPress = static_cast<UIView::OnLongPressListener*>(MainPresenterSample::GetInstance());\r
-    button1_->SetOnLongPressListener(button3LongPress);\r
-    // Add to rootView\r
-    //container_->Add(button1_);\r
-    button1_->SetVisible(true);\r
-    \r
-    //UIView::OnLongPressListener* longPressListener = (UIView::OnLongPressListener*)OHOS::MainPresenterSample::GetInstance();\r
-    //mainSweepClock->SetOnLongPressListener(longPressListener);\r
-    \r
-    if (InitSweepClock() == false) {\r
-        return false;\r
+    void MainClockView::ClockAnimatorStart(void)\r
+    {\r
+        if (clockAnimator != nullptr)\r
+        {\r
+            clockAnimator->Start();\r
+        }\r
     }\r
 \r
-    mainSweepClock->Add(button1_);\r
-    mainSweepClock->Add(curFace);\r
-    mainSweepClock->Add(stepLabel);\r
-    mainSweepClock->Add(heartRate);\r
-    mainSweepClock->Add(weekLabel);\r
-    mainSweepClock->Add(heartRateLabel);\r
-    mainSweepClock->Add(weekDay);\r
-    mainSweepClock->Add(progress);\r
-    mainSweepClock->Add(batteryLabel);\r
-    Add(mainSweepClock);\r
-\r
-    mainSweepClock->SetDragParentInstead(true);\r
-    //mainSweepClock->SetOnLongPressListener(longPressListener);\r
-    mainSweepClock->SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
-\r
-    // {214, 3}: position x, y {14, 223}: center x, y\r
-    mainSweepClock->SetHandImage(UISweepClock::HandType::SECOND_HAND, *secondHand,\r
-        { POINT_POSITION_X, SECOND_POINT_POSITION_Y }, { POINT_CENTER_X, POINT_CENTER_Y });\r
-    mainSweepClock->SetHandImage(UISweepClock::HandType::MINUTE_HAND, *minuteHand,\r
-        { POINT_POSITION_X, POINT_POSITION_Y }, { POINT_CENTER_X, POINT_CENTER_Y });\r
-    mainSweepClock->SetHandImage(UISweepClock::HandType::HOUR_HAND, *hourHand, { POINT_POSITION_X, POINT_POSITION_Y },\r
-        { POINT_CENTER_X, POINT_CENTER_Y });\r
-    mainSweepClock->SetHandCircleImage(UISweepClock::HandType::SECOND_HAND, *smallCircle,\r
-        { SMALLCIRCLE_POSITION_X, SMALLCIRCLE_POSITION_Y });\r
-    mainSweepClock->SetHandCircleImage(UISweepClock::HandType::MINUTE_HAND, *medCircle,\r
-        { MEDCIRCLE_POSITION_X, MEDCIRCLE_POSITION_Y });\r
-    mainSweepClock->SetHandCircleImage(UISweepClock::HandType::HOUR_HAND, *bigCircle,\r
-        { BIGCIRCLE_POSITION_X, BIGCIRCLE_POSITION_Y });\r
-\r
-    mainSweepClock->SetInitTime24Hour(0, 0, 0);\r
-    mainSweepClock->SetWorkMode(UISweepClock::WorkMode::NORMAL);\r
-    InitDateTime();\r
-\r
-    callBack = new ClockAnimatorCallback(mainSweepClock);\r
-    if (callBack == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "callBack new fail");\r
-        return false;\r
+    void MainClockView::ClockAnimatorStop(void)\r
+    {\r
+        if (clockAnimator != nullptr)\r
+        {\r
+            clockAnimator->Stop();\r
+        }\r
     }\r
-    clockAnimator = new Animator(callBack, mainSweepClock, 0, true);\r
-    if (clockAnimator == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "clockAnimator new fail");\r
-        return false;\r
-    }\r
-    clockAnimator->Start();\r
-    SetCoverable(true);\r
-    return true;\r
-}\r
-\r
-void MainClockView::RefreshStep(int step)\r
-{\r
-    char stepChar[STEP_CHAR_NUM] = {0};\r
-\r
-    (void)sprintf_s(stepChar, STEP_CHAR_NUM, "%d", step);\r
-    stepLabel->SetText(stepChar);\r
-}\r
-\r
-void MainClockView::RefreshHeartRate(int value)\r
-{\r
-    if (value == 0) {\r
-        heartRateLabel->SetText("--");\r
-        return;\r
-    }\r
-    char heartRateChar[STEP_CHAR_NUM] = {0};\r
-\r
-    (void)sprintf_s(heartRateChar, STEP_CHAR_NUM, "%d", value);\r
-    heartRateLabel->SetText(heartRateChar);\r
-}\r
-\r
-void MainClockView::InitDateTime(void)\r
-{\r
-    struct tm pTM;\r
-    time_t seconds;\r
-    time(&seconds);\r
-    localtime_r(&seconds, &pTM);\r
-    mainSweepClock->SetTime24Hour(pTM.tm_hour, pTM.tm_min, pTM.tm_sec);\r
-}\r
-\r
-void MainClockView::ClockAnimatorStart(void)\r
-{\r
-    if (clockAnimator != nullptr) {\r
-        clockAnimator->Start();\r
-    }\r
-}\r
-\r
-void MainClockView::ClockAnimatorStop(void)\r
-{\r
-    if (clockAnimator != nullptr) {\r
-        clockAnimator->Stop();\r
-    }\r
-}\r
 \r
 }\r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/dial/include/Digital_clockPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/dial/include/Digital_clockPresenter.h
deleted file mode 100644 (file)
index 3b55bfc..0000000
--- a/code/sdk/application/wearable/nativeapp/nativeui/dial/include/Digital_clockPresenter.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _Digital_clock_PRESENTER_H
-#define _Digital_clock_PRESENTER_H
-
-#include "Presenter.h"
-#include "Digital_clockView.h"
-
-namespace OHOS
-{
-    class Digital_clockView;
-
-    class Digital_clockPresenter : public Presenter<Digital_clockView>,
-                                 public UIView::OnClickListener,
-                                 public UIView::OnDragListener
-    {
-    public:
-        Digital_clockPresenter();
-        virtual ~Digital_clockPresenter();
-
-        void OnStart() override;
-        void OnPause() override;
-        void OnResume() override;
-        void OnStop() override;
-
-        static Digital_clockPresenter *GetInstance();
-
-    private:
-        // 因为继承了OnClickListener，所以有OnClick属性，至于参数,原函数也这样直接继承;
-        bool OnClick(UIView &view, const ClickEvent &event) override;
-        bool OnDrag(UIView &view, const DragEvent &event) override;
-    };
-} // namespace OHOS
-
-#endif // SLEEPDETAIL_PRESENTER_H 
\ No newline at end of file

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/dial/include/Digital_clockView.h b/code/sdk/application/wearable/nativeapp/nativeui/dial/include/Digital_clockView.h
index c594dd0..06ab15c 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/dial/include/Digital_clockView.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/dial/include/Digital_clockView.h
@@ -25,7 +25,6 @@
 #include <fstream>
 #include <string>
 #include "battery.h"
-#include "Digital_clockPresenter.h"
 #include "cJSON.h"
 #include "sys/time.h"
 extern uint8_t battery_get_voltage(float *voltage);
@@ -201,8 +200,8 @@ namespace OHOS
             return file.good();
         }
     };
-    class Digital_clockPresenter;
-    class Digital_clockView : public View<Digital_clockPresenter>
+
+    class Digital_clockView : public UICardPage
     {
 
     public:
@@ -210,11 +209,7 @@ namespace OHOS
         virtual ~Digital_clockView();
         static Digital_clockView *GetInstance(void);
 
-        void OnStart() override;
-        void OnSetUpView() override;
-        void OnTearDownView() override;
-        void OnStop() override;
-        void InitView();
+        bool InitView();
         void DeInit();
         void setJsonFilePath(const std::string &filePath);
         void updateClockTime(const std::string &stringtime);

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockPresenter.cpp
deleted file mode 100644 (file)
index 2530854..0000000
--- a/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockPresenter.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "AppViewIDs.h"
-#include "NativeAbility.h"
-
-#include <iostream>
-#include <chrono>
-#include <thread>
-#include "components/ui_sweep_clock.h"
-#include "dial/include/Digital_clockPresenter.h"
-#include "dial/include/Digital_clockView.h"
-// #include "Digital_clockView.h"
-
-namespace OHOS
-{
-
-    // 当前Presenter属性实例化的内存指针
-    static Digital_clockPresenter *g_pDigital_clockPresenter = nullptr;
-
-    Digital_clockPresenter::Digital_clockPresenter()
-    {
-
-        g_pDigital_clockPresenter = this;
-    }
-
-    Digital_clockPresenter::~Digital_clockPresenter()
-    {
-
-        g_pDigital_clockPresenter = nullptr;
-    }
-
-    Digital_clockPresenter *Digital_clockPresenter::GetInstance()
-    {
-
-        return g_pDigital_clockPresenter;
-    }
-
-    void Digital_clockPresenter::OnStart()
-    {
-        Presenter<Digital_clockView>::OnStart();
-    }
-
-    void Digital_clockPresenter::OnPause(void)
-    {
-        Presenter<Digital_clockView>::OnPause();
-    }
-
-    void Digital_clockPresenter::OnResume(void)
-    {
-        Presenter<Digital_clockView>::OnResume();
-    }
-
-    void Digital_clockPresenter::OnStop(void)
-    {
-        Presenter<Digital_clockView>::OnStop();
-    }
-
-    bool Digital_clockPresenter::OnDrag(UIView &view, const DragEvent &event)
-    {
-        Digital_clockView *g_pDigital_clockView = new Digital_clockView;
-        if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT &&
-            (event.GetDeltaX() > 40) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY()))))
-        {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
-        }
-        // g_pDigital_clockView->InitView();
-        UNUSED(view);
-        return true;
-    }
-
-    bool Digital_clockPresenter::OnClick(UIView &view, const ClickEvent &event)
-    {
-        // // 根据控件id查找是哪个控件触发了点击回调
-        // if (strcmp(view.GetViewId(), BUTTONOK) == 0)
-        // {
-        //     NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCONTROL);
-        // }
-        return true;
-    }
-}

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockView.cpp
index 415f17c..f9e4e7f 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockView.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockView.cpp
@@ -48,6 +48,7 @@ namespace OHOS
     static Digital_clockView *g_pDigital_clockView{nullptr};
     Digital_clockView::Digital_clockView()
     {
+        SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);
         g_pDigital_clockView = this;
     }
 
@@ -472,13 +473,14 @@ namespace OHOS
         progress1animator_->Start();
     };
     /* InitView:初始化界面*/
-    void Digital_clockView ::InitView()
+    bool Digital_clockView ::InitView()
     {
         if (container_ == nullptr)
         {
             container_ = new UIViewGroup();
-            container_->SetPosition(0, 0, 466, 466);
-            container_->SetStyle(STYLE_BACKGROUND_OPA, 0);
+            container_->SetPosition(0, 0);
+            container_->SetWidth(Screen::GetInstance().GetWidth());
+            container_->SetHeight(Screen::GetInstance().GetHeight());
         }
         if (loadJsonData(JosnfilePath))
         {
@@ -493,15 +495,14 @@ namespace OHOS
             {
                 Initdigit();
             }
-            PRINT_DEBUG_INFO
-            Initdata();
-            PRINT_DEBUG_INFO
-            Initweek();
-            PRINT_DEBUG_INFO
+                    
+            Initdata();           
+            Initweek();           
             Initbattery();
-            PRINT_DEBUG_INFO
             cJSON_Delete(cjson_json);
         }
+        SetCoverable(true);
+        return true;
     }
     /* DeInit：删除组件*/
     void Digital_clockView::DeInit()
@@ -580,58 +581,10 @@ namespace OHOS
 
     void Digital_clockView::PreLoad(void)
     {
-
-        if (!viewiInitStatus)
+        if (InitView())
         {
-            InitView();
             viewiInitStatus = true;
         }
     }
-    void Digital_clockView::OnStart()
-    {
-        PRINT_DEBUG_INFO
-        container_ = new UIViewGroup();
-        if (container_ == nullptr)
-        {
-            return;
-        }
-        container_->SetPosition(0, 0);
-        container_->SetWidth(Screen::GetInstance().GetWidth());
-        container_->SetHeight(Screen::GetInstance().GetHeight());
-        // 创建 draglistener 实例并设置为拖动监听器
-        UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(Digital_clockPresenter::GetInstance());
-
-        if (draglistener == nullptr)
-        {
-            return;
-        }
-        container_->SetOnDragListener(draglistener);
-        container_->SetTouchable(true);
-        container_->SetDraggable(true);
-        BaseView::RootView(Color::Black().full);
-        PreLoad();
-        RootView::GetInstance()->Add(container_);
-    }
-
-    void Digital_clockView::OnSetUpView()
-    {
-
-        View<Digital_clockPresenter>::OnSetUpView();
-        Draw();
-    }
 
-    void Digital_clockView::OnTearDownView()
-    {
-
-        View<Digital_clockPresenter>::OnTearDownView();
-        return;
-    }
-
-    void Digital_clockView::OnStop()
-    {
-        View<Digital_clockPresenter>::OnStop();
-        RootView::GetInstance()->RemoveAll();
-        // RootView::GetInstance()->Invalidate();
-        return;
-    }
 }

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/include/MainViewSample.h b/code/sdk/application/wearable/nativeapp/nativeui/main/include/MainViewSample.h
index cff99d5..02862a9 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/MainViewSample.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/MainViewSample.h
@@ -28,7 +28,7 @@
 #include "components/ui_card_page.h"\r
 #include "PullUpDownView.h"\r
 #include "components/ui_cross_view.h"\r
-\r
+#include "dial/include/Digital_clockView.h"\r
 namespace OHOS {\r
 class MainPresenterSample;\r
 class MainViewSample : public View<MainPresenterSample> {\r
@@ -45,6 +45,7 @@ public:
     UICardPage *InitActivityPage(void);\r
     UICardPage *InitCompassPage(void);\r
     UICardPage *InitMusicPlayerPage(void);\r
+    UICardPage *InitNewDialPage(void);\r
     void AnimatorStart(int pageIndex);\r
     void AnimatorStop(void);\r
     uint16_t GetHorCurrentPage() const\r
@@ -60,8 +61,9 @@ public:
     bool IsMainView(void);\r
     void SetDragFg(bool continFg);\r
     bool GetDragFg(void);\r
-\r
+  \r
 private:\r
+   \r
     int16_t maxPage{0};\r
     bool continuDragFg{false};\r
     PullUpDownView *dropDownView{nullptr};\r
@@ -72,6 +74,7 @@ private:
     PlayersView *playersView{nullptr};\r
     CompassControlView *compassControlView{nullptr};\r
     HeartRateView *heartRateView{nullptr};\r
+    Digital_clockView*dialView{nullptr};\r
     UICardPage *recordCard[MAX_CARD]{nullptr};\r
     bool pageStatus[MAX_CARD]{false};\r
     UICrossView *mainSwipeGroup{nullptr};\r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
index 8b243a0..f0164a6 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
@@ -29,6 +29,7 @@ static const MainViewMapper PageMapper[] = {
     {COMPASS, &MainViewSample::InitCompassPage},\r
     {ACTIVITY, &MainViewSample::InitActivityPage},\r
     {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},\r
+    {NEW_DAIL,&MainViewSample::InitNewDialPage},\r
 };\r
 \r
 MainViewSample::MainViewSample()\r
@@ -93,9 +94,16 @@ MainViewSample::~MainViewSample()
         compassControlView = nullptr;\r
     }\r
 \r
+    if (dialView != nullptr) {\r
+        delete dialView;\r
+        dialView = nullptr;\r
+    }\r
+\r
     g_pMainView = nullptr;\r
 }\r
 \r
+\r
+\r
 MainViewSample *MainViewSample::GetInstance(void)\r
 {\r
     return g_pMainView;\r
@@ -133,6 +141,7 @@ void MainViewSample::OnStart()
     mainSwipeGroup->EnableScreenCap(true);\r
     mainSwipeGroup->RegisterSwipeCallback(callback);\r
     mainSwipeGroup->SetHorCurrentPage(mainClockView->GetViewIndex());\r
+    mainSwipeGroup->SetHorCurrentPage(dialView->GetViewIndex());\r
 \r
     SetContainerView(mainSwipeGroup);\r
 }\r
@@ -295,6 +304,16 @@ UICardPage *MainViewSample::InitMusicPlayerPage(void)
     return playersView;\r
 }\r
 \r
+UICardPage *MainViewSample::InitNewDialPage(void)\r
+{\r
+    dialView = new Digital_clockView();\r
+    if (dialView == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dialView new fail");\r
+        return nullptr;\r
+    }\r
+    return dialView;\r
+}\r
+\r
 UICardPage *MainViewSample::CreatePage(int32_t StreamId)\r
 {\r
     uint16_t i;\r
@@ -322,7 +341,9 @@ void MainViewSample::AnimatorStart(int pageIndex)
         mainSwipeGroup->GetCurrentPageId(UISwipeView::VERTICAL) == 1) {\r
         mainClockView->ClockAnimatorStart();\r
     }\r
-\r
+    if (dialView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(NEW_DAIL)) {\r
+        dialView->PreLoad();\r
+    }\r
 }\r
 \r
 void MainViewSample::AnimatorStop(void)\r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/screensetting/include/ScreenModels.h b/code/sdk/application/wearable/nativeapp/nativeui/screensetting/include/ScreenModels.h
index bf5d0c8..16dbd20 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/screensetting/include/ScreenModels.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/screensetting/include/ScreenModels.h
@@ -17,7 +17,8 @@ typedef enum {
     HEART_RATE,\r
     COMPASS,\r
     ACTIVITY,\r
-    MUSIC_PLAYER ,\r
+    MUSIC_PLAYER,\r
+    NEW_DAIL,\r
     MAX_CARD,\r
 } CardId;\r
 \r