显示更新表盘

diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/ui_resource_image.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/ui_resource_image.h
index fd05160..20e72a4 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/ui_resource_image.h
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/ui_resource_image.h
@@ -54,6 +54,7 @@ namespace OHOS
     static const int CLOCK_THURSDAY_IMAGE_PATH = 0x300011;\r
     static const int CLOCK_SECONDHAND = 0x300012;\r
     static const int CLOCK_TUESDAY_IMAGE_PATH = 0x300013;\r
+    /* -------------------------------------------------------------------------- */\r
     static const int DROPDOWN_DROPDOWN_BLUETOOTH = 0x400001;\r
     static const int DROPDOWN_DROPDOWN_DN_DISTURB = 0x400002;\r
     static const int DROPDOWN_DROPDOWN_BLUETOOTH_B = 0x400003;\r

diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
index 629e195..3afa01a 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
@@ -455,6 +455,7 @@ void NativeLauncher::InitNativeLauncher() {
     // 初始化默认首页\r
     ScreenModels::GetInstance()->PreLoadAppimages();\r
     NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN_SAMPLE);\r
+    //Digital_clockView::GetInstance()->InitView();\r
 }\r
 \r
 void NativeLauncher::InitAllNativeSlices(void)\r

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 06ab15c..25e5347 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
@@ -165,7 +165,7 @@ namespace OHOS
             // 将小时和分钟转换为字符串，并更新 stringtime
             stringtime = (hour < 10 ? "0" : "") + std::to_string(hour) + ":" + (minute < 10 ? "0" : "") + std::to_string(minute);
             printf("Before updating images\n");
-            //printf("--%s：%s--\n", imageFolderPath.c_str(), stringtime.c_str());
+            // printf("--%s：%s--\n", imageFolderPath.c_str(), stringtime.c_str());
             updateImage(hour1, imageFolderPath.c_str(), stringtime.substr(0, 1));
             updateImage(hour2, imageFolderPath.c_str(), stringtime.substr(1, 1));
             updateImage(minute1, imageFolderPath.c_str(), stringtime.substr(3, 1));
@@ -223,8 +223,8 @@ namespace OHOS
         void Initdata();       // 初始化日期
         void Initweek();       // 初始化星期
         void Initbattery();    // 初始化电量
-        void PreLoad(void);
-
+        void PreLoad(void) override;
+        void UnLoad(void) override;
     private:
         TraingWinView *p_TraingWinView{nullptr};
         UIView::OnDragListener *draglistener{nullptr};

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 f9e4e7f..dd0c5aa 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
@@ -18,6 +18,8 @@
 #include <iomanip>   // 用于格式化输出
 #include <stdexcept> //异常处理
 
+#include "MainViewSample.h"
+
 #define PRINT_DEBUG_INFO printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);
 
 namespace OHOS
@@ -400,6 +402,7 @@ namespace OHOS
         // Add to rootView
         container_->Add(weekLable);
         weekLable->SetVisible(true);
+        PRINT_DEBUG_INFO
     };
     void Digital_clockView ::Initbattery()
     {
@@ -471,17 +474,15 @@ namespace OHOS
         progress1callback_ = new myProgressCallback(progress, batteryLable);
         progress1animator_ = new Animator(progress1callback_, progress, 10000, true);
         progress1animator_->Start();
+        PRINT_DEBUG_INFO
     };
     /* InitView:初始化界面*/
     bool Digital_clockView ::InitView()
     {
-        if (container_ == nullptr)
-        {
-            container_ = new UIViewGroup();
-            container_->SetPosition(0, 0);
-            container_->SetWidth(Screen::GetInstance().GetWidth());
-            container_->SetHeight(Screen::GetInstance().GetHeight());
-        }
+        container_ = new UIViewGroup();
+        container_->SetPosition(0, 0);
+        container_->SetWidth(Screen::GetInstance().GetWidth());
+        container_->SetHeight(Screen::GetInstance().GetHeight());
         if (loadJsonData(JosnfilePath))
         {
             std::string Dialtype = cJSON_GetObjectItem(cjson_json, "Dialtype")->valuestring;
@@ -495,13 +496,17 @@ namespace OHOS
             {
                 Initdigit();
             }
-                    
-            Initdata();           
-            Initweek();           
+            Initdata();
+            Initweek();
             Initbattery();
             cJSON_Delete(cjson_json);
         }
+        PRINT_DEBUG_INFO
+
+        Add(container_);
+        PRINT_DEBUG_INFO
         SetCoverable(true);
+        PRINT_DEBUG_INFO
         return true;
     }
     /* DeInit：删除组件*/
@@ -587,4 +592,8 @@ namespace OHOS
         }
     }
 
+    void Digital_clockView::UnLoad(void) 
+    {
+
+    }
 }

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 f0164a6..155b04c 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
@@ -140,9 +140,7 @@ void MainViewSample::OnStart()
     mainSwipeGroup->SetLoopState(true);\r
     mainSwipeGroup->EnableScreenCap(true);\r
     mainSwipeGroup->RegisterSwipeCallback(callback);\r
-    mainSwipeGroup->SetHorCurrentPage(mainClockView->GetViewIndex());\r
     mainSwipeGroup->SetHorCurrentPage(dialView->GetViewIndex());\r
-\r
     SetContainerView(mainSwipeGroup);\r
 }\r
 \r
@@ -255,7 +253,7 @@ void MainViewSample::OnStop()
 \r
 UICardPage *MainViewSample::InitWatchFacePage(void)\r
 {\r
-\r
+printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     mainClockView = new MainClockView();\r
     if (mainClockView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainClockView new fail");\r
@@ -266,6 +264,7 @@ UICardPage *MainViewSample::InitWatchFacePage(void)
 \r
 UICardPage *MainViewSample::InitHeartRatePage(void)\r
 {\r
+    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     heartRateView = new HeartRateView();\r
     if (heartRateView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateView new fail");\r
@@ -276,6 +275,7 @@ UICardPage *MainViewSample::InitHeartRatePage(void)
 \r
 UICardPage *MainViewSample::InitActivityPage(void)\r
 {\r
+    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     activityWeekView = new ActivityWeekView();\r
     if (activityWeekView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "activityWeekView new fail");\r
@@ -286,6 +286,7 @@ UICardPage *MainViewSample::InitActivityPage(void)
 \r
 UICardPage *MainViewSample::InitCompassPage(void)\r
 {\r
+    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     compassControlView = new CompassControlView();\r
     if (compassControlView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "compassControlView new fail");\r
@@ -296,6 +297,7 @@ UICardPage *MainViewSample::InitCompassPage(void)
 \r
 UICardPage *MainViewSample::InitMusicPlayerPage(void)\r
 {\r
+    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     playersView = new PlayersView();\r
     if (playersView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playersView new fail");\r
@@ -306,6 +308,7 @@ UICardPage *MainViewSample::InitMusicPlayerPage(void)
 \r
 UICardPage *MainViewSample::InitNewDialPage(void)\r
 {\r
+    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     dialView = new Digital_clockView();\r
     if (dialView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dialView new fail");\r
@@ -316,34 +319,41 @@ UICardPage *MainViewSample::InitNewDialPage(void)
 \r
 UICardPage *MainViewSample::CreatePage(int32_t StreamId)\r
 {\r
+    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     uint16_t i;\r
     UICardPage *view = nullptr;\r
     int32_t cardId = ScreenModels::GetInstance()->GetCardPage(StreamId);\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CreatePage cardId:%d", cardId);\r
     for (i = 0; i < sizeof(PageMapper) / sizeof(PageMapper[0]); i++) {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::CreatePage PageMapper[i].id=%d, cardId=%d, StreamId=%d", PageMapper[i].id, cardId, StreamId);\r
+            printf("MainViewSample::CreatePage PageMapper[i].id=%d, cardId=%d, StreamId=%d\n", PageMapper[i].id, cardId, StreamId);\r
         if (PageMapper[i].id == cardId) {\r
+            printf("--%d--\n",PageMapper[i].id);\r
             view = (this->*(PageMapper[i].func))();\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CreatePage view:%p", view);\r
             return view;\r
         }\r
     }\r
+\r
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreatePage view error!");\r
     return nullptr;\r
 }\r
 \r
 void MainViewSample::AnimatorStart(int pageIndex)\r
 {\r
+    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     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) == 1) {\r
+            printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
         mainClockView->ClockAnimatorStart();\r
     }\r
-    if (dialView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(NEW_DAIL)) {\r
-        dialView->PreLoad();\r
-    }\r
+    // if (dialView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(NEW_DAIL)) {\r
+    //     printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+    //     dialView->PreLoad();\r
+    // }\r
 }\r
 \r
 void MainViewSample::AnimatorStop(void)\r
@@ -358,6 +368,7 @@ void MainViewSample::AnimatorStop(void)
 \r
 bool MainViewSample::IsMainView(void)\r
 {\r
+    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     if (mainSwipeGroup->GetCurrentPageId(0) == ScreenModels::GetInstance()->GetCardPage(WATCH_FACE) &&\r
         mainSwipeGroup->GetCurrentPageId(1) == 1) { // 0: horizontal; 1: vertical\r
         return true;\r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp b/code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp
index eb7185b..0b0bbb3 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp
@@ -45,6 +45,7 @@ bool ScreenModels::SetUpListCase(void)
 \r
 bool ScreenModels::InitCardConfig(void)\r
 {\r
+    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     if (SetUpListCase() == false) {\r
         return false;\r
     }\r
@@ -54,6 +55,7 @@ bool ScreenModels::InitCardConfig(void)
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitCardConfig2");\r
     struct CardInfo cardInfoData;\r
     if (fd < 0) {\r
+        printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitCardConfig open fail");\r
         fd = open(CARD_CONFIG_PATH, O_RDWR | O_CREAT, S_IRWXU);\r
         if (fd < 0) {\r
@@ -79,6 +81,7 @@ bool ScreenModels::InitCardConfig(void)
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Init Read GlobalHealthToFile fail");\r
             }\r
             listMainView->PushBack(cardInfoData);\r
+            printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
         }\r
         close(fd);\r
         return true;\r
@@ -88,6 +91,7 @@ bool ScreenModels::InitCardConfig(void)
 \r
 bool ScreenModels::SaveCardConfig(void)\r
 {\r
+    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     int32_t fd = open(CARD_CONFIG_PATH, O_RDWR | O_CREAT, S_IRWXU);\r
     if (fd < 0) {\r
         close(fd);\r
@@ -103,17 +107,20 @@ bool ScreenModels::SaveCardConfig(void)
 \r
 void ScreenModels::SetCardConfigDefault(void)\r
 {\r
+    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     int16_t i;\r
     struct CardInfo cardInfoData;\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetCardConfigDefault");\r
     for (i = 0; i < MAX_CARD; i++) {\r
         cardInfoData.cardId = i;\r
+        printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
         listMainView->PushBack(cardInfoData);\r
     }\r
 }\r
 \r
 int16_t ScreenModels::GetCardPage(uint16_t page)\r
 {\r
+    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
     ListNode<CardInfo> *node = listMainView->Begin();\r
     for (uint8_t i = 0; i < page; i++) {\r
         if (node->next_ != NULL) {\r