解决GPS运动页面息屏后按键监听失效问题

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/include/TraingNomalPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/include/TraingNomalPresenter.h
index 235b213..40316db 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/include/TraingNomalPresenter.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/include/TraingNomalPresenter.h
@@ -22,9 +22,7 @@ namespace OHOS
         virtual ~TraingNomalPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
         void NavigateBack();
         void OnTickEvent() override;
         void Notify() override {}

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
index d9dcd7e..80603d3 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -72,22 +72,11 @@ namespace OHOS
             TraingModel::GetInstance()->gnss_start_timer(1000);\r
         #endif\r
         }\r
-        Presenter<TraingNomalView>::OnStart();\r
-    }\r
-\r
-    void TraingNomalPresenter::OnPause(void){\r
-        Presenter<TraingNomalView>::OnPause();\r
     }\r
 \r
     void TraingNomalPresenter::OnResume(void)\r
     {\r
-        Presenter<TraingNomalView>::OnResume();\r
-    }\r
-\r
-    void TraingNomalPresenter::OnStop(void)\r
-    {\r
-\r
-        Presenter<TraingNomalView>::OnStop();\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
     }\r
     // 回退逻辑\r
     void TraingNomalPresenter::NavigateBack()\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingEphemerisNotePresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingEphemerisNotePresenter.h
index 9818653..d172b88 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingEphemerisNotePresenter.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingEphemerisNotePresenter.h
@@ -18,9 +18,7 @@ namespace OHOS
         virtual ~TraingEphemerisNotePresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static TraingEphemerisNotePresenter *GetInstance();
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h
index 0cc44ac..df7dfd5 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h
@@ -19,9 +19,7 @@ namespace OHOS
         virtual ~TraingGPSPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static TraingGPSPresenter *GetInstance();
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h
index 6e26026..a5aad8b 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h
@@ -18,9 +18,7 @@ namespace OHOS
         virtual ~TraingGPSbackPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static TraingGPSbackPresenter *GetInstance();
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h
index cf3f878..b88f70c 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h
@@ -19,9 +19,7 @@ namespace OHOS
         virtual ~TraingGPSlackPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static TraingGPSlackPresenter *GetInstance();
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h
index 3ca2578..06e98db 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h
@@ -19,9 +19,7 @@ namespace OHOS
         virtual ~TraingGPSlostPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static TraingGPSlostPresenter *GetInstance();
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h
index c7a5704..98fd935 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h
@@ -18,9 +18,7 @@ namespace OHOS
         virtual ~TraingGPSnotePresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static TraingGPSnotePresenter *GetInstance();
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h
index 0bb93f5..7b51935 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h
@@ -18,9 +18,7 @@ namespace OHOS
         virtual ~TraingGPSsetPresenter();
 
         void OnStart() override;
-        void OnPause() override;
         void OnResume() override;
-        void OnStop() override;
 
         static TraingGPSsetPresenter *GetInstance();
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNotePresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNotePresenter.cpp
index aa26aad..7703217 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNotePresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNotePresenter.cpp
@@ -40,19 +40,8 @@ namespace OHOS
         Presenter<TraingEphemerisNoteView>::OnStart();
     }
 
-    void TraingEphemerisNotePresenter::OnPause(void)
-    {
-        Presenter<TraingEphemerisNoteView>::OnPause();
-    }
-
     void TraingEphemerisNotePresenter::OnResume(void)
     {
-        Presenter<TraingEphemerisNoteView>::OnResume();
-    }
-
-    void TraingEphemerisNotePresenter::OnStop(void)
-    {
-        Presenter<TraingEphemerisNoteView>::OnStop();
     }
     
     bool TraingEphemerisNotePresenter::OnDrag(UIView &view, const DragEvent &event)

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp
index c5d575d..c188c20 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp
@@ -36,27 +36,12 @@ namespace OHOS
 
     void TraingGPSPresenter::OnStart()
     {
-
-        Presenter<TraingGPSView>::OnStart();
-    }
-
-    void TraingGPSPresenter::OnPause(void)
-    {
-
-        Presenter<TraingGPSView>::OnPause();
     }
 
     void TraingGPSPresenter::OnResume(void)
     {
-
-        Presenter<TraingGPSView>::OnResume();
     }
 
-    void TraingGPSPresenter::OnStop(void)
-    {
-
-        Presenter<TraingGPSView>::OnStop();
-    }
     bool TraingGPSPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         return true;

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp
index fe970f0..fe86ca7 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp
@@ -35,26 +35,9 @@ namespace OHOS
 
     void TraingGPSbackPresenter::OnStart()
     {
-
-        Presenter<TraingGPSbackView>::OnStart();
-    }
-
-    void TraingGPSbackPresenter::OnPause(void)
-    {
-
-        Presenter<TraingGPSbackView>::OnPause();
     }
-
     void TraingGPSbackPresenter::OnResume(void)
     {
-
-        Presenter<TraingGPSbackView>::OnResume();
-    }
-
-    void TraingGPSbackPresenter::OnStop(void)
-    {
-
-        Presenter<TraingGPSbackView>::OnStop();
     }
 
     bool TraingGPSbackPresenter::OnDrag(UIView &view, const DragEvent &event)

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp
index 92f54f2..5cbb986 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp
@@ -36,27 +36,11 @@ namespace OHOS
 
     void TraingGPSlackPresenter::OnStart()
     {
-
-        Presenter<TraingGPSlackView>::OnStart();
-    }
-
-    void TraingGPSlackPresenter::OnPause(void)
-    {
-
-        Presenter<TraingGPSlackView>::OnPause();
     }
-
     void TraingGPSlackPresenter::OnResume(void)
     {
-
-        Presenter<TraingGPSlackView>::OnResume();
     }
 
-    void TraingGPSlackPresenter::OnStop(void)
-    {
-
-        Presenter<TraingGPSlackView>::OnStop();
-    }
     bool TraingGPSlackPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         return true;

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp
index f8a81c0..89b5cbc 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp
@@ -35,26 +35,10 @@ namespace OHOS
 
     void TraingGPSlostPresenter::OnStart()
     {
-
-        Presenter<TraingGPSlostView>::OnStart();
-    }
-
-    void TraingGPSlostPresenter::OnPause(void)
-    {
-
-        Presenter<TraingGPSlostView>::OnPause();
     }
 
     void TraingGPSlostPresenter::OnResume(void)
     {
-
-        Presenter<TraingGPSlostView>::OnResume();
-    }
-
-    void TraingGPSlostPresenter::OnStop(void)
-    {
-
-        Presenter<TraingGPSlostView>::OnStop();
     }
 
     bool TraingGPSlostPresenter::OnDrag(UIView &view, const DragEvent &event)

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp
index 008085a..e368225 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp
@@ -38,27 +38,12 @@ namespace OHOS
 
     void TraingGPSnotePresenter::OnStart()
     {
-
-        Presenter<TraingGPSnoteView>::OnStart();
-    }
-
-    void TraingGPSnotePresenter::OnPause(void)
-    {
-
-        Presenter<TraingGPSnoteView>::OnPause();
     }
 
     void TraingGPSnotePresenter::OnResume(void)
     {
-
-        Presenter<TraingGPSnoteView>::OnResume();
-    }
-
-    void TraingGPSnotePresenter::OnStop(void)
-    {
-
-        Presenter<TraingGPSnoteView>::OnStop();
     }
+    
     bool TraingGPSnotePresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         return true;

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp
index 1d7eb30..9dec26a 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp
@@ -41,27 +41,12 @@ namespace OHOS
 
     void TraingGPSsetPresenter::OnStart()
     {
-
-        Presenter<TraingGPSsetView>::OnStart();
-    }
-
-    void TraingGPSsetPresenter::OnPause(void)
-    {
-
-        Presenter<TraingGPSsetView>::OnPause();
     }
 
     void TraingGPSsetPresenter::OnResume(void)
     {
-
-        Presenter<TraingGPSsetView>::OnResume();
-    }
-
-    void TraingGPSsetPresenter::OnStop(void)
-    {
-
-        Presenter<TraingGPSsetView>::OnStop();
     }
+    
     bool TraingGPSsetPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         return true;

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp
index ead821e..358848d 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp
@@ -173,8 +173,6 @@ namespace OHOS
     }
     void TraingGPSsetView::OnStart()
     {
-
-
         // 创建 draglistener 实例并设置为拖动监听器
         UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(TraingGPSsetPresenter::GetInstance());
         if (draglistener == nullptr)