删除测试打印
authorCaisking <3449750381@qq.com>
Wed, 10 Jan 2024 09:49:48 +0000 (17:49 +0800)
committerCaisking <3449750381@qq.com>
Wed, 10 Jan 2024 09:49:48 +0000 (17:49 +0800)
code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockView.cpp
code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
code/sdk/application/wearable/nativeapp/nativeui/screensetting/src/ScreenModels.cpp

index dd0c5aa..393ecdb 100644 (file)
@@ -152,7 +152,6 @@ namespace OHOS
         // 增加背景
         container_->Add(background);
         background->SetVisible(true);
-        PRINT_DEBUG_INFO
     }
     /*初始化表盘时钟*/
     // Function to create and add an image view
@@ -243,7 +242,7 @@ namespace OHOS
         cJSON *minute_coordinates = cJSON_GetObjectItem(minuteHand, "coordinates");
         cJSON *second_coordinates = cJSON_GetObjectItem(secondHand, "coordinates");
         const char *handspath = cJSON_GetObjectItem(cjson_json, "handspath")->valuestring;
-        PRINT_DEBUG_INFO
+
         signed short HOUR_POINT_POSITION_X = static_cast<signed short>(cJSON_GetObjectItem(hour_coordinates, "HOUR_POINT_POSITION_X")->valueint);
         signed short HOUR_POINT_POSITION_Y = static_cast<signed short>(cJSON_GetObjectItem(hour_coordinates, "HOUR_POINT_POSITION_Y")->valueint);
         signed short HOUR_POINT_CENTER_X = static_cast<signed short>(cJSON_GetObjectItem(hour_coordinates, "HOUR_POINT_CENTER_X")->valueint);
@@ -256,7 +255,7 @@ namespace OHOS
         signed short SECOND_POINT_POSITION_Y = static_cast<signed short>(cJSON_GetObjectItem(second_coordinates, "SECOND_POINT_POSITION_Y")->valueint);
         signed short SECOND_POINT_CENTER_X = static_cast<signed short>(cJSON_GetObjectItem(second_coordinates, "SECOND_POINT_CENTER_X")->valueint);
         signed short SECOND_POINT_CENTER_Y = static_cast<signed short>(cJSON_GetObjectItem(second_coordinates, "SECOND_POINT_CENTER_Y")->valueint);
-        PRINT_DEBUG_INFO
+
         // Add SweepClock to App
         if (sweepClock1_ == nullptr)
         {
@@ -272,9 +271,9 @@ namespace OHOS
         sweepClock1_->SetWorkMode(UISweepClock::WorkMode::NORMAL);
         Image *sweepClock1HourImage = new Image();
         std::string HourImagePath = std::string(handspath) + "hour.bin";
-        PRINT_DEBUG_INFO
+
         sweepClock1HourImage->SetSrc(HourImagePath.c_str());
-        PRINT_DEBUG_INFO
+
         sweepClock1_->SetHandImage(UISweepClock::HandType::HOUR_HAND, *sweepClock1HourImage, {HOUR_POINT_POSITION_X, HOUR_POINT_POSITION_Y}, {HOUR_POINT_CENTER_X, HOUR_POINT_CENTER_Y});
 
         Image *sweepClock1MinuteImage = new Image();
@@ -318,7 +317,7 @@ namespace OHOS
         {
             formattedDate = (day < 10 ? "0" : "") + std::to_string(day);
         }
-        PRINT_DEBUG_INFO
+
         // 添加其他显示格式的处理逻辑
 
         return formattedDate;
@@ -329,12 +328,12 @@ namespace OHOS
         cJSON *date = cJSON_GetObjectItem(cjson_json, "date");
         cJSON *textdisplay = cJSON_GetObjectItem(date, "textdisplay");
         cJSON *coordinates = cJSON_GetObjectItem(textdisplay, "coordinates");
-        PRINT_DEBUG_INFO
+
         // const char *font = cJSON_GetObjectItem(textdisplay, "font")->valuestring;
         int fontsize = cJSON_GetObjectItem(textdisplay, "fontsize")->valueint;
         int date_left = cJSON_GetObjectItem(coordinates, "left")->valueint;
         int date_top = cJSON_GetObjectItem(coordinates, "top")->valueint;
-        PRINT_DEBUG_INFO
+
         // Add Label to App
         if (dateLable == nullptr)
         {
@@ -343,13 +342,13 @@ namespace OHOS
         dateLable->SetPosition(date_left, date_top); // widget's left position and top position
         dateLable->SetViewId("label1");              // Set style
         dateLable->SetStyle(STYLE_TEXT_FONT, fontsize);
-        PRINT_DEBUG_INFO
+
         std::string dateStr = "2024-02-09";
 
         std::string displayformat = cJSON_GetObjectItem(textdisplay, "displayformat")->valuestring;
         // 调用日期格式化函数
         std::string formattedDate = FormatDate(dateStr, displayformat);
-        PRINT_DEBUG_INFO
+
         dateLable->SetText(formattedDate.c_str());
         dateLable->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);
         dateLable->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
@@ -359,7 +358,6 @@ namespace OHOS
         // Add to rootView
         container_->Add(dateLable);
         dateLable->SetVisible(true);
-        PRINT_DEBUG_INFO
     };
     void Digital_clockView ::Initweek()
     {
@@ -402,7 +400,6 @@ namespace OHOS
         // Add to rootView
         container_->Add(weekLable);
         weekLable->SetVisible(true);
-        PRINT_DEBUG_INFO
     };
     void Digital_clockView ::Initbattery()
     {
@@ -474,7 +471,6 @@ namespace OHOS
         progress1callback_ = new myProgressCallback(progress, batteryLable);
         progress1animator_ = new Animator(progress1callback_, progress, 10000, true);
         progress1animator_->Start();
-        PRINT_DEBUG_INFO
     };
     /* InitView:初始化界面*/
     bool Digital_clockView ::InitView()
@@ -487,7 +483,7 @@ namespace OHOS
         {
             std::string Dialtype = cJSON_GetObjectItem(cjson_json, "Dialtype")->valuestring;
             Initbackground();
-            PRINT_DEBUG_INFO
+
             if (Dialtype == "pointer")
             {
                 Initpointer();
@@ -501,10 +497,9 @@ namespace OHOS
             Initbattery();
             cJSON_Delete(cjson_json);
         }
-        PRINT_DEBUG_INFO
 
         Add(container_);
-        PRINT_DEBUG_INFO
+
         SetCoverable(true);
         PRINT_DEBUG_INFO
         return true;
@@ -515,7 +510,7 @@ namespace OHOS
         UIView *view = static_cast<UIViewGroup *>(container_)->GetChildrenHead();
         while (view != nullptr)
         {
-            PRINT_DEBUG_INFO
+
             UIView *tempView = view;
             view = view->GetNextSibling();
             if (tempView->GetParent())
@@ -581,7 +576,6 @@ namespace OHOS
         }
         delete container_;
         container_ = nullptr;
-        PRINT_DEBUG_INFO
     }
 
     void Digital_clockView::PreLoad(void)
@@ -592,8 +586,7 @@ namespace OHOS
         }
     }
 
-    void Digital_clockView::UnLoad(void) 
+    void Digital_clockView::UnLoad(void)
     {
-
     }
 }
index 155b04c..21b7103 100755 (executable)
@@ -253,7 +253,7 @@ void MainViewSample::OnStop()
 \r
 UICardPage *MainViewSample::InitWatchFacePage(void)\r
 {\r
-printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+\r
     mainClockView = new MainClockView();\r
     if (mainClockView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainClockView new fail");\r
@@ -264,7 +264,7 @@ printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);
 \r
 UICardPage *MainViewSample::InitHeartRatePage(void)\r
 {\r
-    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+    \r
     heartRateView = new HeartRateView();\r
     if (heartRateView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateView new fail");\r
@@ -275,7 +275,7 @@ UICardPage *MainViewSample::InitHeartRatePage(void)
 \r
 UICardPage *MainViewSample::InitActivityPage(void)\r
 {\r
-    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+    \r
     activityWeekView = new ActivityWeekView();\r
     if (activityWeekView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "activityWeekView new fail");\r
@@ -286,7 +286,7 @@ UICardPage *MainViewSample::InitActivityPage(void)
 \r
 UICardPage *MainViewSample::InitCompassPage(void)\r
 {\r
-    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+    \r
     compassControlView = new CompassControlView();\r
     if (compassControlView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "compassControlView new fail");\r
@@ -297,7 +297,7 @@ UICardPage *MainViewSample::InitCompassPage(void)
 \r
 UICardPage *MainViewSample::InitMusicPlayerPage(void)\r
 {\r
-    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+    \r
     playersView = new PlayersView();\r
     if (playersView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playersView new fail");\r
@@ -308,7 +308,7 @@ UICardPage *MainViewSample::InitMusicPlayerPage(void)
 \r
 UICardPage *MainViewSample::InitNewDialPage(void)\r
 {\r
-    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+    \r
     dialView = new Digital_clockView();\r
     if (dialView == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dialView new fail");\r
@@ -319,16 +319,16 @@ UICardPage *MainViewSample::InitNewDialPage(void)
 \r
 UICardPage *MainViewSample::CreatePage(int32_t StreamId)\r
 {\r
-    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+    \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
+           \r
         if (PageMapper[i].id == cardId) {\r
-            printf("--%d--\n",PageMapper[i].id);\r
+        \r
             view = (this->*(PageMapper[i].func))();\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CreatePage view:%p", view);\r
             return view;\r
@@ -341,19 +341,18 @@ UICardPage *MainViewSample::CreatePage(int32_t StreamId)
 \r
 void MainViewSample::AnimatorStart(int pageIndex)\r
 {\r
-    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+    \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
+        mainSwipeGroup->GetCurrentPageId(UISwipeView::VERTICAL) == 2) {\r
         mainClockView->ClockAnimatorStart();\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
+    if ((dialView != nullptr && pageIndex == ScreenModels::GetInstance()->GetCardPage(NEW_DAIL)) &&\r
+        mainSwipeGroup->GetCurrentPageId(UISwipeView::VERTICAL) == 1) {\r
+        dialView->PreLoad();\r
+    }\r
 }\r
 \r
 void MainViewSample::AnimatorStop(void)\r
@@ -368,7 +367,7 @@ void MainViewSample::AnimatorStop(void)
 \r
 bool MainViewSample::IsMainView(void)\r
 {\r
-    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+    \r
     if (mainSwipeGroup->GetCurrentPageId(0) == ScreenModels::GetInstance()->GetCardPage(WATCH_FACE) &&\r
         mainSwipeGroup->GetCurrentPageId(1) == 1) { // 0: horizontal; 1: vertical\r
         return true;\r
index 0b0bbb3..19b4d6b 100755 (executable)
@@ -45,7 +45,7 @@ bool ScreenModels::SetUpListCase(void)
 \r
 bool ScreenModels::InitCardConfig(void)\r
 {\r
-    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+    \r
     if (SetUpListCase() == false) {\r
         return false;\r
     }\r
@@ -55,7 +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
+        \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
@@ -81,7 +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
         }\r
         close(fd);\r
         return true;\r
@@ -91,7 +91,7 @@ bool ScreenModels::InitCardConfig(void)
 \r
 bool ScreenModels::SaveCardConfig(void)\r
 {\r
-    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+    \r
     int32_t fd = open(CARD_CONFIG_PATH, O_RDWR | O_CREAT, S_IRWXU);\r
     if (fd < 0) {\r
         close(fd);\r
@@ -107,20 +107,20 @@ bool ScreenModels::SaveCardConfig(void)
 \r
 void ScreenModels::SetCardConfigDefault(void)\r
 {\r
-    printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
+    \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
+        \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
+    \r
     ListNode<CardInfo> *node = listMainView->Begin();\r
     for (uint8_t i = 0; i < page; i++) {\r
         if (node->next_ != NULL) {\r