From 945e4d955b0449f6e6bf4965e9fe8a46d1745ca2 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Tue, 28 May 2024 21:00:25 +0800
Subject: [PATCH] =?utf8?q?compass=20=E6=96=87=E4=BB=B6=E5=A4=B9=E6=9B=B4?=
 =?utf8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../compass/include/CompassCalibrationView.h         |  4 ++--
 .../nativeui/compass/include/CompassControlView.h    |  2 +-
 .../fd230app/nativeui/compass/include/CompassModel.h |  2 +-
 .../fd230app/nativeui/compass/include/CompassView.h  |  4 ++--
 .../nativeui/compass/include/MainCompassPresenter.h  | 12 ++++++------
 .../nativeui/compass/src/CompassControlView.cpp      |  4 +++-
 .../fd230app/nativeui/compass/src/CompassModel.cpp   |  4 ++--
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h
index 1c0e93beb..ec186a445 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h
@@ -19,11 +19,11 @@ namespace OHOS {
 class CompassCalibrationView : public AppGroupView {
 public:
     CompassCalibrationView();
-    virtual ~CompassCalibrationView();
+    ~CompassCalibrationView() override;
 
     bool CreateUIViewGroup(void);
     static CompassCalibrationView *GetInstance(void);
-    bool InitView(void *caller);
+    bool InitView(void *caller) override;
 private:
     UILabel *labelOne{nullptr};
     UILabel *labelTwo{nullptr};
diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassControlView.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassControlView.h
index 3867489bb..9c776e9be 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassControlView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassControlView.h
@@ -19,7 +19,7 @@ namespace OHOS {
 class CompassControlView : public UICardPage {
 public:
     CompassControlView();
-    virtual ~CompassControlView();
+    ~CompassControlView() override;
     bool InitView(void);
     void PreLoad(void) override;
     void UnLoad(void) override;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassModel.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassModel.h
index 80d704d63..12f2ed53d 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassModel.h
@@ -8,7 +8,7 @@
 #ifndef COMPASS_MODEL_H
 #define COMPASS_MODEL_H
 
-#include "stdint.h"
+#include <cstdint>
 
 namespace OHOS {
 class CompassModel {
diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h
index 3ba9ea6fc..b05ce5f69 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h
@@ -24,13 +24,13 @@ static constexpr float VIEW_CENTERS = 227;
 class CompassView : public AppGroupView {
 public:
     CompassView();
-    virtual ~CompassView();
+    ~CompassView() override;
 
     void DirectionSetText(const char *text, const char *angle);
     static CompassView *GetInstance(void);
     void CompassStartRotate(int16_t numb);
     bool InitPage(void);
-    bool InitView(void *caller);
+    bool InitView(void *caller) override;
     bool GetInitViewState(void);
     bool InitCompassImage(void);
 private:
diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h
index f2a93867e..8bc3c1d40 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h
@@ -26,17 +26,17 @@ class MainCompassPresenter : public Presenter<CompassView>, public CompassPresen
     public ModelListenerSample, public UIView::OnDragListener {
 public:
     MainCompassPresenter();
-    virtual ~MainCompassPresenter();
+    ~MainCompassPresenter() override;
 
-    virtual void OnStart() override;
-    virtual void OnPause() override;
-    virtual void OnResume() override;
-    virtual void OnStop() override;
+    void OnStart() override;
+    void OnPause() override;
+    void OnResume() override;
+    void OnStop() override;
 
     static MainCompassPresenter *GetInstance(void);
     bool OnDrag(UIView& view, const DragEvent& event) override;
     bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件
-    virtual void Notify() override;
+    void Notify() override;
 };
 }
 #endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp
index be71dc868..71dcefcae 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp
@@ -18,7 +18,9 @@ CompassControlView::CompassControlView()
 CompassControlView::~CompassControlView()
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CompassControlView::~CompassControlView()");
-    ClearAll();
+    if (viewiInitStatus) {
+        ClearAll();
+    }
 }
 
 void CompassControlView::ClearAll(void)
diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassModel.cpp
index 06f069be3..41e854172 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassModel.cpp
@@ -7,7 +7,7 @@
 
 #include <sys/time.h>
 #include "CompassModel.h"
-#include "time.h"
+#include <ctime>
 
 #ifdef __cplusplus
 extern "C" {
@@ -79,7 +79,7 @@ time_t CompassModel::GetLastTime(void)
 time_t CompassModel::GetCurrentTime(void)
 {
     struct timeval tv;
-    gettimeofday(&tv, NULL);
+    gettimeofday(&tv, nullptr);
     return tv.tv_sec;
 }
 
-- 
2.17.1