From 22cf9aca698b2994eff5b4b0b4d22c186a6f1467 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Mon, 12 Jan 2026 16:30:44 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3GPS=E8=BF=90=E5=8A=A8=E9=A1=B5?= =?utf8?q?=E9=9D=A2=E6=81=AF=E5=B1=8F=E5=90=8E=E6=8C=89=E9=94=AE=E7=9B=91?= =?utf8?q?=E5=90=AC=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../traing/include/TraingNomalPresenter.h | 2 -- .../traing/src/TraingNomalPresenter.cpp | 13 +------------ .../include/TraingEphemerisNotePresenter.h | 2 -- .../training_GPS/include/TraingGPSPresenter.h | 2 -- .../include/TraingGPSbackPresenter.h | 2 -- .../include/TraingGPSlackPresenter.h | 2 -- .../include/TraingGPSlostPresenter.h | 2 -- .../include/TraingGPSnotePresenter.h | 2 -- .../include/TraingGPSsetPresenter.h | 2 -- .../src/TraingEphemerisNotePresenter.cpp | 11 ----------- .../training_GPS/src/TraingGPSPresenter.cpp | 15 --------------- .../training_GPS/src/TraingGPSbackPresenter.cpp | 17 ----------------- .../training_GPS/src/TraingGPSlackPresenter.cpp | 16 ---------------- .../training_GPS/src/TraingGPSlostPresenter.cpp | 16 ---------------- .../training_GPS/src/TraingGPSnotePresenter.cpp | 17 +---------------- .../training_GPS/src/TraingGPSsetPresenter.cpp | 17 +---------------- .../training_GPS/src/TraingGPSsetView.cpp | 2 -- 17 files changed, 3 insertions(+), 137 deletions(-) diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/include/TraingNomalPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/include/TraingNomalPresenter.h index 235b21301..40316db81 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/include/TraingNomalPresenter.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/include/TraingNomalPresenter.h @@ -22,9 +22,7 @@ namespace OHOS virtual ~TraingNomalPresenter(); void OnStart() override; - void OnPause() override; void OnResume() override; - void OnStop() override; void NavigateBack(); void OnTickEvent() override; void Notify() override {} diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp index d9dcd7e2a..80603d3e6 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp @@ -72,22 +72,11 @@ namespace OHOS TraingModel::GetInstance()->gnss_start_timer(1000); #endif } - Presenter::OnStart(); - } - - void TraingNomalPresenter::OnPause(void){ - Presenter::OnPause(); } void TraingNomalPresenter::OnResume(void) { - Presenter::OnResume(); - } - - void TraingNomalPresenter::OnStop(void) - { - - Presenter::OnStop(); + RootView::GetInstance()->SetOnKeyActListener(this); } // 回退逻辑 void TraingNomalPresenter::NavigateBack() diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingEphemerisNotePresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingEphemerisNotePresenter.h index 981865347..d172b88cc 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingEphemerisNotePresenter.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingEphemerisNotePresenter.h @@ -18,9 +18,7 @@ namespace OHOS virtual ~TraingEphemerisNotePresenter(); void OnStart() override; - void OnPause() override; void OnResume() override; - void OnStop() override; static TraingEphemerisNotePresenter *GetInstance(); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h index 0cc44acb3..df7dfd546 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h @@ -19,9 +19,7 @@ namespace OHOS virtual ~TraingGPSPresenter(); void OnStart() override; - void OnPause() override; void OnResume() override; - void OnStop() override; static TraingGPSPresenter *GetInstance(); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h index 6e260263e..a5aad8b70 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h @@ -18,9 +18,7 @@ namespace OHOS virtual ~TraingGPSbackPresenter(); void OnStart() override; - void OnPause() override; void OnResume() override; - void OnStop() override; static TraingGPSbackPresenter *GetInstance(); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h index cf3f87826..b88f70c99 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h @@ -19,9 +19,7 @@ namespace OHOS virtual ~TraingGPSlackPresenter(); void OnStart() override; - void OnPause() override; void OnResume() override; - void OnStop() override; static TraingGPSlackPresenter *GetInstance(); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h index 3ca2578ab..06e98db4e 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h @@ -19,9 +19,7 @@ namespace OHOS virtual ~TraingGPSlostPresenter(); void OnStart() override; - void OnPause() override; void OnResume() override; - void OnStop() override; static TraingGPSlostPresenter *GetInstance(); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h index c7a5704f2..98fd93515 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h @@ -18,9 +18,7 @@ namespace OHOS virtual ~TraingGPSnotePresenter(); void OnStart() override; - void OnPause() override; void OnResume() override; - void OnStop() override; static TraingGPSnotePresenter *GetInstance(); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h index 0bb93f533..7b51935fc 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h @@ -18,9 +18,7 @@ namespace OHOS virtual ~TraingGPSsetPresenter(); void OnStart() override; - void OnPause() override; void OnResume() override; - void OnStop() override; static TraingGPSsetPresenter *GetInstance(); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNotePresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNotePresenter.cpp index aa26aadd6..7703217eb 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNotePresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingEphemerisNotePresenter.cpp @@ -40,19 +40,8 @@ namespace OHOS Presenter::OnStart(); } - void TraingEphemerisNotePresenter::OnPause(void) - { - Presenter::OnPause(); - } - void TraingEphemerisNotePresenter::OnResume(void) { - Presenter::OnResume(); - } - - void TraingEphemerisNotePresenter::OnStop(void) - { - Presenter::OnStop(); } bool TraingEphemerisNotePresenter::OnDrag(UIView &view, const DragEvent &event) diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp index c5d575d70..c188c208d 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp @@ -36,27 +36,12 @@ namespace OHOS void TraingGPSPresenter::OnStart() { - - Presenter::OnStart(); - } - - void TraingGPSPresenter::OnPause(void) - { - - Presenter::OnPause(); } void TraingGPSPresenter::OnResume(void) { - - Presenter::OnResume(); } - void TraingGPSPresenter::OnStop(void) - { - - Presenter::OnStop(); - } bool TraingGPSPresenter::OnDrag(UIView &view, const DragEvent &event) { return true; diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp index fe970f072..fe86ca755 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp @@ -35,26 +35,9 @@ namespace OHOS void TraingGPSbackPresenter::OnStart() { - - Presenter::OnStart(); - } - - void TraingGPSbackPresenter::OnPause(void) - { - - Presenter::OnPause(); } - void TraingGPSbackPresenter::OnResume(void) { - - Presenter::OnResume(); - } - - void TraingGPSbackPresenter::OnStop(void) - { - - Presenter::OnStop(); } bool TraingGPSbackPresenter::OnDrag(UIView &view, const DragEvent &event) diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp index 92f54f2fb..5cbb986af 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp @@ -36,27 +36,11 @@ namespace OHOS void TraingGPSlackPresenter::OnStart() { - - Presenter::OnStart(); - } - - void TraingGPSlackPresenter::OnPause(void) - { - - Presenter::OnPause(); } - void TraingGPSlackPresenter::OnResume(void) { - - Presenter::OnResume(); } - void TraingGPSlackPresenter::OnStop(void) - { - - Presenter::OnStop(); - } bool TraingGPSlackPresenter::OnDrag(UIView &view, const DragEvent &event) { return true; diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp index f8a81c046..89b5cbc56 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp @@ -35,26 +35,10 @@ namespace OHOS void TraingGPSlostPresenter::OnStart() { - - Presenter::OnStart(); - } - - void TraingGPSlostPresenter::OnPause(void) - { - - Presenter::OnPause(); } void TraingGPSlostPresenter::OnResume(void) { - - Presenter::OnResume(); - } - - void TraingGPSlostPresenter::OnStop(void) - { - - Presenter::OnStop(); } bool TraingGPSlostPresenter::OnDrag(UIView &view, const DragEvent &event) diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp index 008085a3d..e3682258a 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp @@ -38,27 +38,12 @@ namespace OHOS void TraingGPSnotePresenter::OnStart() { - - Presenter::OnStart(); - } - - void TraingGPSnotePresenter::OnPause(void) - { - - Presenter::OnPause(); } void TraingGPSnotePresenter::OnResume(void) { - - Presenter::OnResume(); - } - - void TraingGPSnotePresenter::OnStop(void) - { - - Presenter::OnStop(); } + bool TraingGPSnotePresenter::OnDrag(UIView &view, const DragEvent &event) { return true; diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp index 1d7eb301a..9dec26aa9 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp @@ -41,27 +41,12 @@ namespace OHOS void TraingGPSsetPresenter::OnStart() { - - Presenter::OnStart(); - } - - void TraingGPSsetPresenter::OnPause(void) - { - - Presenter::OnPause(); } void TraingGPSsetPresenter::OnResume(void) { - - Presenter::OnResume(); - } - - void TraingGPSsetPresenter::OnStop(void) - { - - Presenter::OnStop(); } + bool TraingGPSsetPresenter::OnDrag(UIView &view, const DragEvent &event) { return true; diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp index ead821ee5..358848d76 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp @@ -173,8 +173,6 @@ namespace OHOS } void TraingGPSsetView::OnStart() { - - // 创建 draglistener 实例并设置为拖动监听器 UIView::OnDragListener *draglistener = static_cast(TraingGPSsetPresenter::GetInstance()); if (draglistener == nullptr) -- 2.17.1