主界面卡片优化

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/goal/src/goalControlView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/goal/src/goalControlView.cpp
index 5f1e157..c3aeaef 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/goal/src/goalControlView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/goal/src/goalControlView.cpp
@@ -29,11 +29,6 @@ namespace OHOS
         if (viewiInitStatus == true)
         {
             RemoveAll();
-            if (goalOnSwipeListener != nullptr)
-            {
-                delete goalOnSwipeListener;
-                goalOnSwipeListener = nullptr;
-            }
             if (maingoalView != nullptr)
             {
                 delete maingoalView;
@@ -51,8 +46,6 @@ namespace OHOS
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherView::new mainweatherView fail!");
             return false;
         }
-
-      
         UISwipeView *goalSwipView = dynamic_cast<UISwipeView *>(maingoalView->GetGoalPageView());
         if (goalSwipView == nullptr)
         {
@@ -60,13 +53,6 @@ namespace OHOS
             return false;
         }
 
-        goalOnSwipeListener = static_cast<UISwipeView::OnSwipeListener *>(new GoalControlViewOnSwipeListener());
-        if (goalOnSwipeListener == nullptr)
-        {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "weatherOnSwipeListener new fail");
-            return false;
-        }
-        goalSwipView->SetOnSwipeListener(goalOnSwipeListener);
         Add(goalSwipView);
        
         return true;

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepCardView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepCardView.cpp
index 780d285..81411d4 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepCardView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepCardView.cpp
@@ -33,22 +33,8 @@ namespace OHOS
             RemoveAll();\r
             if (sleepcontrolView != nullptr)\r
             {\r
-                if (sleepOnSwipeListener != nullptr)\r
-                {\r
-                    delete sleepOnSwipeListener;\r
-                    sleepOnSwipeListener = nullptr;\r
-                }\r
-\r
-                if (sleepcontrolView != nullptr)\r
-                {\r
-                    delete sleepcontrolView;\r
-                    sleepcontrolView = nullptr;\r
-                }\r
-                if(SleepSwipView)\r
-                {\r
-                    delete SleepSwipView;\r
-                    SleepSwipView = nullptr;\r
-                }\r
+                delete sleepcontrolView;\r
+                sleepcontrolView = nullptr;\r
             }\r
         }\r
     }\r
@@ -70,13 +56,6 @@ namespace OHOS
             return false;\r
         }\r
 \r
-        sleepOnSwipeListener = static_cast<UISwipeView::OnSwipeListener *>(new SleepOnSwipeListener());\r
-        if (sleepOnSwipeListener == nullptr)\r
-        {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sleepOnSwipeListener new fail");\r
-            return false;\r
-        }\r
-        SleepSwipView->SetOnSwipeListener(sleepOnSwipeListener);\r
         Add(SleepSwipView);\r
 \r
         return true;\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp
index 35ff527..a745624 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp
@@ -104,7 +104,6 @@ namespace OHOS
     void SleepControlPresenter::OnSwipe(UISwipeView &view) {}
     void SleepOnSwipeListener::OnSwipe(UISwipeView &view)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepOnSwipeListener::OnSwipe,current tab index = %d", view.GetCurrentPage());
         return;
     }
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlView.cpp
index edc2a79..8474ff7 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlView.cpp
@@ -40,24 +40,32 @@ namespace OHOS
     {
         if (SleepSwipeViewList != nullptr)
         {
-            for (int32_t i = 0; i < maxPage; i++)
-            {
-                recordCard[i] = nullptr;
-            }
-            
             SleepSwipeViewList->RemoveAll();
+            delete SleepSwipeViewList;
+            SleepSwipeViewList = nullptr;
 
-            delete sleepView;
-            sleepView = nullptr;
+            if (sleepView != nullptr)
+            {
+                delete sleepView;
+                sleepView = nullptr;
+            }
 
-            delete sleeptimeView;
-            sleeptimeView = nullptr;
+            if (sleeptimeView != nullptr)
+            {
+                delete sleeptimeView;
+                sleeptimeView = nullptr;
+            }
 
-            delete sleepnapView;
-            sleepnapView = nullptr;
+            if (sleepnapView != nullptr)
+            {
+                delete sleepnapView;
+                sleepnapView = nullptr;
+            }
 
-            delete SleepSwipeViewList;
-            SleepSwipeViewList = nullptr;
+            for (int32_t i = 0; i < maxPage; i++)
+            {
+                recordCard[i] = nullptr;
+            }
         }
     }
     /*初始化主睡眠界面VIEW*/

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/weather/src/WeatherControlView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/weather/src/WeatherControlView.cpp
index 867efa3..64ec0b0 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/weather/src/WeatherControlView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/weather/src/WeatherControlView.cpp
@@ -35,9 +35,6 @@ namespace OHOS
         if (viewiInitStatus == true)
         {
             RemoveAll();
-            delete weatherOnSwipeListener;
-            weatherOnSwipeListener = nullptr;
-
             delete mainWeatherView;
             mainWeatherView = nullptr;
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherControlView::ClearAll success!!");
@@ -73,17 +70,6 @@ namespace OHOS
             }
         }
 
-        if (weatherOnSwipeListener == nullptr)
-        {
-            weatherOnSwipeListener = static_cast<UISwipeView::OnSwipeListener *>(new WeatherControlViewOnSwipeListener());
-            if (weatherOnSwipeListener == nullptr)
-            {
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "weatherOnSwipeListener new fail");
-                return false;
-            }
-        }
-
-        // weatherSwipView->SetOnSwipeListener(weatherOnSwipeListener);
         weatherSwipView->SetVisible(false);
         Add(weatherSwipView);