From: Caisking <3449750381@qq.com>
Date: Sun, 7 Apr 2024 02:29:41 +0000 (+0800)
Subject: 关闭屏幕资源管理
X-Git-Tag: release_V1.2.70_20241020_135402~1200^2~31
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=82f594bfb3dcee8b740e59f38a90aa201a8d8f29;p=mirrors%2FFD230.git

关闭屏幕资源管理
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp b/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
index 047597af6..fa29ba864 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
@@ -10,7 +10,7 @@
 #include "NativeAbility.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
-#include"language/font/ui_resource_string.h"
+#include "language/font/ui_resource_string.h"
 #include "MainViewSample.h"
 #include "ui_screennotify.h"
 
@@ -38,6 +38,7 @@ extern "C"
 
     static void ChangeToHomeView(void)
     {
+#if 0
         screen_context_t *sc = power_display_get_screen_context();
         uint16_t current_slice_id = OHOS::NativeAbility::GetInstance().GetCurSliceId();
         for (uint16_t i = 0; i < sizeof(ignore_slice_ids) / sizeof(uint16_t); i++)
@@ -68,6 +69,7 @@ extern "C"
                 }
             }
         }
+#endif
     }
 
     void notify_screen_on_event(void)
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingControlView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingControlView.h
new file mode 100644
index 000000000..f01eaa395
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingControlView.h
@@ -0,0 +1,34 @@
+// /*
+//  * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved.
+//  * Description: TrainingControlView.h
+//  * Author:
+//  * Create: 2022-04-02
+//  */
+
+// #ifndef Training_CONTROL_VIEW_H
+// #define Training_CONTROL_VIEW_H
+
+// #include "components/root_view.h"
+// #include "UiConfig.h"
+// #include "components/ui_card_page.h"
+// //#include "TrainingCalibrationView.h"
+// #include "TrainingView.h"
+
+// namespace OHOS {
+
+// class TrainingControlView : public UICardPage {
+// public:
+//     TrainingControlView();
+//     virtual ~TrainingControlView();
+//     bool InitView(void);
+//     void PreLoad(void) override;
+//     void UnLoad(void) override;
+// private:
+//     TrainingCalibrationView *TrainingCalibrationView{nullptr};
+//     TrainingView *TrainingView{nullptr};
+//     bool viewiInitStatus{false};
+
+//     void ClearAll(void);
+// };
+// }
+// #endif
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDataView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDataView.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp
index 049d89448..fc884799b 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp
@@ -35,10 +35,7 @@ namespace OHOS
 
     TraingMoreView::~TraingMoreView()
     {
-        if (viewInitStatus == true)
-        {
-            DeInitView();
-        }
+        DeInitView();
         g_pTraingMoreView = nullptr;
     }
 
@@ -102,10 +99,11 @@ namespace OHOS
     void TraingMoreView::DeInitView()
     {
         // scrollView-> RemoveAll();
-        RemoveAll();
+        scrollView->RemoveAll();
         delete title;
         title = nullptr;
 
+        TraingMoreList->RemoveAll();
         delete TraingMoreList;
         TraingMoreList = nullptr;