修复训练界面死机问题

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
index 3e7eb93..cf134e5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -293,10 +293,12 @@ namespace OHOS
     {
         if (view_->GetHorCurrentPage() == COMPASS)
         {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COMPASS");
             SetCompassRotate();
         }
         else if (view_->GetHorCurrentPage() == MUSIC_PLAYER)
         {
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MUSIC_PLAYER");
             SetCircleProgress();
         }
         else if (view_->GetHorCurrentPage() == WATCH_FACE)
@@ -310,7 +312,8 @@ namespace OHOS
         }
         else if (view_->GetHorCurrentPage() == BloodOxygen)
         {
-            BloodCardView::GetInstance()->UpSPO2data();
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView");
+            // BloodCardView::GetInstance()->UpSPO2data();
         }
     }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
index 17e5283..a7c4fcb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -32,7 +32,7 @@ namespace OHOS
         {BloodOxygen, &MainViewSample::InitBloodOxygenPage},
         {TRAINING, &MainViewSample::InitTrainingPage},
         {COMPASS, &MainViewSample::InitCompassPage},
-        //{WEATHER, &MainViewSample::InitWeatherPage},
+        {WEATHER, &MainViewSample::InitWeatherPage},
         {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
 #if 0
         {APPLIST,&MainViewSample::InitApplistPage}

diff --git a/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h b/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h
index 5804c04..b91515d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h
@@ -21,7 +21,7 @@ namespace OHOS
         TRAINING,
         BloodOxygen,
         COMPASS,
-        //WEATHER,
+        WEATHER,
         MUSIC_PLAYER,
         // APPLIST,
         MAX_CARD,

diff --git a/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp b/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
index 8b593c1..0681054 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/screensetting/src/ScreenModels.cpp
@@ -199,7 +199,7 @@ namespace OHOS
         LoadAppMultiImages(DROPDOWN_IAMGES, DROPDOWN_BLUETOOTHCONNECTED, DROPDOWN_SETTING);
         LoadAppMultiImages(HEART_IAMGES, HEART_HEARTRATECOOR, HEART_HEARTRATE_TOP);
         LoadAppMultiImages(BLOOD_IAMGES, BLOODOXYGEN_BACKGOUND, BLOODOXYGEN_BACKGOUND);
-        LoadAppMultiImages(TRAINING_IAMGES, TRAINING_BOUTTONGROUND, TRAINING_WALKING_BIG);
+        //LoadAppMultiImages(TRAINING_IAMGES, TRAINING_BOUTTONGROUND, TRAINING_WALKING_BIG);
         LoadAppMultiImages(MESSAGE_IAMGES, MESSAGE_MESSAGE, MESSAGE_WECHAT);
     }
 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
index 86c1c43..f447c9d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
@@ -189,11 +189,9 @@ namespace OHOS
 \r
     void TraingView::DeInit()\r
     {\r
-        UIImageView *imageViews[] = {image1, image2, image3, imagemore};\r
+        UIImageView *imageViews[] = {image1, image2, image3};\r
         UIButton *buttons[] = {ButtonMore, Button1, Button3, Button2};\r
 \r
-        RemoveAll();\r
-\r
         for (auto &imageView : imageViews)\r
         {\r
             if (imageView != nullptr)\r
@@ -226,18 +224,18 @@ namespace OHOS
             InitView();\r
             viewiInitStatus = true;\r
         }\r
-        if (!resLoadStatus)\r
-        {\r
-            resLoadStatus = true;\r
-        }\r
+        // if (!resLoadStatus)\r
+        // {\r
+        //     resLoadStatus = true;\r
+        // }\r
     }\r
 \r
     void TraingView::UnLoad(void)\r
     {\r
-        if (resLoadStatus)\r
-        {\r
-            //ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES);\r
-            resLoadStatus = false;\r
-        }\r
+        // if (resLoadStatus)\r
+        // {\r
+        //     //ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES);\r
+        //     resLoadStatus = false;\r
+        // }\r
     }\r
 }\r