解决信息界面，按键不能退出问题

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/include/MessagePresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/include/MessagePresenter.h
index 8f1d39a..6d84a49 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/include/MessagePresenter.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/include/MessagePresenter.h
@@ -27,9 +27,7 @@ namespace OHOS
         virtual ~MessagePresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static MessagePresenter *GetInstance();
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/include/MessageShowPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/include/MessageShowPresenter.h
index 2afedda..d0a76e6 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/include/MessageShowPresenter.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/include/MessageShowPresenter.h
@@ -29,9 +29,7 @@ namespace OHOS
         virtual ~MessageShowPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static MessageShowPresenter *GetInstance();
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessagePresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessagePresenter.cpp
index 7e19292..6c84b2b 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessagePresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessagePresenter.cpp
@@ -51,7 +51,6 @@ namespace OHOS
     void MessagePresenter::OnStart()
     {
         model->InitMessageListItems();
-        Presenter<MessageView>::OnStart();
 
         if(view_ != nullptr)
         {
@@ -60,10 +59,7 @@ namespace OHOS
         }
     }
 
-    void MessagePresenter::OnPause(void)
-    {
-        Presenter<MessageView>::OnPause();
-    }
+    
     void MessagePresenter::OnResume(void)
     {
         if (view_ == nullptr)
@@ -80,14 +76,8 @@ namespace OHOS
             }
         }
 
-        Presenter<MessageView>::OnResume();
-    }
-
-    void MessagePresenter::OnStop(void)
-    {
-        Presenter<MessageView>::OnStop();
     }
-
+    
     bool MessagePresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT &&

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageShowPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageShowPresenter.cpp
index 0755556..3fa01dd 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageShowPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageShowPresenter.cpp
@@ -43,24 +43,13 @@ namespace OHOS
 
     void MessageShowPresenter::OnStart()
     {
-        Presenter<MessageShowView>::OnStart();
     }
-
-    void MessageShowPresenter::OnPause(void)
-    {
-        Presenter<MessageShowView>::OnPause();
-    }
-
+    
     void MessageShowPresenter::OnResume(void)
     {
         RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
-    void MessageShowPresenter::OnStop(void)
-    {
-        Presenter<MessageShowView>::OnStop();
-    }
-
     bool MessageShowPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT &&

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageShowView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageShowView.cpp
index f103b59..6fc1cdb 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageShowView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageShowView.cpp
@@ -275,6 +275,7 @@ namespace OHOS
         UpdateShowConfig();
 
         AddViewToRootContainer(scrollView_);
+        RootView::GetInstance()->SetOnKeyActListener(this);
 
     }
    

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageView.cpp
index 90bfeab..d62767f 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/message/src/MessageView.cpp
@@ -201,7 +201,6 @@
  /// @brief 页面启动时需要执行的代码逻辑
  void MessageView::OnStart() {
    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartResultView::OnStart");
-   View<MessagePresenter>::OnStart();
  
    ShowMessageView();
    ShowLackView();
@@ -212,6 +211,7 @@
        MessageList->SetAdapter(p_MessageListAdapter);
      }
    }
+  RootView::GetInstance()->SetOnKeyActListener(MessagePresenter::GetInstance());
  }
  
  void MessageView::AddMessageToList(const MessageListItem &item) {

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/message/include/MessagePresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/message/include/MessagePresenter.h
index 8f1d39a..6d84a49 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/message/include/MessagePresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/message/include/MessagePresenter.h
@@ -27,9 +27,7 @@ namespace OHOS
         virtual ~MessagePresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static MessagePresenter *GetInstance();
 

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/message/include/MessageShowPresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/message/include/MessageShowPresenter.h
index 2afedda..d0a76e6 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/message/include/MessageShowPresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/message/include/MessageShowPresenter.h
@@ -29,9 +29,7 @@ namespace OHOS
         virtual ~MessageShowPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static MessageShowPresenter *GetInstance();
 

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessagePresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessagePresenter.cpp
index 7e19292..54fd922 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessagePresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessagePresenter.cpp
@@ -51,7 +51,6 @@ namespace OHOS
     void MessagePresenter::OnStart()
     {
         model->InitMessageListItems();
-        Presenter<MessageView>::OnStart();
 
         if(view_ != nullptr)
         {
@@ -60,12 +59,9 @@ namespace OHOS
         }
     }
 
-    void MessagePresenter::OnPause(void)
-    {
-        Presenter<MessageView>::OnPause();
-    }
     void MessagePresenter::OnResume(void)
     {
+        RootView::GetInstance()->SetOnKeyActListener(this);
         if (view_ == nullptr)
         {
             return;
@@ -79,14 +75,9 @@ namespace OHOS
                 view_->AddMessageToList(itemInfo[i]);
             }
         }
-
-        Presenter<MessageView>::OnResume();
     }
 
-    void MessagePresenter::OnStop(void)
-    {
-        Presenter<MessageView>::OnStop();
-    }
+    
 
     bool MessagePresenter::OnDrag(UIView &view, const DragEvent &event)
     {

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessageShowPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessageShowPresenter.cpp
index 0755556..fa28337 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessageShowPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessageShowPresenter.cpp
@@ -43,24 +43,12 @@ namespace OHOS
 
     void MessageShowPresenter::OnStart()
     {
-        Presenter<MessageShowView>::OnStart();
     }
-
-    void MessageShowPresenter::OnPause(void)
-    {
-        Presenter<MessageShowView>::OnPause();
-    }
-
     void MessageShowPresenter::OnResume(void)
     {
         RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
-    void MessageShowPresenter::OnStop(void)
-    {
-        Presenter<MessageShowView>::OnStop();
-    }
-
     bool MessageShowPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT &&

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessageShowView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessageShowView.cpp
index f103b59..47229ab 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessageShowView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessageShowView.cpp
@@ -249,8 +249,6 @@ namespace OHOS
 
     void MessageShowView::OnStart()
     {
-        View<MessageShowPresenter>::OnStart();
-
         scrollView_ = new UIScrollView();
         if (scrollView_ == nullptr)
         {
@@ -275,6 +273,7 @@ namespace OHOS
         UpdateShowConfig();
 
         AddViewToRootContainer(scrollView_);
+        RootView::GetInstance()->SetOnKeyActListener(MessageShowPresenter::GetInstance());
 
     }
    

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessageView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessageView.cpp
index 1a10baf..cebcb5e 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessageView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/message/src/MessageView.cpp
@@ -201,7 +201,6 @@ void MessageView::SetPopupViewStatus(PopupMessage view, bool status) {
 /// @brief 页面启动时需要执行的代码逻辑
 void MessageView::OnStart() {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartResultView::OnStart");
-  View<MessagePresenter>::OnStart();
 
   ShowMessageView();
   ShowLackView();
@@ -212,6 +211,7 @@ void MessageView::OnStart() {
       MessageList->SetAdapter(p_MessageListAdapter);
     }
   }
+  RootView::GetInstance()->SetOnKeyActListener(MessagePresenter::GetInstance());
 }
 
 void MessageView::AddMessageToList(const MessageListItem &item) {