解决电话界面右滑退出死机问题

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

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/MainPhonePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/MainPhonePresenter.h
index 0ee5bba..bd64969 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/MainPhonePresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/MainPhonePresenter.h
@@ -30,13 +30,7 @@ namespace OHOS
         virtual ~MainPhonePresenter();
 
         void OnStart() override;
-        void OnPause() override;
-        void OnResume() override;
-        void OnStop() override;
         
-
-        
-
         static MainPhonePresenter *GetInstance();
 
     private:

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

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp
index a76fd50..9e1dc32 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp
@@ -46,23 +46,6 @@ namespace OHOS
 
     void DialingMethodPresenter::OnStart()
     {
-        Presenter<DialingMethodView>::OnStart();
-    }
-
-    void DialingMethodPresenter::OnPause(void)
-    {
-        Presenter<DialingMethodView>::OnPause();
-    }
-
-    void DialingMethodPresenter::OnResume(void)
-    {
-        Presenter<DialingMethodView>::OnResume();
-    }
-
-    void DialingMethodPresenter::OnStop(void)
-    {
-        Presenter<DialingMethodView>::OnStop();
-        //set_address_number(NULL);
     }
 
     bool DialingMethodPresenter::OnClick(UIView &view, const ClickEvent &event)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodView.cpp
index ec86a80..086433a 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodView.cpp
@@ -806,14 +806,13 @@ namespace OHOS
 
     void DialingMethodView::OnStart()
     {
-        View<DialingMethodPresenter>::OnStart();
         DialingMethodViewInit();
         init_no_HFP();
         init_no_sim();
         init_open_hfp();
         // 增加按键监听
         RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::DialingMethodPresenter::GetInstance();
-       RootView::GetInstance()->SetOnKeyActListener(keyactListener);
+        RootView::GetInstance()->SetOnKeyActListener(keyactListener);
 
         
         DialingMethodScrollView->Add(DialingMethodTitleLabel);
@@ -827,7 +826,7 @@ namespace OHOS
         DialingMethodScrollView->Add(OPEN_HFP_ScrollView);
         
         
-       RootView::GetInstance()->Add(DialingMethodScrollView);
+        AddViewToRootContainer(DialingMethodScrollView);
     }
 
   

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/MainPhonePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/MainPhonePresenter.cpp
index c6ee00a..dde55b5 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/MainPhonePresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/MainPhonePresenter.cpp
@@ -50,22 +50,6 @@ namespace OHOS
 
     void MainPhonePresenter::OnStart()
     {
-        Presenter<MainPhoneView>::OnStart();
-    }
-
-    void MainPhonePresenter::OnPause(void)
-    {
-        Presenter<MainPhoneView>::OnPause();
-    }
-
-    void MainPhonePresenter::OnResume(void)
-    {
-        Presenter<MainPhoneView>::OnResume();
-    }
-
-    void MainPhonePresenter::OnStop(void)
-    {
-        Presenter<MainPhoneView>::OnStop();
     }
 
     static uint8_t MainPhonePresenter_atoi(const char* buf)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/PhoneDirPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/PhoneDirPresenter.cpp
index b359042..ec297e0 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/PhoneDirPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/PhoneDirPresenter.cpp
@@ -39,30 +39,10 @@ namespace OHOS
 \r
     void PhoneDirPresenter::OnStart()\r
     {\r
-\r
-        Presenter<PhoneDirView>::OnStart();\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PhoneDirPresenter::");\r
         Set_onepage_address=false;\r
     }\r
 \r
-    void PhoneDirPresenter::OnPause(void)\r
-    {\r
-\r
-        Presenter<PhoneDirView>::OnPause();\r
-    }\r
-\r
-    void PhoneDirPresenter::OnResume(void)\r
-    {\r
-\r
-        Presenter<PhoneDirView>::OnResume();\r
-    }\r
-\r
-    void PhoneDirPresenter::OnStop(void)\r
-    {\r
-\r
-        Presenter<PhoneDirView>::OnStop();\r
-    }\r
-\r
     bool PhoneDirPresenter::OnDrag(UIView &view, const DragEvent &event)\r
     {\r
 \r

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 59f0a36..289720e 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,9 +135,6 @@ namespace OHOS
         virtual ~RecordingPresenter();\r
 \r
         void OnStart() override;\r
-        void OnPause() override;\r
-        void OnResume() override;\r
-        void OnStop() override;\r
 \r
         static RecordingPresenter *GetInstance();\r
         int convertNumericDateTime(const char *numericDateTime, char *formattedDateTime);\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 3b91766..76a3481 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
@@ -40,12 +40,13 @@ namespace OHOS
 \r
     RecordingPresenter::~RecordingPresenter()\r
     {\r
+        p_RecordingModel->ClearRecordingPlayer();\r
+        StopRecord();\r
         g_pRecordPresenter = nullptr;\r
     }\r
 \r
     RecordingPresenter *RecordingPresenter::GetInstance()\r
     {\r
-\r
         return g_pRecordPresenter;\r
     }\r
 \r
@@ -58,24 +59,6 @@ namespace OHOS
         // ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);\r
     }\r
 \r
-    void RecordingPresenter::OnPause(void)\r
-    {\r
-        Presenter<RecordingView>::OnPause();\r
-    }\r
-\r
-    void RecordingPresenter::OnResume(void)\r
-    {\r
-\r
-        Presenter<RecordingView>::OnResume();\r
-    }\r
-\r
-    void RecordingPresenter::OnStop(void)\r
-    {\r
-        p_RecordingModel->ClearRecordingPlayer();\r
-        StopRecord();\r
-        // ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);\r
-    }\r
-\r
     bool RecordingPresenter::OnDrag(UIView &view, const DragEvent &event)\r
     {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnDrag");\r

diff --git a/code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_view.cpp b/code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_view.cpp
index 50645dd..35f6dac 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_view.cpp
+++ b/code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_view.cpp
@@ -74,7 +74,7 @@ UIView::~UIView()
 #endif
     ClearBackgroundBlur();
     if (parent_ != nullptr) {
-        GRAPHIC_LOGE("UIView::~UIView failed, parent is not nullptr! Need to remove from parent component first");
+        GRAPHIC_LOGE("UIView::~UIView failed, parent is not nullptr! Need to remove from parent component first,type:%d",GetViewType());
     }
     if (transMap_ != nullptr) {
         delete transMap_;