From 99a465694d1bb38fdbb57230ff1d8db47ce99dfc Mon Sep 17 00:00:00 2001 From: Caisking Date: Mon, 21 Jul 2025 17:52:30 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E5=8A=A8=E6=9B=B4?= =?utf8?q?=E5=A4=9A=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../include/TraingMorePresenter.h | 2 - .../include/TraingMoreView.h | 2 +- .../src/TraingMorePresenter.cpp | 28 +++-------- .../training_list_more/src/TraingMoreView.cpp | 49 ++++++++++--------- 4 files changed, 36 insertions(+), 45 deletions(-) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/include/TraingMorePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/include/TraingMorePresenter.h index 20f11232a..2ac392501 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/include/TraingMorePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/include/TraingMorePresenter.h @@ -33,8 +33,6 @@ namespace OHOS virtual ~TraingMorePresenter(); void OnStart() override; - void OnPause() override; - void OnResume() override; void OnStop() override; void NavigateBack(); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/include/TraingMoreView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/include/TraingMoreView.h index 4b61080c6..69aea522d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/include/TraingMoreView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/include/TraingMoreView.h @@ -28,7 +28,7 @@ public: UIList *GetList(); void AddToTraingMoreList(const TraingMoreItem &item); - + void RefreshTraingMoreList(const TraingMoreItem *itemInfo); private: void InitView(void); void InitList(); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp index f56ca47c6..95a10268e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp @@ -52,33 +52,21 @@ namespace OHOS void TraingMorePresenter::OnStart() { p_TraingMoreModel->InitTraingMoreListItem(); - Presenter::OnStart(); - } - - void TraingMorePresenter::OnPause(void) - { - Presenter::OnPause(); - } - - void TraingMorePresenter::OnResume(void) - { if (view_ == nullptr) { return; } + const TraingMoreItem *itemInfo = p_TraingMoreModel->GetTraingMorelistItems(); - for (int i = 0; i < p_TraingMoreModel->GetTraingMoreListNum(); i++) - { - view_->AddToTraingMoreList(itemInfo[i]); - } - Presenter::OnResume(); + + view_->RefreshTraingMoreList(itemInfo); + } - - void TraingMorePresenter::OnStop(void) - { - - Presenter::OnStop(); + void TraingMorePresenter::OnStop(void) + { + Presenter::OnStop(); } + void TraingMorePresenter::NavigateBack() { uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMoreView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMoreView.cpp index dae490569..de8c34b29 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMoreView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMoreView.cpp @@ -14,9 +14,10 @@ static TraingMoreView *g_pTraingMoreView{nullptr}; TraingMoreView::TraingMoreView() { g_pTraingMoreView = this; } -TraingMoreView::~TraingMoreView() { +TraingMoreView::~TraingMoreView() { DeInitView(); - g_pTraingMoreView = nullptr; } + g_pTraingMoreView = nullptr; +} TraingMoreView *TraingMoreView::GetInstance() { return g_pTraingMoreView; } @@ -30,7 +31,7 @@ void TraingMoreView::SetKeyActListener() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener"); auto keyActListener = static_cast( TraingMorePresenter::GetInstance()); - RootView::GetInstance()->SetOnKeyActListener(keyActListener); + RootView::GetInstance()->SetOnKeyActListener(keyActListener); } void TraingMoreView::InitScrollView() { @@ -45,6 +46,7 @@ void TraingMoreView::InitScrollView() { scrollView->SetHorizontalScrollState(false); scrollView->SetOnDragListener(presenter_); scrollView->SetYScrollBarVisible(true); + AddViewToRootContainer(scrollView); } void TraingMoreView::InitList() { @@ -76,20 +78,19 @@ void TraingMoreView::InitView() { void TraingMoreView::DeInitView() { if (viewInitStatus) { - if (scrollView) { - scrollView->RemoveAll(); - if (p_TraingMoreListAdapter) { - delete p_TraingMoreListAdapter; - p_TraingMoreListAdapter = nullptr; - } - if (TraingMoreList) { - delete TraingMoreList; - TraingMoreList = nullptr; - } - delete scrollView; - scrollView = nullptr; + if (scrollView) { + scrollView->RemoveAll(); + if (p_TraingMoreListAdapter) { + delete p_TraingMoreListAdapter; + p_TraingMoreListAdapter = nullptr; + } + if (TraingMoreList) { + delete TraingMoreList; + TraingMoreList = nullptr; } - + delete scrollView; + scrollView = nullptr; + } } } @@ -104,17 +105,21 @@ void TraingMoreView::OnStart() { PreLoad(); - if (scrollView && TraingMoreList) { scrollView->Add(TraingMoreList); scrollView->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); - AddViewToRootContainer(scrollView); - if (p_TraingMoreListAdapter) { - TraingMoreList->SetAdapter(p_TraingMoreListAdapter); - } - } } +void TraingMoreView::RefreshTraingMoreList(const TraingMoreItem *itemInfo) { + for (uint8_t i = 0; i < TraingMoreModel::GetInstance().GetTraingMoreListNum(); + i++) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, + "SettingPresenter::OnStart itemInfo[i].itemName:%d", i); + AddToTraingMoreList(itemInfo[i]); + } + TraingMoreList->SetAdapter(p_TraingMoreListAdapter); + TraingMoreList->RefreshList(); +} } // namespace OHOS \ No newline at end of file -- 2.17.1