删除原有表盘
authorCaisking <3449750381@qq.com>
Mon, 15 Jan 2024 08:46:57 +0000 (16:46 +0800)
committerCaisking <3449750381@qq.com>
Mon, 15 Jan 2024 08:46:57 +0000 (16:46 +0800)
code/sdk/application/wearable/nativeapp/nativeui/main/include/MainViewSample.h
code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
code/sdk/application/wearable/nativeapp/nativeui/screensetting/include/ScreenModels.h

index 02862a9..6e8527a 100755 (executable)
@@ -1,3 +1,13 @@
+/*** \r
+ * @Author: Caisking 3449750381@qq.com\r
+ * @Date: 2023-12-12 16:55:29\r
+ * @LastEditors: Caisking 3449750381@qq.com\r
+ * @LastEditTime: 2024-01-15 16:40:09\r
+ * @FilePath: /1.FD230/FD230/code/sdk/application/wearable/nativeapp/nativeui/main/include/MainViewSample.h\r
+ * @Description: \r
+ * @\r
+ * @Copyright (c) 2024 by Caisking , All Rights Reserved. \r
+ */\r
 /*\r
  * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.\r
  * Description: MainViewSample\r
@@ -69,7 +79,7 @@ private:
     PullUpDownView *dropDownView{nullptr};\r
     UICardPage *messageView{nullptr};\r
     UILabel *messageLable{nullptr};\r
-    MainClockView *mainClockView{nullptr};\r
+    Digital_clockView *mainClockView{nullptr};\r
     ActivityWeekView *activityWeekView{nullptr};\r
     PlayersView *playersView{nullptr};\r
     CompassControlView *compassControlView{nullptr};\r
index a56a701..212d5b3 100755 (executable)
@@ -24,7 +24,6 @@ struct MainViewMapper {
 };\r
 \r
 static const MainViewMapper PageMapper[] = {\r
-    {WATCH_FACE, &MainViewSample::InitWatchFacePage},\r
     {HEART_RATE, &MainViewSample::InitHeartRatePage},\r
     {COMPASS, &MainViewSample::InitCompassPage},\r
     {ACTIVITY, &MainViewSample::InitActivityPage},\r
@@ -253,7 +252,7 @@ void MainViewSample::OnStop()
 \r
 UICardPage *MainViewSample::InitWatchFacePage(void)\r
 {\r
-    mainClockView = new MainClockView();\r
+    mainClockView = new Digital_clockView();\r
     if (mainClockView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainClockView new fail");\r
         return nullptr;\r
@@ -344,10 +343,10 @@ void MainViewSample::AnimatorStart(int pageIndex)
     if (heartRateView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(HEART_RATE)) {\r
         heartRateView->HeartbeatImageAnimatorStart();\r
     }\r
-    if ((mainClockView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(WATCH_FACE)) &&\r
-        mainSwipeGroup->GetCurrentPageId(UISwipeView::VERTICAL) == 2) {\r
-        mainClockView->ClockAnimatorStart();\r
-    }\r
+    // if ((mainClockView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(WATCH_FACE)) &&\r
+    //     mainSwipeGroup->GetCurrentPageId(UISwipeView::VERTICAL) == 2) {\r
+    //     mainClockView->ClockAnimatorStart();\r
+    // }\r
     if ((dialView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(NEW_DAIL)) &&\r
         mainSwipeGroup->GetCurrentPageId(UISwipeView::VERTICAL) == 1) {\r
         dialView->PreLoad();\r
@@ -359,15 +358,15 @@ void MainViewSample::AnimatorStop(void)
     if (heartRateView != nullptr) {\r
         heartRateView->HeartbeatImageAnimatorStop();\r
     }\r
-    if (mainClockView != nullptr) {\r
-        mainClockView->ClockAnimatorStop();\r
-    }\r
+    // if (mainClockView != nullptr) {\r
+    //     mainClockView->ClockAnimatorStop();\r
+    // }\r
 }\r
 \r
 bool MainViewSample::IsMainView(void)\r
 {\r
     \r
-    if (mainSwipeGroup->GetCurrentPageId(0) == ScreenModels::GetInstance()->GetCardPage(WATCH_FACE) &&\r
+    if (mainSwipeGroup->GetCurrentPageId(0) == ScreenModels::GetInstance()->GetCardPage(NEW_DAIL) &&\r
         mainSwipeGroup->GetCurrentPageId(1) == 1) { // 0: horizontal; 1: vertical\r
         return true;\r
     } else {\r
index 0763f73..cc19892 100755 (executable)
 \r
 namespace OHOS {\r
 typedef enum {\r
-    WATCH_FACE = 0,\r
+    NEW_DAIL = 0,\r
     HEART_RATE,\r
     COMPASS,\r
     ACTIVITY,\r
     MUSIC_PLAYER,\r
-    NEW_DAIL,\r
     MAX_CARD,\r
 } CardId;\r
 \r