卡片设置增加按键监控

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 ffaebdf..09ce848 100644 (file)
--- 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<AddCardView>, 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<AddCardView>, 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 b92ffb5..a803d35 100644 (file)
--- 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<AddCardView>::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 cc060b9..66a61bc 100644 (file)
--- 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 8c9f3c2..d62b003 100755 (executable)
--- 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);
     }