修复其他界面息屏按键失效问题

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/DialingMethodPresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/DialingMethodPresenter.h
index e6d7a51..709b795 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/DialingMethodPresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/DialingMethodPresenter.h
@@ -26,6 +26,7 @@ namespace OHOS
         virtual ~DialingMethodPresenter();
 
         void OnStart() override;
+        void OnResume() override;
         static DialingMethodPresenter *GetInstance();
 
     private:

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/MainPhonePresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/MainPhonePresenter.h
index bd64969..77a0078 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/MainPhonePresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/MainPhonePresenter.h
@@ -30,6 +30,7 @@ namespace OHOS
         virtual ~MainPhonePresenter();
 
         void OnStart() override;
+        void OnResume() override;
         
         static MainPhonePresenter *GetInstance();
 

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/PhoneDirPresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/PhoneDirPresenter.h
index 06b42f5..23dca86 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/PhoneDirPresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/include/PhoneDirPresenter.h
@@ -20,6 +20,7 @@ namespace OHOS
         virtual ~PhoneDirPresenter();\r
 \r
         void OnStart() override;\r
+        void OnResume() override;\r
 \r
         static PhoneDirPresenter *GetInstance();\r
 \r

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp
index 5a26a48..f19d4ef 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp
@@ -49,6 +49,11 @@ namespace OHOS
     {
     }
 
+    void DialingMethodPresenter::OnResume()
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     bool DialingMethodPresenter::OnClick(UIView &view, const ClickEvent &event)
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DialingMethodPresenter::OnClick");

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/MainPhonePresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/MainPhonePresenter.cpp
index dde55b5..d3bc488 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/MainPhonePresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/MainPhonePresenter.cpp
@@ -52,6 +52,11 @@ namespace OHOS
     {
     }
 
+    void MainPhonePresenter::OnResume()
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     static uint8_t MainPhonePresenter_atoi(const char* buf)
     {
         if(strstr(buf,"D_"))

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneDirPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneDirPresenter.cpp
index ec297e0..3562d6e 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneDirPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/phone/src/PhoneDirPresenter.cpp
@@ -43,6 +43,11 @@ namespace OHOS
         Set_onepage_address=false;\r
     }\r
 \r
+    void PhoneDirPresenter::OnResume()\r
+    {\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
+    }\r
+\r
     bool PhoneDirPresenter::OnDrag(UIView &view, const DragEvent &event)\r
     {\r
 \r

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_aquatic/include/TraingAquaticPresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_aquatic/include/TraingAquaticPresenter.h
index ef0d888..1d9b592 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_aquatic/include/TraingAquaticPresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_aquatic/include/TraingAquaticPresenter.h
@@ -34,6 +34,7 @@ namespace OHOS
         virtual ~TraingAquaticPresenter();
 
         void OnStart() override;
+        void OnResume() override;
         void OnStop() override;
 
         static TraingAquaticPresenter *GetInstance();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp
index f5c9a11..9caf39a 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp
@@ -61,6 +61,11 @@ namespace OHOS
         view_->RefreshTraingAquaticList(itemInfo);
     }
 
+    void TraingAquaticPresenter::OnResume(void)
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     void TraingAquaticPresenter::OnStop(void)
     {
 

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ball/include/TraingBallPresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ball/include/TraingBallPresenter.h
index 7f20875..d6b7bee 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ball/include/TraingBallPresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ball/include/TraingBallPresenter.h
@@ -34,6 +34,7 @@ namespace OHOS
         virtual ~TraingBallPresenter();
 
         void OnStart() override;
+        void OnResume() override;
         void OnStop() override;
 
         static TraingBallPresenter *GetInstance();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp
index 969afad..8269889 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp
@@ -61,6 +61,11 @@ namespace OHOS
         view_->RefreshTraingBallList(itemInfo);
     }
 
+    void TraingBallPresenter::OnResume(void)
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     void TraingBallPresenter::OnStop(void)
     {
 

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_dance/include/TraingDancePresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_dance/include/TraingDancePresenter.h
index 49b8bf9..b5cd4b3 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_dance/include/TraingDancePresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_dance/include/TraingDancePresenter.h
@@ -28,6 +28,7 @@ namespace OHOS
         virtual ~TraingDancePresenter();
 
         void OnStart() override;
+        void OnResume() override;
         void OnStop() override;
 
         static TraingDancePresenter *GetInstance();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp
index 50459e9..c85b603 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp
@@ -60,6 +60,11 @@ namespace OHOS
         view_->RefreshTraingDanceList(itemInfo);
     }
 
+    void TraingDancePresenter::OnResume(void)
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     void TraingDancePresenter::OnStop(void)
     {
 

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_fitness/include/TraingFitnessPresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_fitness/include/TraingFitnessPresenter.h
index 8e3518a..0e29deb 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_fitness/include/TraingFitnessPresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_fitness/include/TraingFitnessPresenter.h
@@ -22,6 +22,7 @@ namespace OHOS
         virtual ~TraingFitnessPresenter();
 
         void OnStart() override;
+        void OnResume() override;
         void OnStop() override;
 
         static TraingFitnessPresenter *GetInstance();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp
index 3f17e8c..d5f10f8 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp
@@ -58,6 +58,11 @@ namespace OHOS
         view_->RefreshTraingFitnessList(itemInfo);
     }
 
+    void TraingFitnessPresenter::OnResume(void)
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     void TraingFitnessPresenter::OnStop(void)
     {
 

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ice/include/TraingIcePresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ice/include/TraingIcePresenter.h
index 8e9c71a..0bf2bac 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ice/include/TraingIcePresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ice/include/TraingIcePresenter.h
@@ -28,6 +28,7 @@ namespace OHOS
         virtual ~TraingIcePresenter();
 
         void OnStart() override;
+        void OnResume() override;
         void OnStop() override;
 
         static TraingIcePresenter *GetInstance();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp
index 470fa5b..e3e40dd 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp
@@ -60,6 +60,12 @@ namespace OHOS
    
         view_->RefreshTraingIceList(itemInfo);
     }
+
+    void TraingIcePresenter::OnResume(void)
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     void TraingIcePresenter::OnStop(void)
     {
 

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h
index f51a191..dca42fa 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h
@@ -28,6 +28,7 @@ namespace OHOS
         virtual ~TraingLimitPresenter();
 
         void OnStart() override;
+        void OnResume() override;
         void OnStop() override;
 
         static TraingLimitPresenter *GetInstance();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp
index 143c5df..e80d027 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp
@@ -61,6 +61,11 @@ namespace OHOS
         view_->RefreshTraingLimitList(itemInfo);\r
     }\r
 \r
+    void TraingLimitPresenter::OnResume(void)\r
+    {\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
+    }\r
+\r
 \r
     void TraingLimitPresenter::OnStop(void)\r
     {\r

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_other/include/TraingOtherPresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_other/include/TraingOtherPresenter.h
index 271bb7b..c060a63 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_other/include/TraingOtherPresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_other/include/TraingOtherPresenter.h
@@ -28,6 +28,7 @@ namespace OHOS
         virtual ~TraingOtherPresenter();
 
         void OnStart() override;
+        void OnResume() override;
         void OnStop() override;
 
         static TraingOtherPresenter *GetInstance();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp
index 337c59d..b24ef74 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp
@@ -76,6 +76,11 @@ namespace OHOS
         view_->RefreshTraingOtherList(itemInfo);
     }
 
+    void TraingOtherPresenter::OnResume(void)
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     void TraingOtherPresenter::OnStop(void)
     {
 

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_rest/include/TraingRestPresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_rest/include/TraingRestPresenter.h
index 6b7c957..08e77b4 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_rest/include/TraingRestPresenter.h
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_rest/include/TraingRestPresenter.h
@@ -28,6 +28,7 @@ namespace OHOS
         virtual ~TraingRestPresenter();
 
         void OnStart() override;
+        void OnResume() override;
         void OnStop() override;
 
         static TraingRestPresenter *GetInstance();

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp
index d099db4..c691584 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp
@@ -59,6 +59,11 @@ namespace OHOS
         view_->RefreshTraingRestList(itemInfo);
     }
 
+    void TraingRestPresenter::OnResume(void)
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
 
 
     void TraingRestPresenter::OnStop(void)