修复卡片管理bug
authorCaisking <3449750381@qq.com>
Mon, 8 Apr 2024 11:27:56 +0000 (19:27 +0800)
committerCaisking <3449750381@qq.com>
Mon, 8 Apr 2024 11:27:56 +0000 (19:27 +0800)
code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp

index 72cb840..145e1c2 100644 (file)
 
 namespace OHOS
 {
-    static const int CARD_SETTING_COUNT_MAX = 5;
+    static const int CARD_SETTING_COUNT_MAX = 8;
     typedef enum
     {
         WATCH_FACE = 0, /* 主表盘枚举值不能修改 */
         HEART_RATE,
         COMPASS,
-        ACTIVITY,
         MUSIC_PLAYER,
-        WEATHER,
         BLOODOXGEN,
+        WEATHER,
         TRAINING,
+        ACTIVITY,
         MAX_CARD,
     } CardId;
 
index 01ada55..4d50ad9 100644 (file)
@@ -18,11 +18,11 @@ namespace OHOS
     // 更新主界面卡片需要更新Map\r
     const CardInfo cardInfoMap[] = {\r
         {HEART_RATE, PNG_SET_CARD_HEART},\r
-        {BLOODOXGEN, PNG_SET_CARD_BLOOD},\r
-        {TRAINING, PNG_SET_CARD_TRAIN},\r
         {COMPASS, PNG_SET_CARD_COMPASS},\r
-        {WEATHER, PNG_SET_CARD_WEATHER},\r
         {MUSIC_PLAYER, PNG_SET_CARD_PLAYER},\r
+        {BLOODOXGEN, PNG_SET_CARD_BLOOD},\r
+        {WEATHER, PNG_SET_CARD_WEATHER},\r
+        {TRAINING, PNG_SET_CARD_TRAIN},\r
         {ACTIVITY, PNG_SET_CARD_ACTIVITY},\r
     };\r
 \r
@@ -119,7 +119,7 @@ namespace OHOS
 \r
         for (uint8_t i = 0; i < cardSettingCount; i++)\r
         {\r
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);\r
             (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]);\r
         }\r
         (void)UtilsSetValue("card_setting", temp);\r
@@ -142,7 +142,7 @@ namespace OHOS
         cardSettings[cardSettingCount++] = cardInfoMap[index].id;\r
         for (uint8_t i = 0; i < cardSettingCount; i++)\r
         {\r
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);\r
             (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]);\r
         }\r
         (void)UtilsSetValue("card_setting", temp);\r
index 7c5fe66..5a77f25 100644 (file)
@@ -25,17 +25,16 @@ namespace OHOS
         CardId id;
         UICardPage *(MainViewSample::*func)(void);
     };
-
+    //严格按照Id对应
     static const MainViewMapper CardMapper[] = {
         {WATCH_FACE, &MainViewSample::InitWatchFacePage},
         {HEART_RATE, &MainViewSample::InitHeartRatePage},
-        {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},
-        {TRAINING, &MainViewSample::InitTrainingPage},
         {COMPASS, &MainViewSample::InitCompassPage},
-        {WEATHER, &MainViewSample::InitWeatherPage},
         {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
+        {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},
+        {WEATHER, &MainViewSample::InitWeatherPage},
+        {TRAINING, &MainViewSample::InitTrainingPage},
         {ACTIVITY, &MainViewSample::InitActivityPage},
-
     };
 
     MainViewSample::MainViewSample()
@@ -353,19 +352,7 @@ namespace OHOS
         }
         return mainClockView;
     }
-
-    // 主界面音乐界面
-    UICardPage *MainViewSample::InitMusicPlayerPage(void)
-    {
-        playersView = new PlayersView();
-        if (playersView == nullptr)
-        {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playersView new fail");
-            return nullptr;
-        }
-        return playersView;
-    }
-    // 主界面指南针卡片
+    // 指南针卡片
     UICardPage *MainViewSample::InitCompassPage(void)
     {
         compassControlView = new CompassControlView();
@@ -376,6 +363,18 @@ namespace OHOS
         }
         return compassControlView;
     }
+    // 音乐卡片
+    UICardPage *MainViewSample::InitMusicPlayerPage(void)
+    {
+        playersView = new PlayersView();
+        if (playersView == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playersView new fail");
+            return nullptr;
+        }
+        return playersView;
+    }
+
     // 主界面血氧卡片
     UICardPage *MainViewSample::InitBloodOxygenPage(void)
     {
index feb639c..4af3b5f 100644 (file)
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 
-namespace OHOS {
-
-ScreenModels::ScreenModels()
+namespace OHOS
 {
-}
 
-ScreenModels::~ScreenModels()
-{
-}
+    ScreenModels::ScreenModels()
+    {
+    }
 
-ScreenModels *ScreenModels::GetInstance(void)
-{
-    static ScreenModels screenModel;
-    return &screenModel;
-}
+    ScreenModels::~ScreenModels()
+    {
+    }
 
-void ScreenModels::InitKvStorage(void)
-{
-    int ret = UtilsSetEnv("/user");
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "UtilsSetEnv /user ret = %d", ret);
-}
+    ScreenModels *ScreenModels::GetInstance(void)
+    {
+        static ScreenModels screenModel;
+        return &screenModel;
+    }
 
-void ScreenModels::LoadAppMultiImages(std::string file, uint32_t startId, uint32_t lastId)
-{
-    for (uint32_t i = startId; i <= lastId; i++) {
-        ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(i, file);
-        if (image == nullptr) {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadAppMultiImages %x fail", i);
-            return;
+    void ScreenModels::InitKvStorage(void)
+    {
+        int ret = UtilsSetEnv("/user");
+        WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "UtilsSetEnv /user ret = %d", ret);
+    }
+
+    void ScreenModels::LoadAppMultiImages(std::string file, uint32_t startId, uint32_t lastId)
+    {
+        for (uint32_t i = startId; i <= lastId; i++)
+        {
+            ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(i, file);
+            if (image == nullptr)
+            {
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadAppMultiImages %x fail", i);
+                return;
+            }
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LoadAppMultiImages %x", i);
         }
-        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LoadAppMultiImages %x", i);
     }
-}
 
-bool ScreenModels::LoadAppImages(std::string file, UIImageView *view, uint32_t resId)
-{
-    ImageInfo* image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file);
-    if (image == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadAppImages %x fail", resId);
-        return false;
+    bool ScreenModels::LoadAppImages(std::string file, UIImageView *view, uint32_t resId)
+    {
+        ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file);
+        if (image == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadAppImages %x fail", resId);
+            return false;
+        }
+        view->SetSrc(image);
+        return true;
     }
-    view->SetSrc(image);
-    return true;
-}
 
-void ScreenModels::PreLoadAppimages(void)
-{
- LoadAppMultiImages(PLAYER_IAMGES, PLAYER_BACKGROUND, PLAYER_PLAYING);
+    void ScreenModels::PreLoadAppimages(void)
+    {
+        LoadAppMultiImages(PLAYER_IAMGES, PLAYER_BACKGROUND, PLAYER_PLAYING);
         LoadAppMultiImages(CLOCK_IAMGES, CLOCK_CLOCK0, CLOCK_SECOND);
         LoadAppMultiImages(COMPASS_IAMGES, COMPASS_COMPASS0, COMPASS_COMPASS2);
         LoadAppMultiImages(DROPDOWN_IAMGES, DROPDOWN_BLUETOOTHCONNECTED, DROPDOWN_SETTING);
@@ -73,6 +77,5 @@ void ScreenModels::PreLoadAppimages(void)
         LoadAppMultiImages(BLOOD_IAMGES, BLOODOXYGEN_BACKGOUND, BLOODOXYGEN_BACKGOUND);
         LoadAppMultiImages(TRAINING_IAMGES, TRAINING_BOUTTONGROUND, TRAINING_WALKING_BIG);
         LoadAppMultiImages(MESSAGE_IAMGES, MESSAGE_MESSAGE, MESSAGE_WECHAT);
-
-}
+    }
 }
index e628065..899a834 100755 (executable)
 #include "MainViewSample.h"
 #include "graphic_service.h"
 
-namespace OHOS {
-static MainViewSample *g_pMainView = nullptr;
-static constexpr uint16_t MESLABLE_X_TMP = 177;
-static constexpr uint16_t MESLABLE_Y_TMP = 212;
-static constexpr uint16_t MESLABLE_WIDTH_TMP = 100;
-static constexpr uint16_t MESLABLE_HEIGHT_TMP = 30;
-static constexpr uint8_t FONT_SIZE_TMP = 24;
-static constexpr uint8_t PULL_MIDDLE_VIEW_OPA = 0;
-
-struct MainViewMapper {
-    CardId id;
-    UICardPage *(MainViewSample::*func)(void);
-};
-
-static const MainViewMapper CardMapper[] = {
-    {WATCH_FACE, &MainViewSample::InitWatchFacePage},
-    {HEART_RATE, &MainViewSample::InitHeartRatePage},
-    {COMPASS, &MainViewSample::InitCompassPage},
-    {ACTIVITY, &MainViewSample::InitActivityPage},
-    {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
-};
-
-MainViewSample::MainViewSample()
+namespace OHOS
 {
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::MainViewSample");
-    g_pMainView = this;
-}
-
-MainViewSample::~MainViewSample()
-{
-    dropDownView->ClearBackgroundBlur();
-    messageView->ClearBackgroundBlur();
-
-    for (int32_t i = 0; i < MAX_CARD; i++) {
-        recordCard[i] = nullptr;
-        pageStatus[i] = false;
+    static MainViewSample *g_pMainView = nullptr;
+    static constexpr uint16_t MESLABLE_X_TMP = 177;
+    static constexpr uint16_t MESLABLE_Y_TMP = 212;
+    static constexpr uint16_t MESLABLE_WIDTH_TMP = 100;
+    static constexpr uint16_t MESLABLE_HEIGHT_TMP = 30;
+    static constexpr uint8_t FONT_SIZE_TMP = 24;
+    static constexpr uint8_t PULL_MIDDLE_VIEW_OPA = 0;
+
+    struct MainViewMapper
+    {
+        CardId id;
+        UICardPage *(MainViewSample::*func)(void);
+    };
+
+    static const MainViewMapper CardMapper[] = {
+        {WATCH_FACE, &MainViewSample::InitWatchFacePage},
+        {HEART_RATE, &MainViewSample::InitHeartRatePage},
+        {COMPASS, &MainViewSample::InitCompassPage},
+        {ACTIVITY, &MainViewSample::InitActivityPage},
+        {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
+    };
+
+    MainViewSample::MainViewSample()
+    {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::MainViewSample");
+        g_pMainView = this;
     }
 
-    if (mainSwipeGroup != nullptr) {
-        delete mainSwipeGroup;
-        mainSwipeGroup = nullptr;
-    }
+    MainViewSample::~MainViewSample()
+    {
+        dropDownView->ClearBackgroundBlur();
+        messageView->ClearBackgroundBlur();
 
-    if (mainClockView != nullptr) {
-        delete mainClockView;
-        mainClockView = nullptr;
-    }
+        for (int32_t i = 0; i < MAX_CARD; i++)
+        {
+            recordCard[i] = nullptr;
+            pageStatus[i] = false;
+        }
 
-    if (activityWeekView != nullptr) {
-        delete activityWeekView;
-        activityWeekView = nullptr;
-    }
+        if (mainSwipeGroup != nullptr)
+        {
+            delete mainSwipeGroup;
+            mainSwipeGroup = nullptr;
+        }
 
-    if (playersView != nullptr) {
-        delete playersView;
-        playersView = nullptr;
-    }
+        if (mainClockView != nullptr)
+        {
+            delete mainClockView;
+            mainClockView = nullptr;
+        }
 
-    if (heartRateView != nullptr) {
-        delete heartRateView;
-        heartRateView = nullptr;
-    }
+        if (activityWeekView != nullptr)
+        {
+            delete activityWeekView;
+            activityWeekView = nullptr;
+        }
 
-    if (dropDownView != nullptr) {
-        delete dropDownView;
-        dropDownView = nullptr;
-    }
+        if (playersView != nullptr)
+        {
+            delete playersView;
+            playersView = nullptr;
+        }
 
-    if (messageView != nullptr) {
-        messageView->RemoveAll();
-        delete messageView;
-        messageView = nullptr;
-    }
+        if (heartRateView != nullptr)
+        {
+            delete heartRateView;
+            heartRateView = nullptr;
+        }
 
-    if (messageLable != nullptr) {
-        delete messageLable;
-        messageLable = nullptr;
-    }
+        if (dropDownView != nullptr)
+        {
+            delete dropDownView;
+            dropDownView = nullptr;
+        }
 
-    if (compassControlView != nullptr) {
-        delete compassControlView;
-        compassControlView = nullptr;
-    }
+        if (messageView != nullptr)
+        {
+            messageView->RemoveAll();
+            delete messageView;
+            messageView = nullptr;
+        }
 
-    if (callback != nullptr) {
-        delete callback;
-        callback = nullptr;
-    }
+        if (messageLable != nullptr)
+        {
+            delete messageLable;
+            messageLable = nullptr;
+        }
 
-    g_pMainView = nullptr;
-}
+        if (compassControlView != nullptr)
+        {
+            delete compassControlView;
+            compassControlView = nullptr;
+        }
 
-MainViewSample *MainViewSample::GetInstance(void)
-{
-    return g_pMainView;
-}
+        if (callback != nullptr)
+        {
+            delete callback;
+            callback = nullptr;
+        }
 
-void MainViewSample::OnStart()
-{
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::OnStart");
-    View<MainPresenterSample>::OnStart();
-    BaseView::RootView(Color::Black().full);
+        g_pMainView = nullptr;
+    }
 
-    mainSwipeGroup = new UICrossView();
-    if (mainSwipeGroup == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "mainSwipeGroup new fail");
-        return;
+    MainViewSample *MainViewSample::GetInstance(void)
+    {
+        return g_pMainView;
     }
 
-    if (callback == nullptr) {
-        callback = new ZoomEffect();
-        if (callback == nullptr) {
-            delete mainSwipeGroup;
-            mainSwipeGroup = nullptr;
-            GRAPHIC_LOGE("SwipeCallback new fail\n");
+    void MainViewSample::OnStart()
+    {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::OnStart");
+        View<MainPresenterSample>::OnStart();
+        BaseView::RootView(Color::Black().full);
+
+        mainSwipeGroup = new UICrossView();
+        if (mainSwipeGroup == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "mainSwipeGroup new fail");
             return;
         }
-    }
 
-    HorizontalViewInit();
-    HorViewLoad();
-    VerticalViewInit();
-    VertViewLoad();
-    mainSwipeGroup->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
-    mainSwipeGroup->SetAnimatorTime(50); // 50: animator drag time(ms);
-    mainSwipeGroup->SetLoopState(true);
-    mainSwipeGroup->EnableScreenCap(true);
-    mainSwipeGroup->RegisterSwipeCallback(callback);
-    SwitchToClockPage();
-    SetContainerView(mainSwipeGroup);
-}
+        if (callback == nullptr)
+        {
+            callback = new ZoomEffect();
+            if (callback == nullptr)
+            {
+                delete mainSwipeGroup;
+                mainSwipeGroup = nullptr;
+                GRAPHIC_LOGE("SwipeCallback new fail\n");
+                return;
+            }
+        }
 
-bool MainViewSample::HorizontalViewInit(void)
-{
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::HorizontalViewInit");
-    presenter_->InitDialSettings();
-    presenter_->InitCardSettings();
-    uint8_t cardSettingNum = presenter_->GetCardSettingCount();
-    CardId *cardSettings = presenter_->GetCardSettings();
-    uint8_t cardMapNumber = sizeof(CardMapper) / sizeof(CardMapper[0]);
-    for (int16_t i = 0; i < cardSettingNum; i++) {
-        for (uint8_t j = 0; j < cardMapNumber; j++) {
-            if (cardSettings[i] == CardMapper[j].id) {
-                recordCard[j] = (this->*(CardMapper[j].func))();
-                if (recordCard[j] == nullptr) {
-                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
-                                  "MainViewSample:: recordCard %d error", j);
-                    return false;
+        HorizontalViewInit();
+        HorViewLoad();
+        VerticalViewInit();
+        VertViewLoad();
+        mainSwipeGroup->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
+        mainSwipeGroup->SetAnimatorTime(50); // 50: animator drag time(ms);
+        mainSwipeGroup->SetLoopState(true);
+        mainSwipeGroup->EnableScreenCap(true);
+        mainSwipeGroup->RegisterSwipeCallback(callback);
+        SwitchToClockPage();
+        SetContainerView(mainSwipeGroup);
+    }
+
+    bool MainViewSample::HorizontalViewInit(void)
+    {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::HorizontalViewInit");
+        presenter_->InitDialSettings();
+        presenter_->InitCardSettings();
+        uint8_t cardSettingNum = presenter_->GetCardSettingCount();
+        CardId *cardSettings = presenter_->GetCardSettings();
+        uint8_t cardMapNumber = sizeof(CardMapper) / sizeof(CardMapper[0]);
+        for (int16_t i = 0; i < cardSettingNum; i++)
+        {
+            for (uint8_t j = 0; j < cardMapNumber; j++)
+            {
+                if (cardSettings[i] == CardMapper[j].id)
+                {
+                    recordCard[j] = (this->*(CardMapper[j].func))();
+                    if (recordCard[j] == nullptr)
+                    {
+                        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,
+                                      "MainViewSample:: recordCard %d error", j);
+                        return false;
+                    }
+                    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
+                                  "MainViewSample:: recordCard[%d]:%p", j, recordCard[j]);
+                    break;
                 }
-                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,
-                              "MainViewSample:: recordCard[%d]:%p", j, recordCard[j]);
-                break;
             }
         }
+        presenter_->setCallback(callback);
+        mainSwipeGroup->SetOnSwipeListener(presenter_);
+        mainSwipeGroup->SetOnLongPressListener(presenter_);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitPage over");
+        return true;
     }
-    presenter_->setCallback(callback);
-    mainSwipeGroup->SetOnSwipeListener(presenter_);
-    mainSwipeGroup->SetOnLongPressListener(presenter_);
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitPage over");
-    return true;
-}
 
-void MainViewSample::HorViewLoad(void)
-{
-    uint8_t cardSettingNum = presenter_->GetCardSettingCount();
-    CardId *cardSettings = presenter_->GetCardSettings();
-    for (int16_t i = 0; i < cardSettingNum; i++) {
-        CardId cardId = cardSettings[i];
-        if (recordCard[cardId] != nullptr) {
-            mainSwipeGroup->HorAdd(recordCard[cardId]);
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample:: HorViewLoad cardid = %d ViewIndex = %d",
-                          cardId, recordCard[cardId]->GetViewIndex());
+    void MainViewSample::HorViewLoad(void)
+    {
+        uint8_t cardSettingNum = presenter_->GetCardSettingCount();
+        CardId *cardSettings = presenter_->GetCardSettings();
+        for (int16_t i = 0; i < cardSettingNum; i++)
+        {
+            CardId cardId = cardSettings[i];
+            if (recordCard[cardId] != nullptr)
+            {
+                mainSwipeGroup->HorAdd(recordCard[cardId]);
+                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample:: HorViewLoad cardid = %d ViewIndex = %d",
+                              cardId, recordCard[cardId]->GetViewIndex());
+            }
         }
     }
-}
 
-void MainViewSample::VerticalViewInit(void)
-{
-    dropDownView = new PullUpDownView();
-    if (dropDownView == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dropDownView new fail");
-        return;
-    }
-    dropDownView->PreLoad();
-    dropDownView->SetViewId("dropDownView");
-    dropDownView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
-    dropDownView->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT);
-
-    messageView = new UICardPage();
-    if (messageView == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageView new fail");
-        return;
-    }
-    messageView->SetPosition(0, 0);
-    messageView->SetWidth(Screen::GetInstance().GetWidth());
-    messageView->SetHeight(Screen::GetInstance().GetHeight());
-    messageView->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT);
-    messageView->SetViewId("messageView");
-    messageView->SetTouchable(true);
-    messageView->SetIntercept(true);
-    messageLable = new UILabel();
-    if (messageLable == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageLable new fail");
-        return;
+    void MainViewSample::VerticalViewInit(void)
+    {
+        dropDownView = new PullUpDownView();
+        if (dropDownView == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dropDownView new fail");
+            return;
+        }
+        dropDownView->PreLoad();
+        dropDownView->SetViewId("dropDownView");
+        dropDownView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
+        dropDownView->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT);
+
+        messageView = new UICardPage();
+        if (messageView == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageView new fail");
+            return;
+        }
+        messageView->SetPosition(0, 0);
+        messageView->SetWidth(Screen::GetInstance().GetWidth());
+        messageView->SetHeight(Screen::GetInstance().GetHeight());
+        messageView->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT);
+        messageView->SetViewId("messageView");
+        messageView->SetTouchable(true);
+        messageView->SetIntercept(true);
+        messageLable = new UILabel();
+        if (messageLable == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageLable new fail");
+            return;
+        }
+        messageLable->SetPosition(MESLABLE_X_TMP, MESLABLE_Y_TMP, MESLABLE_WIDTH_TMP, MESLABLE_HEIGHT_TMP);
+        messageLable->SetText("无消息");
+        messageLable->SetAlign(TEXT_ALIGNMENT_CENTER);
+        messageLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_SIZE_TMP);
+        messageLable->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);
+        messageView->Add(messageLable);
     }
-    messageLable->SetPosition(MESLABLE_X_TMP, MESLABLE_Y_TMP, MESLABLE_WIDTH_TMP, MESLABLE_HEIGHT_TMP);
-    messageLable->SetText("无消息");
-    messageLable->SetAlign(TEXT_ALIGNMENT_CENTER);
-    messageLable->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_SIZE_TMP);
-    messageLable->SetStyle(STYLE_BACKGROUND_COLOR, OPA_TRANSPARENT);
-    messageView->Add(messageLable);
-}
 
-void MainViewSample::VertViewLoad(void)
-{
-    mainSwipeGroup->VerAdd(dropDownView, UICrossView::VPage::UP_PAGE);
-    mainSwipeGroup->VerAdd(messageView, UICrossView::VPage::DOWN_PAGE);
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::PullViewLoad::Pull View Load complete");
-}
+    void MainViewSample::VertViewLoad(void)
+    {
+        mainSwipeGroup->VerAdd(dropDownView, UICrossView::VPage::UP_PAGE);
+        mainSwipeGroup->VerAdd(messageView, UICrossView::VPage::DOWN_PAGE);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::PullViewLoad::Pull View Load complete");
+    }
 
-void MainViewSample::OnSetUpView()
-{
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::OnSetUpView");
-    View<MainPresenterSample>::OnSetUpView();
+    void MainViewSample::OnSetUpView()
+    {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::OnSetUpView");
+        View<MainPresenterSample>::OnSetUpView();
 
-    // show timerView
-    Draw();
-}
+        // show timerView
+        Draw();
+    }
 
+    void MainViewSample::OnTearDownView()
+    {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::OnTearDownView");
+        View<MainPresenterSample>::OnTearDownView();
+        return;
+    }
 
-void MainViewSample::OnTearDownView()
-{
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::OnTearDownView");
-    View<MainPresenterSample>::OnTearDownView();
-    return;
-}
+    void MainViewSample::OnStop()
+    {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::OnStop");
+        View<MainPresenterSample>::OnStop();
+        container_ = nullptr;
 
-void MainViewSample::OnStop()
-{
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::OnStop");
-    View<MainPresenterSample>::OnStop();
-    container_ = nullptr;
-
-    messageView->RemoveAll();
-    RootView::GetInstance()->ClearOnKeyActListener();
-    RootView::GetInstance()->RemoveAll();
-    return;
-}
+        messageView->RemoveAll();
+        RootView::GetInstance()->ClearOnKeyActListener();
+        RootView::GetInstance()->RemoveAll();
+        return;
+    }
 
-UICardPage *MainViewSample::InitWathOffDial(DialSetting &setting)
-{
-    DialViewGroup *dial = new DialViewGroup();
-    dial->SetDial(setting.dialFullName);
-    return dial;
-}
+    UICardPage *MainViewSample::InitWathOffDial(DialSetting &setting)
+    {
+        DialViewGroup *dial = new DialViewGroup();
+        dial->SetDial(setting.dialFullName);
+        return dial;
+    }
 
-UICardPage *MainViewSample::InitWathDial(DialSetting &setting)
-{
-    switch (setting.dialId) {
+    UICardPage *MainViewSample::InitWathDial(DialSetting &setting)
+    {
+        switch (setting.dialId)
+        {
         case DIAL_CLOCK:
             return new MainClockView();
         default:
             return nullptr;
+        }
     }
-}
 
-UICardPage *MainViewSample::InitWatchFacePage(void)
-{
-    DialSetting &setting = presenter_->GetDialSetting();
-    if (setting.dialFlag) {
-        mainClockView = InitWathOffDial(setting);
-    } else {
-        mainClockView = InitWathDial(setting);
-    }
+    UICardPage *MainViewSample::InitWatchFacePage(void)
+    {
+        DialSetting &setting = presenter_->GetDialSetting();
+        if (setting.dialFlag)
+        {
+            mainClockView = InitWathOffDial(setting);
+        }
+        else
+        {
+            mainClockView = InitWathDial(setting);
+        }
 
-    if (mainClockView == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainClockView new fail");
-        return nullptr;
+        if (mainClockView == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainClockView new fail");
+            return nullptr;
+        }
+        return mainClockView;
     }
-    return mainClockView;
-}
 
-UICardPage *MainViewSample::InitHeartRatePage(void)
-{
-    heartRateView = new HeartRateView();
-    if (heartRateView == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateView new fail");
-        return nullptr;
+    UICardPage *MainViewSample::InitHeartRatePage(void)
+    {
+        heartRateView = new HeartRateView();
+        if (heartRateView == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateView new fail");
+            return nullptr;
+        }
+        return heartRateView;
     }
-    return heartRateView;
-}
 
-UICardPage *MainViewSample::InitActivityPage(void)
-{
-    activityWeekView = new ActivityWeekView();
-    if (activityWeekView == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "activityWeekView new fail");
-        return nullptr;
+    UICardPage *MainViewSample::InitActivityPage(void)
+    {
+        activityWeekView = new ActivityWeekView();
+        if (activityWeekView == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "activityWeekView new fail");
+            return nullptr;
+        }
+        return activityWeekView;
     }
-    return activityWeekView;
-}
 
-UICardPage *MainViewSample::InitCompassPage(void)
-{
-    compassControlView = new CompassControlView();
-    if (compassControlView == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "compassControlView new fail");
-        return nullptr;
+    UICardPage *MainViewSample::InitCompassPage(void)
+    {
+        compassControlView = new CompassControlView();
+        if (compassControlView == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "compassControlView new fail");
+            return nullptr;
+        }
+        return compassControlView;
     }
-    return compassControlView;
-}
 
-void MainViewSample::SetPage(int16_t page)
-{
-    if (mainSwipeGroup != nullptr) {
-        mainSwipeGroup->SetHorCurrentPage(page);
+    UICardPage *MainViewSample::InitMusicPlayerPage(void)
+    {
+        playersView = new PlayersView();
+        if (playersView == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playersView new fail");
+            return nullptr;
+        }
+        return playersView;
     }
 
-    if (presenter_ != nullptr) {
-        CardId *cardSettings = presenter_->GetCardSettings();
-        /* page 与CardId 没有对应关系,需要一次转换 */
-        presenter_->SetTaskPeroid(cardSettings[page]);
+    void MainViewSample::SetPage(int16_t page)
+    {
+        if (mainSwipeGroup != nullptr)
+        {
+            mainSwipeGroup->SetHorCurrentPage(page);
+        }
+
+        if (presenter_ != nullptr)
+        {
+            CardId *cardSettings = presenter_->GetCardSettings();
+            /* page 与CardId 没有对应关系,需要一次转换 */
+            presenter_->SetTaskPeroid(cardSettings[page]);
+        }
     }
-}
 
-bool MainViewSample::IsMainClockPage(void)
-{
-    if (mainSwipeGroup->GetCurrentPageId(0) == mainClockView->GetViewIndex() &&
-        mainSwipeGroup->GetCurrentPageId(1) == 1) { // 0: horizontal; 1: vertical
-        return true;
-    } else {
-        return false;
+    bool MainViewSample::IsMainClockPage(void)
+    {
+        if (mainSwipeGroup->GetCurrentPageId(0) == mainClockView->GetViewIndex() &&
+            mainSwipeGroup->GetCurrentPageId(1) == 1)
+        { // 0: horizontal; 1: vertical
+            return true;
+        }
+        else
+        {
+            return false;
+        }
     }
-}
 
-CardId MainViewSample::GetHorCurrentCard() const
-{
-    CardId *cardSettings = presenter_->GetCardSettings();
-    int pageId = mainSwipeGroup->GetCurrentPageId(UISwipeView::HORIZONTAL); // 0: horizontal; 1: vertical
-    /* pageId 与CardId 没有对应关系,需要一次转换 */
-    return cardSettings[pageId];
-}
+    CardId MainViewSample::GetHorCurrentCard() const
+    {
+        CardId *cardSettings = presenter_->GetCardSettings();
+        int pageId = mainSwipeGroup->GetCurrentPageId(UISwipeView::HORIZONTAL); // 0: horizontal; 1: vertical
+        /* pageId 与CardId 没有对应关系,需要一次转换 */
+        return cardSettings[pageId];
+    }
 
 }