优化按键监听

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/include/AiVoicePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/include/AiVoicePresenter.h
index f351927..f8125e0 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/include/AiVoicePresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/include/AiVoicePresenter.h
@@ -45,6 +45,7 @@ namespace OHOS
 
         void OnStart() override;
         void OnStop() override;
+        void OnResume() override;
         // void Notify() override;
         void calculateChatContentItemViewHeight(std::string text, bool flag);
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoicePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoicePresenter.cpp
index 30908df..b64dcfb 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoicePresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoicePresenter.cpp
@@ -132,6 +132,11 @@ namespace OHOS
         return;
     }
 
+    void AiVoicePresenter::OnResume()
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     /*调转到返回结果界面*/
     bool AiVoicePresenter::JumpToReturnResultTextView(void)
     {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp
index bcf2d91..00ffa54 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/src/AiVoiceView.cpp
@@ -528,7 +528,6 @@ namespace OHOS
 
         SetAiVoiceViewAllComponentsVisibilityStatus();
 
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
         return;
     }
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPresenter.h
index e7e0287..2dff3a6 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPresenter.h
@@ -153,6 +153,7 @@ public:
     ColorType ShadowBlue(void);\r
     bool OnClick(UIView &view, const ClickEvent &event) override;\r
     bool OnDrag(UIView& view, const DragEvent& event) override;\r
+    void OnResume() override;\r
     bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件\r
     bool OnDragEnd(UIView& view, const DragEvent& event) override;\r
     void OnSwipe(UISwipeView &view) override;\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp
index cfdf61b..5f18114 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPresenter.cpp
@@ -364,6 +364,11 @@ void AlarmPresenter::ClickAlarmNext(uint16_t num)
     AlarmSetWeekView::GetInstance()->RefreshSetWeek1();\r
 }\r
 \r
+void AlarmPresenter::OnResume()\r
+{\r
+    RootView::GetInstance()->SetOnKeyActListener(this);\r
+}\r
+\r
 bool AlarmPresenter::OnDrag(UIView& view, const DragEvent& event)\r
 {\r
     if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) {\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/MainAlarmView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/MainAlarmView.cpp
index 037f7c3..ff64b32 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/MainAlarmView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/MainAlarmView.cpp
@@ -486,7 +486,6 @@ void MainAlarmView::OnStart()
         AddViewToRootContainer(container[0]);
     }
     viewInitstatus_ = true;
-    RootView::GetInstance()->SetOnKeyActListener(presenter_);
 }
 
 void MainAlarmView::RefreshAlarm(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayMainView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayMainView.cpp
index 0047133..111b865 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayMainView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayMainView.cpp
@@ -71,8 +71,6 @@ void AlipayMainView::OnStart()
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlipayMainView::OnStart");\r
     if(Alipay_is_init()==false)\r
     return;\r
-    // 增加按键监听\r
-    RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
 \r
     alipayInterfacesId startView;\r
     bool bindFlag = AlipayModel::GetInstance()->AlipayGetBindstate();\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp
index e148386..427216b 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp
@@ -106,6 +106,8 @@ void AlipayPresenter::OnStart()
 void AlipayPresenter::OnResume(void)\r
 {\r
     svr_alipay_create_task();\r
+    // 增加按键监听\r
+    RootView::GetInstance()->SetOnKeyActListener(this);\r
 }\r
 \r
 void AlipayPresenter::OnStop(void)\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/include/AssistantPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/include/AssistantPresenter.h
index 336e77f..a1c5384 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/include/AssistantPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/include/AssistantPresenter.h
@@ -30,6 +30,7 @@ public:
   static AssistantPresenter *GetInstance();
 
 private:
+  void OnResume() override;
   // 因为继承了OnClickListener，所以有OnClick属性，至于参数,原函数也这样直接继承;
   bool OnClick(UIView &view, const ClickEvent &event) override;
   bool OnDrag(UIView &view, const DragEvent &event) override;

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantPresenter.cpp
index 8fa3b66..1f0339f 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantPresenter.cpp
@@ -71,6 +71,11 @@ bool AssistantPresenter::OnDrag(UIView &view, const DragEvent &event) {
   return true;
 }
 
+void AssistantPresenter::OnResume()
+{
+    RootView::GetInstance()->SetOnKeyActListener(this);
+}
+
 bool AssistantPresenter::OnClick(UIView &view, const ClickEvent &event) {
 
   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AssistantPresenter::OnClick %s",

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantView.cpp
index ae7bbd7..06a3647 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantView.cpp
@@ -241,7 +241,6 @@ void AssistantView::OnStart() {
 
   InitView();
 
-  RootView::GetInstance()->SetOnKeyActListener(presenter_);
   AddViewToRootContainer(AssistantScrollView[ASSISTANT_MAIN_VIEW]);
 }
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodDetectionPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodDetectionPresenter.h
index 821b2d9..12d93b8 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodDetectionPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodDetectionPresenter.h
@@ -34,7 +34,7 @@ namespace OHOS
         BloodDetectionPresenter();
         ~BloodDetectionPresenter() override;
         static BloodDetectionPresenter *GetInstance(void);
-
+        void OnResume() override;
   
         void OnTickEvent() override;
         void Notify() override {}

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodResultPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodResultPresenter.h
index ca5bc38..6af0492 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodResultPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodResultPresenter.h
@@ -27,8 +27,7 @@ namespace OHOS
         virtual ~BloodResultPresenter();
         static BloodResultPresenter *GetInstance(void);
 
-
-
+        void OnResume() override;
         bool OnDrag(UIView &view, const DragEvent &event) override;
         bool OnDragEnd(UIView &view, const DragEvent &event) override;
         bool OnClick(UIView &view, const ClickEvent &event) override;

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp
index f4ea386..ee0910a 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp
@@ -62,6 +62,10 @@ namespace OHOS
         NativeAbility::GetInstance().Back();
     }
    
+    void BloodDetectionPresenter::OnResume()
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
     bool BloodDetectionPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodDetectionPresenter::OnDrag");

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp
index 2e9b914..93c2008 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp
@@ -294,7 +294,6 @@ void BloodDetectionView::OnStart() {
   }
 
   AddViewToRootContainer(scrollView_);
-  RootView::GetInstance()->SetOnKeyActListener(presenter_);
 }
 
 } // namespace OHOS

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp
index d27e9ca..7bf9ac5 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp
@@ -109,6 +109,11 @@ namespace OHOS
         return g_pBloodResultPresenter;
     }
 
+    void BloodResultPresenter::OnResume()
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     bool BloodResultPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         return true;
@@ -162,4 +167,6 @@ namespace OHOS
         return true;
     }
 
+
+
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
index 3e743c6..e5d11d0 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
@@ -201,7 +201,6 @@ void BloodResultView::OnStart() {
   }
 
   AddViewToRootContainer(scrollView_);
-  RootView::GetInstance()->SetOnKeyActListener(presenter_);
 }
 
 } // namespace OHOS

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothPresenter.h
index 20453ad..adc053a 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothPresenter.h
@@ -45,6 +45,7 @@ public:
     BluetoothPresenter();\r
     ~BluetoothPresenter();\r
     bool OnClick(UIView &view, const ClickEvent &event) override;\r
+    void OnResume() override;\r
     static BluetoothPresenter *GetInstance();\r
     bool OnDrag(UIView& view, const DragEvent& event) override;\r
     bool OnDragEnd(UIView& view, const DragEvent& event) override;\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp
index aa6bc5f..8e56890 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp
@@ -45,6 +45,11 @@ void BluetoothPresenter::OnStop(void)
     }\r
 }\r
 \r
+void BluetoothPresenter::OnResume()\r
+{\r
+    RootView::GetInstance()->SetOnKeyActListener(this);\r
+}\r
+\r
 BluetoothPresenter *BluetoothPresenter::GetInstance()\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BluetoothPresenter GetInstance");\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/MainBluetoothView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/MainBluetoothView.cpp
index 1d2a1ce..2844ae4 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/MainBluetoothView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/MainBluetoothView.cpp
@@ -76,7 +76,6 @@ void MainBluetoothView::OnStart()
     } else {\r
         ChangeView(unusedValue, BLUETOOTHEARPHONEVIEW);//若一个都没有连接过就进行搜索\r
     }\r
-    RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
     return;\r
 }\r
 \r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp
index 7dce69e..7f679ca 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp
@@ -47,7 +47,7 @@ namespace OHOS
 
     void BrightnessLevelPresenter::OnResume(void)
     {
-        Presenter<BrightnessLevelView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void BrightnessLevelPresenter::OnStop(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelView.cpp
index bc91dd7..ee4dd8b 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelView.cpp
@@ -75,7 +75,6 @@ namespace OHOS
         // 增加按键监听
         // RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::BrightnessLevelPresenter::GetInstance();
         //RootView::GetInstance()->SetOnKeyActListener(keyactListener);
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
 
 
         AddViewToRootContainer(scorllView);

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/include/CalendarPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/include/CalendarPresenter.h
index 96dd611..fed6b04 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/include/CalendarPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/include/CalendarPresenter.h
@@ -29,6 +29,7 @@ public:
     ~CalendarPresenter() override;
 
     void OnStart() override;
+    void OnResume() override;
     static CalendarPresenter *GetInstance(void);
     bool OnClick(UIView &view, const ClickEvent &event) override;
     bool OnKeyAct(UIView &view, const KeyEvent &event) override;

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarPresenter.cpp
index 0ba0738..4376606 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarPresenter.cpp
@@ -44,6 +44,11 @@ namespace OHOS
     {
     }
 
+    void CalendarPresenter::OnResume()
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     bool CalendarPresenter::OnClick(UIView &view, const ClickEvent &event)
     {
         UNUSED(event);

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarView.cpp
index c9adc98..8a922b3 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarView.cpp
@@ -394,6 +394,5 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CallingView::UIViewGroup::new group error");
             return;
         }
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp
index 2d5e67d..1d29b3e 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp
@@ -42,7 +42,6 @@ void CallerLogPresenter::OnStart()
 void CallerLogPresenter::OnResume(void)\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ApplistPresenter::OnResume()");\r
-    Presenter<CallerLogView>::OnResume();\r
 \r
     return;\r
 }\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
index ac64214..7834e77 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
@@ -47,8 +47,7 @@ namespace OHOS
 
     void BluetoothServiceOptionsPresenter::OnResume(void)
     {
-
-        Presenter<BluetoothServiceOptionsView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void BluetoothServiceOptionsPresenter::OnStop(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
index 5589340..fb4daba 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
@@ -433,7 +433,6 @@ namespace OHOS
         BlueToothScrollView->Add(connectingScrollView);
         AddViewToRootContainer(BlueToothScrollView);
 
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 
     void BluetoothServiceOptionsView::show_connecting_view(bool data)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
index ba0db4b..d4015b7 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
@@ -52,7 +52,7 @@ namespace OHOS
 \r
     void ClassicBlueToothPresenter::OnResume(void)\r
     {\r
-        Presenter<ClassicBlueToothView>::OnResume();\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
     }\r
 \r
     void ClassicBlueToothPresenter::OnStop(void)\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp
index d6d2160..0ecb248 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp
@@ -308,6 +308,5 @@ namespace OHOS
         BlueToothScrollView->Add(AttentionLabel);\r
         BlueToothScrollView->Add(TradionalBlueToothToggleButton);\r
         AddViewToRootContainer(BlueToothScrollView);\r
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
     }\r
 }\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp
index 7f8a917..ba3ceb2 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/MainCountDownPresenter.cpp
@@ -50,7 +50,7 @@ namespace OHOS
     void MainCountDownPresenter::OnResume(void)\r
     {\r
 \r
-        Presenter<MainCountDownView>::OnResume();\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
     }\r
 \r
     void MainCountDownPresenter::OnStop(void)\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/MainCountDownView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/MainCountDownView.cpp
index c34600f..42617ac 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/MainCountDownView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/src/MainCountDownView.cpp
@@ -430,7 +430,6 @@ namespace OHOS
         {\r
             ChangeView(COUNTDOWN_MAX, MAIN_COUNTDOWN); // 如果倒计时的timer已经结束，则跳转到主界面\r
         }\r
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
         /* -------------------------------------------------------------------------- */\r
     }\r
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbPresenter.cpp
index 4cc98f7..0512882 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbPresenter.cpp
@@ -47,7 +47,7 @@ namespace OHOS
 
     void DnotDisturbPresenter::OnResume(void)
     {
-        Presenter<DnotDisturbView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void DnotDisturbPresenter::OnStop(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbView.cpp
index 39118c5..bf74133 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbView.cpp
@@ -252,6 +252,5 @@ namespace OHOS
         {
             AddViewToRootContainer(scrollView);
         }
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp
index 865b8dd..471122e 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhonePresenter.cpp
@@ -71,7 +71,7 @@ namespace OHOS
 
     void FindPhonePresenter::OnResume(void)
     {
-        Presenter<FindPhoneView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void FindPhonePresenter::OnStop(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhoneView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhoneView.cpp
index 2dce361..7266a0e 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhoneView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/src/FindPhoneView.cpp
@@ -285,7 +285,6 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "phone is not connected");
             FindPhoneViewInit_BlueToothDisConnected();
         }
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
         return;
     }
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/include/FlashlightPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/include/FlashlightPresenter.h
index e8ee476..27e4c9f 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/include/FlashlightPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/include/FlashlightPresenter.h
@@ -65,6 +65,7 @@ namespace OHOS
         static FlashlightPresenter * GetInstance();
 
         void OnStart() override;
+        void OnResume() override;
         uint8_t GetColorIndex(void);
         int64_t GetColorValue(void);
         uint8_t GetFlashingLevel(void);

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/src/FlashlightPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/src/FlashlightPresenter.cpp
index bb21fc8..5761f3d 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/src/FlashlightPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/src/FlashlightPresenter.cpp
@@ -59,6 +59,11 @@ namespace OHOS
         ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
     }
 
+    void FlashlightPresenter::OnResume()
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }   
+
     bool FlashlightPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashlightPresenter::OnDrag");

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/src/FlashlightView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/src/FlashlightView.cpp
index 30aa9d4..10c19ea 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/src/FlashlightView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/src/FlashlightView.cpp
@@ -61,7 +61,6 @@ namespace OHOS
             AddViewToRootContainer(group);
         }
         InitSwipeData();
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 
     void FlashlightView::DeinitSwipeData()

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalpresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalpresenter.cpp
index 1980b83..a3de49e 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalpresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalpresenter.cpp
@@ -58,7 +58,7 @@ namespace OHOS
 
     void MaingoalPresenter::OnResume(void)
     {
-        Presenter<MaingoalrView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void MaingoalPresenter::OnStop(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalview.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalview.cpp
index 54e370b..9e52ac7 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalview.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/Maingoalview.cpp
@@ -135,7 +135,6 @@ namespace OHOS
         /* --------------------------------- 添加按键监听 --------------------------------- */
         // RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::MaingoalPresenter::GetInstance();
         //RootView::GetInstance()->SetOnKeyActListener(keyactListener);
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
         /* -------------------------------------------------------------------------- */
     }
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionPresenter.cpp
index b403e78..11b1a03 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionPresenter.cpp
@@ -62,6 +62,7 @@ namespace OHOS
     }
     void HeartDetectionPresenter::OnResume(void)
     {
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void HeartDetectionPresenter::OnStop(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionView.cpp
index a43d6f6..d712849 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionView.cpp
@@ -140,7 +140,6 @@ namespace OHOS
         GetRootContainer()->SetDraggable(true);
         GetRootContainer()->SetTouchable(true);
         GetRootContainer()->SetOnDragListener(presenter_);     
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
 
         if (imageAnimator != nullptr)
         {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp
index 839e0e4..99dcae5 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp
@@ -108,7 +108,9 @@ namespace OHOS
     }
     void HeartResultPresenter::OnPause(void) {}
 
-    void HeartResultPresenter::OnResume(void) {}
+    void HeartResultPresenter::OnResume(void) {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
 
     void HeartResultPresenter::OnStop(void) {}
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultView.cpp
index 736feb6..29e654e 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultView.cpp
@@ -197,7 +197,6 @@ namespace OHOS
         GetRootContainer()->SetDraggable(true);
         GetRootContainer()->SetTouchable(true);
         GetRootContainer()->SetOnDragListener(presenter_);     
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
     
 }

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/include/LanguageSwitchPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/include/LanguageSwitchPresenter.h
index 786a2fd..222481c 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/include/LanguageSwitchPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/include/LanguageSwitchPresenter.h
@@ -30,7 +30,7 @@ namespace OHOS
         virtual ~LanguageSwitchPresenter();
 
         void OnStart() override;
-
+        void OnResume() override;
         static LanguageSwitchPresenter *GetInstance();
         void SetLabelExt(UILabelExt *label);
     private:

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
index 25f2a38..0a716dd 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
@@ -61,6 +61,11 @@ namespace OHOS
         view_->RefreshLanguageList();
     }
 
+    void LanguageSwitchPresenter::OnResume(void)
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     bool LanguageSwitchPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingPresenter::OnDrag");

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp
index 808ec39..2621ea5 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp
@@ -322,7 +322,6 @@ namespace OHOS
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LanguageSwitchView::OnStart");
         LanguageSwitchViewInit();
         InithintView();
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
         return;
     }
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowPresenter.cpp
index dce979e..0755556 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowPresenter.cpp
@@ -53,7 +53,7 @@ namespace OHOS
 
     void MessageShowPresenter::OnResume(void)
     {
-        Presenter<MessageShowView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void MessageShowPresenter::OnStop(void)

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

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
index 393a035..233bdc9 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
@@ -58,7 +58,7 @@ namespace OHOS
     void MotionRecognitionPresenter::OnResume(void)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MotionRecognitionView::OnResume");
-        Presenter<MotionRecognitionView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void MotionRecognitionPresenter::OnStop(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionView.cpp
index 5494d9f..255d73a 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionView.cpp
@@ -187,7 +187,6 @@ namespace OHOS
         scrollView->Add(MotionRecognitionToggleButton);
         scrollView->Add(note);
         AddViewToRootContainer(scrollView);
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp
index a0bb5ed..fb7eabc 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp
@@ -52,7 +52,7 @@ namespace OHOS
     void MusicPlayerPresenter::OnResume(void)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerPresenter::OnResume");
-        Presenter<MusicPlayerView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
         if (view_ == nullptr)
         {
             return;

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/src/MusicPlayerView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/src/MusicPlayerView.cpp
index 646f4d1..90c4716 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/src/MusicPlayerView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/src/MusicPlayerView.cpp
@@ -71,7 +71,6 @@ namespace OHOS
         }
 
         playersView->SetOnDragListener(presenter_);
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
         return;
     }
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
index 4f7fbf4..216c31f 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
@@ -59,7 +59,7 @@ namespace OHOS
 
     void NetworkAndCallPresenter::OnResume(void)
     {
-        Presenter<NetworkAndCallView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void NetworkAndCallPresenter::OnStop(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallView.cpp
index 79ecdb3..f9efdb9 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallView.cpp
@@ -237,7 +237,6 @@ namespace OHOS
         NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(MobileData_toggleButton);
         NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(note);
         AddViewToRootContainer(NetworkAndCallScrollView[NETWORKANDCALLVIEW]);
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
index d41d378..a6b37cd 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownPresenter.cpp
@@ -61,7 +61,7 @@ namespace OHOS
     void RebootAndShutdownPresenter::OnResume(void)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RebootAndShutdownPresenter::OnResume");
-        Presenter<RebootAndShutdownView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
         if (view_ == nullptr)
         {
             return;

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp
index 78b0b77..6202d52 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownView.cpp
@@ -385,7 +385,6 @@ namespace OHOS
             viewInitStatus = true;
         }
 
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
         return;
     }
   

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/include/RecordingPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/include/RecordingPresenter.h
index 289720e..570df8b 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/include/RecordingPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/include/RecordingPresenter.h
@@ -135,7 +135,7 @@ namespace OHOS
         virtual ~RecordingPresenter();\r
 \r
         void OnStart() override;\r
-\r
+        void OnResume() override;\r
         static RecordingPresenter *GetInstance();\r
         int convertNumericDateTime(const char *numericDateTime, char *formattedDateTime);\r
         void UpdateRecordProcess();\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingPresenter.cpp
index 76a3481..16aee20 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingPresenter.cpp
@@ -58,6 +58,10 @@ namespace OHOS
         p_RecordingModel->SendCheckRecordingSpaceOutCmd(); //进入录音视图后发送指令查看录音空间是否已满\r
         // ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);\r
     }\r
+    void RecordingPresenter::OnResume(void)\r
+    {\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
+    }\r
 \r
     bool RecordingPresenter::OnDrag(UIView &view, const DragEvent &event)\r
     {\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingView.cpp
index f0a0a89..6e21815 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordingView.cpp
@@ -455,7 +455,6 @@ namespace OHOS
     void RecordingView::OnStart()\r
     {\r
         RecordingViewInit();\r
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
         return;\r
     }\r
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp
index 21cfbe2..47123a5 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp
@@ -61,7 +61,7 @@ namespace OHOS
 
     void RespiratoryTrainingPresenter::OnResume(void)
     {
-        Presenter<RespiratoryTrainingView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void RespiratoryTrainingPresenter::OnStop(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp
index b0f8ef0..2fa25fc 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp
@@ -586,7 +586,5 @@ namespace OHOS
         RespiratoryTrainingViewInit();
         RootView::GetInstance()->SetDraggable(true);
         RootView::GetInstance()->SetTouchable(true);
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
- 
     }
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatPresenter.h
index 6fb4896..8eb7330 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatPresenter.h
@@ -33,6 +33,7 @@ namespace OHOS
         virtual ~SaveBatPresenter();\r
 \r
         void OnStart() override;\r
+        void OnResume() override;\r
 \r
         static SaveBatPresenter *GetInstance();\r
 \r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveElePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveElePresenter.h
index 533a351..6925792 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveElePresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveElePresenter.h
@@ -27,7 +27,7 @@ public:
   virtual ~SaveElePresenter();\r
 \r
   void OnStart() override;\r
-\r
+  void OnResume() override;\r
   static SaveElePresenter *GetInstance();\r
 \r
 private:\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp
index de77a1e..2964cbf 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp
@@ -64,6 +64,9 @@ void SaveBatPresenter::OnStart() {
 }\r
 \r
 \r
+void SaveBatPresenter::OnResume() {\r
+  RootView::GetInstance()->SetOnKeyActListener(this);\r
+}\r
 \r
 bool SaveBatPresenter::OnPress(UIView &view, const PressEvent &event) {\r
   if (strcmp(view.GetViewId(), "button_exit") == 0) {\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatView.cpp
index 2253a12..07dc378 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatView.cpp
@@ -856,7 +856,6 @@ namespace OHOS
         InitShowBackView();\r
 \r
         AddViewToRootContainer(group_);\r
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
     }\r
 \r
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp
index 5064998..cede84e 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp
@@ -41,6 +41,10 @@ SaveElePresenter *SaveElePresenter::GetInstance() {
 void SaveElePresenter::OnStart() { Presenter<SaveEleView>::OnStart(); }\r
 \r
 \r
+void SaveElePresenter::OnResume() {\r
+  RootView::GetInstance()->SetOnKeyActListener(this);\r
+}\r
+\r
 bool SaveElePresenter::OnDrag(UIView &view, const DragEvent &event) {\r
 \r
   if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT &&\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveEleView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveEleView.cpp
index d1560ea..8aa33cf 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveEleView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveEleView.cpp
@@ -132,7 +132,6 @@ void SaveEleView::OnStart() {
 \r
   AddViewToRootContainer(scrollview_);\r
   InitView();\r
-  RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
 }\r
 \r
 } // namespace OHOS\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/SchedulePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/SchedulePresenter.h
index 66be206..8781963 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/SchedulePresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/SchedulePresenter.h
@@ -25,6 +25,7 @@ namespace OHOS
         static SchedulePresenter * GetInstance();\r
 \r
         void OnStart() override;\r
+        void OnResume() override;\r
 \r
     private:\r
         bool OnClick(UIView &view, const ClickEvent &event) override;\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/SchedulePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/SchedulePresenter.cpp
index 0334330..1cbb072 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/SchedulePresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/SchedulePresenter.cpp
@@ -43,6 +43,11 @@ namespace OHOS
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SchedulePresenter::OnStart");\r
     }\r
 \r
+    void SchedulePresenter::OnResume()\r
+    {\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
+    }\r
+\r
     bool SchedulePresenter::OnClick(UIView &view, const ClickEvent &event)\r
     {\r
         UNUSED(event);\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/ScheduleView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/ScheduleView.cpp
index e0e7c07..96053dd 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/ScheduleView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/ScheduleView.cpp
@@ -46,7 +46,6 @@ namespace OHOS
         }\r
 \r
         DisplayDataOrNoScreen();\r
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
     }\r
 \r
     void ScheduleView::DisplaySelectScreen(uint8_t ScreenIndex)\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialPresenter.cpp
index 0066e65..9eff795 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialPresenter.cpp
@@ -49,7 +49,7 @@ namespace OHOS
     void SetAodDialPresenter::OnResume(void)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetAodDialView::OnResume");
-        Presenter<SetAodDialView>::OnResume();
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void SetAodDialPresenter::OnStop(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp
index af6a6a5..c16152f 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp
@@ -177,6 +177,5 @@ namespace OHOS
         scrollView->Add(SetAodDialToggleButton);
         scrollView->Add(note);
         AddViewToRootContainer(scrollView);
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp
index 551a0d8..c15694e 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp
@@ -47,6 +47,7 @@ namespace OHOS
 
     void SetDialPresenter::OnResume(void)
     {
+        RootView::GetInstance()->SetOnKeyActListener(this);
     }
 
     void SetDialPresenter::OnStop(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialView.cpp
index 9f1e776..170210b 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialView.cpp
@@ -38,7 +38,6 @@ namespace OHOS
             SetUpRollerView();
         }
 
-       RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 
     void SetDialView::SetUpCoverflowView(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/include/SetTimeFormatPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/include/SetTimeFormatPresenter.h
index 086b191..956dab4 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/include/SetTimeFormatPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/include/SetTimeFormatPresenter.h
@@ -24,6 +24,7 @@ namespace OHOS
         ~SetTimeFormatPresenter();
         SetTimeFormatPresenter(const SetTimeFormatPresenter &) = delete;
         SetTimeFormatPresenter &operator=(const SetTimeFormatPresenter &) = delete;
+        void OnResume() override;
         bool OnClick(UIView &view, const ClickEvent &event) override;
         bool OnDrag(UIView &view, const DragEvent &event) override;
         bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatPresenter.cpp
index c2d7f15..80ea2a7 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatPresenter.cpp
@@ -24,6 +24,10 @@ SetTimeFormatPresenter::~SetTimeFormatPresenter() {
 
 }
 
+void SetTimeFormatPresenter::OnResume() {
+  RootView::GetInstance()->SetOnKeyActListener(this);
+}
+
 bool SetTimeFormatPresenter::OnClick(UIView &view, const ClickEvent &event) {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetTimeFormatPresenter::OnClick");
   view_->OnClick(view);

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatView.cpp
index 7487cdb..16f094d 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatView.cpp
@@ -31,7 +31,6 @@ void SetTimeFormatView::OnStart() {
   GetRootContainer()->SetOnDragListener(presenter_);
 
   GetRootContainer()->SetTouchable(true);
-  RootView::GetInstance()->SetOnKeyActListener(presenter_);
 }
 
 bool SetTimeFormatView::SetTimeFormatInit() {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/include/SleepModePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/include/SleepModePresenter.h
index f116f6d..f579d64 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/include/SleepModePresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/include/SleepModePresenter.h
@@ -22,6 +22,7 @@ namespace OHOS
         virtual ~SleepModePresenter();
 
         void OnStart() override;
+        void OnResume() override;
        
 
         static SleepModePresenter *GetInstance();

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModePresenter.cpp
index 54eddb7..968a907 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModePresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModePresenter.cpp
@@ -34,6 +34,11 @@ namespace OHOS
         Presenter<SleepModeView>::OnStart();
     }
 
+    void SleepModePresenter::OnResume()
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     bool SleepModePresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepModePresenter::OnDrag");

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModeView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModeView.cpp
index fd53606..29a9d0e 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModeView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModeView.cpp
@@ -41,7 +41,6 @@ namespace OHOS
 
         AddViewToRootContainer(ScrollView_);
 
-       RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 
  

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/CallVolumePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/CallVolumePresenter.cpp
index 752bf91..d330488 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/CallVolumePresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/CallVolumePresenter.cpp
@@ -55,7 +55,7 @@ namespace OHOS
     void CallVolumePresenter::OnResume(void)\r
     {\r
 \r
-        Presenter<CallVolumeView>::OnResume();\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
     }\r
 \r
     void CallVolumePresenter::OnStop(void)\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/CallVolumeView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/CallVolumeView.cpp
index 7db2953..cf6910a 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/CallVolumeView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/CallVolumeView.cpp
@@ -80,7 +80,6 @@ namespace OHOS
         }\r
         UpdateCallVolumeSliderValue();\r
         AddViewToRootContainer(CallVolumeScrollView);\r
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
 \r
         return;\r
     }\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
index 8a00b12..783e52b 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
@@ -54,11 +54,11 @@ namespace OHOS
 \r
     void SoundAndVibrationPresenter::OnResume(void)\r
     {\r
-        Presenter<SoundAndVibrationView>::OnResume();\r
         if (view_ == nullptr)\r
         {\r
             return;\r
         }\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
     }\r
 \r
     void SoundAndVibrationPresenter::OnStop(void)\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
index e6b678f..9ab595b 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationView.cpp
@@ -341,7 +341,6 @@ namespace OHOS
         GetRootContainer()->SetTouchable(true);\r
         GetRootContainer()->SetDraggable(true);\r
         GetRootContainer()->SetOnDragListener(presenter_);\r
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
 \r
         if (!initViewStatus)\r
         {\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SystemVolumePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SystemVolumePresenter.cpp
index dbceca1..a182452 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SystemVolumePresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SystemVolumePresenter.cpp
@@ -58,7 +58,7 @@ namespace OHOS
     void SystemVolumePresenter::OnResume(void)\r
     {\r
 \r
-        Presenter<SystemVolumeView>::OnResume();\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
     }\r
 \r
     void SystemVolumePresenter::OnStop(void)\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SystemVolumeView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SystemVolumeView.cpp
index 5efcec4..541b566 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SystemVolumeView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SystemVolumeView.cpp
@@ -83,7 +83,6 @@ namespace OHOS
         GetRootContainer()->SetTouchable(true);\r
         GetRootContainer()->SetDraggable(true);\r
         GetRootContainer()->SetOnDragListener(presenter_);\r
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
 \r
         if (!initViewStatus)\r
         {\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
index c3a5513..dc6e8ec 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchPresenter.cpp
@@ -53,7 +53,7 @@ namespace OHOS
     void MainStopWatchPresenter::OnResume(void)\r
     {\r
 \r
-        Presenter<MainStopWatchView>::OnResume();\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
     }\r
 \r
     void MainStopWatchPresenter::OnStop(void)\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchView.cpp
index f1e63c0..915c7b4 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchView.cpp
@@ -414,6 +414,5 @@ namespace OHOS
         scrollView[MAIN_STOPWATCH]->Add(ResetOrMarkbutton);\r
         group->Add(scrollView[MAIN_STOPWATCH]);\r
         AddViewToRootContainer(group);\r
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
     }\r
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/include/SystemPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/include/SystemPresenter.h
index 9df11ba..4c60866 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/include/SystemPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/include/SystemPresenter.h
@@ -38,7 +38,7 @@ namespace OHOS
         virtual ~SystemPresenter();\r
 \r
         void OnStart() override;\r
-\r
+        void OnResume() override;\r
         static SystemPresenter *GetInstance();\r
 \r
     private:\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemPresenter.cpp
index 2676073..18a9769 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemPresenter.cpp
@@ -49,6 +49,11 @@ namespace OHOS
 \r
     void SystemPresenter::OnStart(){}\r
 \r
+    void SystemPresenter::OnResume()\r
+    {\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
+    }\r
+\r
     static uint32_t time = 0;\r
     static uint32_t OnClick_num = 0;\r
 \r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemView.cpp
index 8eb7cf3..983a75c 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemView.cpp
@@ -339,7 +339,6 @@ namespace OHOS
             CreateSystemView();\r
         }\r
 \r
-       RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
 \r
         if (SystemScrollView[SYSTEMVIEW] == nullptr)\r
         {\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/include/TakephotosPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/include/TakephotosPresenter.h
index bf22bf5..46376bc 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/include/TakephotosPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/include/TakephotosPresenter.h
@@ -20,6 +20,7 @@ namespace OHOS
         virtual ~TakephotosPresenter();
 
         void OnStart() override;
+        void OnResume() override;
         static TakephotosPresenter *GetInstance();
 
     private:

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosPresenter.cpp
index 6494666..c36791e 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosPresenter.cpp
@@ -61,6 +61,11 @@ namespace OHOS
     {
     }
 
+    void TakephotosPresenter::OnResume()
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     bool TakephotosPresenter::OnDrag(UIView &view, const DragEvent &event)
     {
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT &&

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosView.cpp
index e46f0d4..79c439b 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosView.cpp
@@ -342,7 +342,6 @@ namespace OHOS
     PreLoad();
 
     AddViewToRootContainer(scrollview_);
-    RootView::GetInstance()->SetOnKeyActListener(presenter_);
 
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TakephotosView OnStart is ok");
   }

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/include/ThemeStylePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/include/ThemeStylePresenter.h
index 10545e3..ff087d5 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/include/ThemeStylePresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/include/ThemeStylePresenter.h
@@ -29,6 +29,7 @@ namespace OHOS
         ThemeStyle GetSelectThemeStyleId(void);
 
         void OnStart() override;
+        void OnResume() override;
 
     private:
         bool OnClick(UIView &view, const ClickEvent &event) override;

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStylePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStylePresenter.cpp
index 51e30f2..d398e03 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStylePresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStylePresenter.cpp
@@ -40,6 +40,11 @@ namespace OHOS
 
     void ThemeStylePresenter::OnStart(){}
 
+    void ThemeStylePresenter::OnResume()
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     bool ThemeStylePresenter::OnClick(UIView &view, const ClickEvent &event)
     {
         UNUSED(event);

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp
index 27bc5dc..4269506 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp
@@ -331,7 +331,7 @@ namespace OHOS
         {
             ThemeStyleViewInit();
         }
-       RootView::GetInstance()->SetOnKeyActListener(presenter_);
+       
     }
 
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index 9dad127..b9115cb 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -84,6 +84,7 @@ void TraingCardPresenter::OnPause(void) {
 void TraingCardPresenter::OnResume(void) {\r
 \r
   Presenter<TraingCardView>::OnResume();\r
+  RootView::GetInstance()->SetOnKeyActListener(this);\r
 }\r
 \r
 void TraingCardPresenter::OnStop(void) {\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
index 12f56af..30a9397 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
@@ -615,7 +615,7 @@ void TraingCardView ::InitView() {
   swipe_->SetHorCurrentPage(Control_Card::DATA); // 设置进入索引 [数据]\r
 \r
 \r
-  RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
+\r
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingCardView::InitPage over");\r
 }\r
 \r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/include/WatchQRCodePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/include/WatchQRCodePresenter.h
index 8dec03d..27553a8 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/include/WatchQRCodePresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/include/WatchQRCodePresenter.h
@@ -23,7 +23,7 @@ namespace OHOS
         std::string WatchQRCodeGetQRCodeStr();
 
         void OnStart() override;
-
+        void OnResume() override;
         bool OnClick(UIView &view, const ClickEvent &event) override;
         bool OnDrag(UIView &view, const DragEvent &event) override;
         bool OnDragEnd(UIView &view, const DragEvent &event) override;

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
index d01ced5..163806d 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodePresenter.cpp
@@ -40,6 +40,11 @@ namespace OHOS
 
     void WatchQRCodePresenter::OnStart(){}
 
+    void WatchQRCodePresenter::OnResume()
+    {
+        RootView::GetInstance()->SetOnKeyActListener(this);
+    }
+
     static uint32_t time = 0;
     static uint32_t OnClick_num = 0;
     bool WatchQRCodePresenter::OnClick(UIView &view, const ClickEvent &event)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp
index 4185b3e..237cc54 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp
@@ -174,10 +174,6 @@ namespace OHOS
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::OnStart");
         start_refresh_timer();
         WatchQRCodeViewInit();
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
-        /* --------------------------------- 添加按键监听 --------------------------------- */
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
-        /* -------------------------------------------------------------------------- */
         return;
     }
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherPresenter.cpp
index f4b0941..ac037c0 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherPresenter.cpp
@@ -53,7 +53,7 @@ namespace OHOS
 \r
     void MainWeatherPresenter::OnResume(void)\r
     {\r
-        Presenter<MainWeatherView>::OnResume();\r
+        RootView::GetInstance()->SetOnKeyActListener(this);\r
     }\r
 \r
     void MainWeatherPresenter::OnStop(void)\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherView.cpp
index 16b80cf..591a505 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherView.cpp
@@ -152,7 +152,6 @@ namespace OHOS
             weatherSwipeViewList->SetOnSwipeListener(presenter_);\r
         }\r
         UpdateMainWeatherViewVisibility();\r
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
     }\r
 \r
     WeatherView *MainWeatherView::GetWeatherView(void)\r