From 084bf7e52bed172c16e9f94497fba2db30afa543 Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Sat, 29 Jun 2024 15:06:04 +0800 Subject: [PATCH] =?utf8?q?=E5=8D=A1=E7=89=87=E8=AE=BE=E7=BD=AE=E5=A2=9E?= =?utf8?q?=E5=8A=A0=E6=8C=89=E9=94=AE=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../add_card/include/AddCardPresenter.h | 68 +++++++++++-------- .../add_card/src/AddCardPresenter.cpp | 17 +++++ .../nativeui/main/src/MainPresenterSample.cpp | 2 +- .../nativeui/main/src/MainPresenterSample.cpp | 2 +- 4 files changed, 57 insertions(+), 32 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardPresenter.h index ffaebdf7c..09ce84860 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardPresenter.h @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-05-30 15:59:37 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-06-29 14:46:02 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardPresenter.h + */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. * Description: AddCardPresenter.h @@ -14,36 +20,38 @@ #include "KeyInputListener.h" #include "ModelListenerSample.h" -#define TOAST_KEEP_TIME 1000 - -namespace OHOS { -static const char *ADD_CARD_ADD = "addcardadd"; - -class AddCardView; -class AddCardModel; -class AddCardPresenter : public Presenter, public ModelListenerSample, - public UIView::OnClickListener, public UIView::OnDragListener, - public ListScrollListener { -public: - AddCardPresenter(); - ~AddCardPresenter() override; - - void OnStart() override; - void OnResume() override; - void OnStop() override; - void OnTickEvent() override; - void Notify() override {} - bool OnClick(UIView &view, const ClickEvent &event) override; - void OnScrollStart(int16_t index, UIView *view) override; - void OnScrollEnd(int16_t index, UIView *view) override; - void OnItemSelected(int16_t index, UIView* view) override; - bool OnDrag(UIView& view, const DragEvent& event) override; -private: - void ResetTickTimer(void); - AddCardModel *model{nullptr}; - uint64_t startTime{0}; - bool cardCountEvent{false}; -}; +#define TOAST_KEEP_TIME 1000 + +namespace OHOS +{ + static const char *ADD_CARD_ADD = "addcardadd"; + + class AddCardView; + class AddCardModel; + class AddCardPresenter : public Presenter, public ModelListenerSample, public UIView::OnClickListener, public UIView::OnDragListener, public ListScrollListener + { + public: + AddCardPresenter(); + ~AddCardPresenter() override; + + void OnStart() override; + void OnResume() override; + void OnStop() override; + void OnTickEvent() override; + void Notify() override {} + bool OnClick(UIView &view, const ClickEvent &event) override; + void OnScrollStart(int16_t index, UIView *view) override; + void OnScrollEnd(int16_t index, UIView *view) override; + void OnItemSelected(int16_t index, UIView *view) override; + bool OnDrag(UIView &view, const DragEvent &event) override; + + private: + void ResetTickTimer(void); + AddCardModel *model{nullptr}; + uint64_t startTime{0}; + bool cardCountEvent{false}; + KeyInputListener *keyActListenr{nullptr}; + }; } #endif // ADD_CARD_PRESENTER_H \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp index b92ffb584..a803d3560 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp @@ -19,11 +19,28 @@ namespace OHOS AddCardPresenter::~AddCardPresenter() { + if (keyActListenr != nullptr) + { + delete keyActListenr; + keyActListenr = nullptr; + } } void AddCardPresenter::OnStart() { Presenter::OnStart(); + if (keyActListenr == nullptr) + { + keyActListenr = new KeyInputListener(); + if (keyActListenr != nullptr) + { + RootView::GetInstance()->SetOnKeyActListener(keyActListenr); + } + else + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ApplistPresenter::OnStart: new KeyInputListener fail"); + } + } } void AddCardPresenter::OnResume(void) 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 cc060b91e..66a61bc9f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -184,7 +184,7 @@ namespace OHOS if (cardId != WATCH_FACE) { SetCardModel::GetInstance().SetSelectedCard(cardId); - NativeAbility::GetInstance().ChangeSlice(VIEW_SET_CARD); + NativeAbility::GetInstance().ChangeSlice(VIEW_ADD_CARD); } else { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainPresenterSample.cpp index 8c9f3c229..d62b0031e 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainPresenterSample.cpp @@ -139,7 +139,7 @@ bool MainPresenterSample::OnLongPress(UIView& view, const LongPressEvent& event) uint8_t cardId = view_->GetHorCurrentCard(); if (cardId != WATCH_FACE) { SetCardModel::GetInstance().SetSelectedCard(cardId); - NativeAbility::GetInstance().ChangeSlice(VIEW_SET_CARD); + NativeAbility::GetInstance().ChangeSlice(VIEW_ADD_CARD); } else { NativeAbility::GetInstance().ChangeSlice(VIEW_SET_DIAL); } -- 2.17.1