From: Caisking <3449750381@qq.com> Date: Mon, 15 Jan 2024 08:46:57 +0000 (+0800) Subject: 删除原有表盘 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=230a90dd0c2000c89b09951dd739e2d8360620e2;p=mirrors%2FFD230.git 删除原有表盘 --- 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 02862a95c..6e8527a4e 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/include/MainViewSample.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/include/MainViewSample.h @@ -1,3 +1,13 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2023-12-12 16:55:29 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-01-15 16:40:09 + * @FilePath: /1.FD230/FD230/code/sdk/application/wearable/nativeapp/nativeui/main/include/MainViewSample.h + * @Description: + * @ + * @Copyright (c) 2024 by Caisking , All Rights Reserved. + */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. * Description: MainViewSample @@ -69,7 +79,7 @@ private: PullUpDownView *dropDownView{nullptr}; UICardPage *messageView{nullptr}; UILabel *messageLable{nullptr}; - MainClockView *mainClockView{nullptr}; + Digital_clockView *mainClockView{nullptr}; ActivityWeekView *activityWeekView{nullptr}; PlayersView *playersView{nullptr}; CompassControlView *compassControlView{nullptr}; 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 a56a7012c..212d5b3d9 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp @@ -24,7 +24,6 @@ struct MainViewMapper { }; static const MainViewMapper PageMapper[] = { - {WATCH_FACE, &MainViewSample::InitWatchFacePage}, {HEART_RATE, &MainViewSample::InitHeartRatePage}, {COMPASS, &MainViewSample::InitCompassPage}, {ACTIVITY, &MainViewSample::InitActivityPage}, @@ -253,7 +252,7 @@ void MainViewSample::OnStop() UICardPage *MainViewSample::InitWatchFacePage(void) { - mainClockView = new MainClockView(); + mainClockView = new Digital_clockView(); if (mainClockView == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainClockView new fail"); return nullptr; @@ -344,10 +343,10 @@ void MainViewSample::AnimatorStart(int pageIndex) if (heartRateView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(HEART_RATE)) { heartRateView->HeartbeatImageAnimatorStart(); } - if ((mainClockView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(WATCH_FACE)) && - mainSwipeGroup->GetCurrentPageId(UISwipeView::VERTICAL) == 2) { - mainClockView->ClockAnimatorStart(); - } + // if ((mainClockView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(WATCH_FACE)) && + // mainSwipeGroup->GetCurrentPageId(UISwipeView::VERTICAL) == 2) { + // mainClockView->ClockAnimatorStart(); + // } if ((dialView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(NEW_DAIL)) && mainSwipeGroup->GetCurrentPageId(UISwipeView::VERTICAL) == 1) { dialView->PreLoad(); @@ -359,15 +358,15 @@ void MainViewSample::AnimatorStop(void) if (heartRateView != nullptr) { heartRateView->HeartbeatImageAnimatorStop(); } - if (mainClockView != nullptr) { - mainClockView->ClockAnimatorStop(); - } + // if (mainClockView != nullptr) { + // mainClockView->ClockAnimatorStop(); + // } } bool MainViewSample::IsMainView(void) { - if (mainSwipeGroup->GetCurrentPageId(0) == ScreenModels::GetInstance()->GetCardPage(WATCH_FACE) && + if (mainSwipeGroup->GetCurrentPageId(0) == ScreenModels::GetInstance()->GetCardPage(NEW_DAIL) && mainSwipeGroup->GetCurrentPageId(1) == 1) { // 0: horizontal; 1: vertical return true; } else { 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 0763f7388..cc19892d7 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/screensetting/include/ScreenModels.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/screensetting/include/ScreenModels.h @@ -23,12 +23,11 @@ namespace OHOS { typedef enum { - WATCH_FACE = 0, + NEW_DAIL = 0, HEART_RATE, COMPASS, ACTIVITY, MUSIC_PLAYER, - NEW_DAIL, MAX_CARD, } CardId;