From: luozheng <1732036298@qq.com> Date: Fri, 28 Jun 2024 07:49:47 +0000 (+0800) Subject: 主界面切换释放Imagecach X-Git-Tag: release_V1.2.70_20241020_135402~928^2~2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=aa78355354465698722b8648a389762ee5716939;p=mirrors%2FFD230.git 主界面切换释放Imagecach --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassView.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassView.cpp index 96cb297fb..dd8329f6b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassView.cpp @@ -104,8 +104,10 @@ void CompassView::SetResLoadStatus(bool state) { resLoadStatus = state; } +/*预加载指南针图片资源*/ void CompassView::PreLoadCompassImageRes(void) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassView::PreLoadCompassImageRes"); if(!GetResLoadStatus()){ if (LoadCompassImage(backGround, COMPASS_COMPASS0) == false) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], triangulation load fail", __LINE__); @@ -122,8 +124,10 @@ void CompassView::PreLoadCompassImageRes(void) SetResLoadStatus(true); } } +/*卸载指南针图片资源*/ void CompassView::UnLoadCompassImageRes(void) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassView::UnLoadCompassImageRes"); if(GetResLoadStatus()) { ImageInfo* image = nullptr; diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp index 42fe44b96..371aa602a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp @@ -18,14 +18,14 @@ namespace OHOS BloodCardView::BloodCardView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView::BloodCardView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BloodCardView::BloodCardView"); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); g_pBloodCardView = this; } BloodCardView::~BloodCardView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView::~BloodCardView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BloodCardView::~BloodCardView"); DeInit(); g_pBloodCardView = nullptr; } @@ -204,6 +204,7 @@ namespace OHOS */ void BloodCardView::DeInit() { + UnLoadBloodImageRes(); RemoveAll(); if (background != nullptr) { @@ -237,14 +238,10 @@ namespace OHOS } } /* -------------------------------------------------------------------------- */ - void BloodCardView::PreLoad(void) + /*预加载血氧图片资源*/ + void BloodCardView::PreLoadBloodImageRes(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView::PreLoad"); - if (!viewiInitStatus) - { - InitView(); - viewiInitStatus = true; - } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView::PreLoadBloodImageRes"); if (!resLoadStatus) { ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(BLOODOXYGEN_BACKGOUND, BLOOD_IAMGES); @@ -257,10 +254,11 @@ namespace OHOS resLoadStatus = true; } } - - void BloodCardView::UnLoad(void) + + /*卸载血氧图片资源*/ + void BloodCardView::UnLoadBloodImageRes(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView::UnLoad"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView::UnLoadBloodImageRes"); if (resLoadStatus) { ImageInfo *img = nullptr; @@ -269,5 +267,22 @@ namespace OHOS resLoadStatus = false; } } + + void BloodCardView::PreLoad(void) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView::PreLoad"); + if (!viewiInitStatus) + { + InitView(); + viewiInitStatus = true; + } + PreLoadBloodImageRes(); + } + + void BloodCardView::UnLoad(void) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView::UnLoad"); + UnLoadBloodImageRes(); + } /* -------------------------------------------------------------------------- */ } diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.h index 6751d5556..66bb6a66b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.h @@ -46,6 +46,9 @@ namespace OHOS void UpSPO2Text(); + private: + void PreLoadBloodImageRes(void); + void UnLoadBloodImageRes(void); private: UIView::OnDragListener *draglistener{nullptr}; BloodCardView(BloodCardView &&) = delete; diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartRateView.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartRateView.h index 11d02cc14..de7245c73 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartRateView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartRateView.h @@ -77,6 +77,8 @@ private: Point heartRateData[HEART_AVE_NUM]; Point rateDataTmp[HEART_AVE_NUM]; + void PreLoadHeartRateImageRes(void); + void UnLoadHeartRateImageRes(void); bool viewiInitStatus{false}; bool resLoadStatus{false}; UIChartPolyline *chart{nullptr}; diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp index c9f4fb830..e4e010089 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp @@ -147,6 +147,7 @@ namespace OHOS { int32_t i; RemoveAll(); + UnLoadHeartRateImageRes(); delete imageViewCoordinate; imageViewCoordinate = nullptr; @@ -590,7 +591,7 @@ namespace OHOS bool HeartRateView::InitView(void) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartRateView::HeartRateView::InitView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartRateView::InitView"); HeartRateDataProc(); HeartRateLabelDisplay(); HeartbeatImageAnimator(); @@ -603,16 +604,10 @@ namespace OHOS return true; } - void HeartRateView::PreLoad(void) + /*预加载心率图片资源*/ + void HeartRateView::PreLoadHeartRateImageRes(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartRateView::PreLoad"); - if (!viewiInitStatus) - { - if (InitView()) - { - viewiInitStatus = true; - } - } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartRateView::PreLoadHeartRateImageRes"); if (!resLoadStatus) { ScreenModels::GetInstance()->LoadAppImages(HEART_IAMGES, imageViewTop, HEART_HEARTRATE_TOP); @@ -621,10 +616,11 @@ namespace OHOS resLoadStatus = true; } } - - void HeartRateView::UnLoad(void) + + /*卸载心率图片资源*/ + void HeartRateView::UnLoadHeartRateImageRes(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartRateView::UnLoad"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartRateView::UnLoadHeartRateImageRes"); if (resLoadStatus) { ImageInfo *img = nullptr; @@ -639,6 +635,25 @@ namespace OHOS } } + void HeartRateView::PreLoad(void) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartRateView::PreLoad"); + if (!viewiInitStatus) + { + if (InitView()) + { + viewiInitStatus = true; + } + } + PreLoadHeartRateImageRes(); + } + + void HeartRateView::UnLoad(void) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartRateView::UnLoad"); + UnLoadHeartRateImageRes(); + } + void HeartRateView::InitRefreshInterface(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartRateView::HeartRateView::InitRefreshInterface"); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h index 2d4f89430..905d4e8d3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-17 15:26:49 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-26 19:51:48 + * @LastEditTime: 2024-06-28 14:30:04 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/PullUpDownView.h */ /* @@ -93,6 +93,9 @@ namespace OHOS void UpdateCat1NoSignalisplay(bool state); void UpdateCat14GDisplay(bool state); + void PreLoadPullUpDownImageRes(void); + void UnLoadPullUpDownImageRes(void); + private: ConnectedStatusView *connectedStatusView{nullptr}; 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 d662e704d..9fb68c014 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp @@ -437,6 +437,7 @@ namespace OHOS } return bloodView; } + // 主界面训练卡片 UICardPage *MainViewSample::InitTrainingPage(void) { @@ -463,6 +464,7 @@ namespace OHOS return weatherControlView; } + //主界面每日目标卡片 UICardPage *MainViewSample::InitGoalPage(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitWeatherPage"); @@ -474,6 +476,7 @@ namespace OHOS } return GoalControlView; } + // 主界面心率卡片 UICardPage *MainViewSample::InitHeartRatePage(void) { @@ -486,7 +489,8 @@ namespace OHOS } return heartRateView; } - // 运动界面 + + // 主界面运动卡片 UICardPage *MainViewSample::InitActivityPage(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitActivityPage"); @@ -498,6 +502,7 @@ namespace OHOS } return activityWeekView; } + /*主界面设置卡片*/ UICardPage *MainViewSample::InitSetMainPage(void) { @@ -510,6 +515,7 @@ namespace OHOS } return setmainView; } + /*主界面睡眠卡片*/ UICardPage *MainViewSample::InitSleepPage(void) { @@ -522,6 +528,7 @@ namespace OHOS } return sleepView; } + void MainViewSample::SetPage(int16_t page) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::SetPage"); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp index e55e70ac0..b9bb68b9d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp @@ -173,6 +173,7 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAll"); RemoveAll(); + UnLoadPullUpDownImageRes(); //切换slice的时候也要卸载资源放在ImageCach空间不够 if (group[DROPDOWNVIEW] != nullptr) { group[DROPDOWNVIEW]->RemoveAll(); @@ -919,15 +920,10 @@ namespace OHOS return true; } - void PullUpDownView::PreLoad(void) + /*预加载下拉视图的图片资源*/ + void PullUpDownView::PreLoadPullUpDownImageRes(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::PreLoad"); - if (!viewiInitStatus) - { - PullUpDownViewInit(); - viewiInitStatus = true; - } - + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::PreLoadPullUpDownImageRes"); if (!resLoadStatus) { /* -------------------------------------------------------------------------- */ @@ -964,9 +960,10 @@ namespace OHOS } } - void PullUpDownView::UnLoad(void) + /*卸载下拉视图的图片资源*/ + void PullUpDownView::UnLoadPullUpDownImageRes(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::UnLoad"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::UnLoadPullUpDownImageRes"); if (resLoadStatus) { ImageInfo *img = nullptr; @@ -1011,6 +1008,24 @@ namespace OHOS } } + void PullUpDownView::PreLoad(void) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::PreLoad"); + if (!viewiInitStatus) + { + PullUpDownViewInit(); + viewiInitStatus = true; + } + + PreLoadPullUpDownImageRes(); + } + + void PullUpDownView::UnLoad(void) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::UnLoad"); + UnLoadPullUpDownImageRes(); + } + // 更新手机连接状态 void PullUpDownView::UpdatePhoneStatus(int status) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp index 549029069..4fe343c79 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageCardView.cpp @@ -63,7 +63,7 @@ namespace OHOS // 初始化页面 bool MessageCardView::InitPage(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitPage is begin"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitPage is begin"); /*初始化label*/ InitLabelExt(title, 83, 50, 300, 35, "labletitle", STR_MESSAGE_NOTIFICATION, DEFAULT_VECTOR_FONT_FILENAME, 30); Add(title); @@ -103,7 +103,7 @@ namespace OHOS /*删除按键*/ int top = MessageList->GetWidth() + 130; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "top %d", top); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "top %d", top); InitButtonExt(DeleteButton, 43, top, 380, 100, DELETEALLDATA, STR_CLEANALL, 30); DeleteButton->SetOnClickListener((UIView::OnClickListener *)OHOS::MessageControlPresenter::GetInstance()); Add(DeleteButton); @@ -111,7 +111,7 @@ namespace OHOS SetDraggable(false); SetTouchable(false); initViewStatus = true; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitPage is end"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitPage is end"); return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp index 068539ca1..4dd68bac0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp @@ -14,14 +14,14 @@ namespace OHOS static MessageControlView *g_pMessageControlView{nullptr}; MessageControlView::MessageControlView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageControlView::MessageControlView()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageControlView::MessageControlView()"); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); g_pMessageControlView = this; } MessageControlView::~MessageControlView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageControlView::~MessageControlView()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageControlView::~MessageControlView()"); if (viewiInitStatus) { ClearAll(); @@ -51,7 +51,7 @@ namespace OHOS bool MessageControlView::InitView(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageControlView InitView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageControlView InitView"); messageLackView = new MessageLackView(); if (messageLackView == nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h index 5611e5b71..66cdbf906 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h @@ -87,8 +87,8 @@ public: return p_PlayerListDelSongView; } private: - void playerResPreLoad(void); - void playerResUnLoad(void); + void PreLoadPlayerImageRes(void); + void UnLoadPlayerImageRes(void); private: bool InitBackGround(void); void TearDownView(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp index 0fee6962d..fa1d101b4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp @@ -36,6 +36,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::~PlayersView"); if (viewiInitStatus == true) { + UnLoadPlayerImageRes(); state = GetPlayerButtonState(); if (state == UICheckBox::UICheckBoxState::SELECTED) { @@ -931,13 +932,13 @@ namespace OHOS viewiInitStatus = true; } } - playerResPreLoad(); + PreLoadPlayerImageRes(); } void PlayersView::UnLoad(void) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::UnLoad"); - playerResUnLoad(); + UnLoadPlayerImageRes(); } // 加载音乐图片 bool PlayersView::LoadPlayerImage(UIImageView *view, uint32_t resId) @@ -966,9 +967,10 @@ namespace OHOS return true; } - - void PlayersView::playerResPreLoad(void) + /*预加载音乐播放器资源*/ + void PlayersView::PreLoadPlayerImageRes(void) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::playerResPreLoad"); if(!resLoadStatus) { if (LoadPlayerImage(soundButton, PLAYER_MUSIC_VOICE) == false) @@ -1028,8 +1030,10 @@ namespace OHOS } } - void PlayersView::playerResUnLoad(void) + /*卸载音乐播放器资源*/ + void PlayersView::UnLoadPlayerImageRes(void) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::playerResUnLoad"); if(resLoadStatus) { ImageInfo *image = nullptr;