设置视图修改

diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingAdapter.h
index 2f194da..7efd6af 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingAdapter.h
@@ -27,7 +27,7 @@ namespace OHOS
     {
     public:
         explicit SettingAdapter();
-        virtual ~SettingAdapter();
+        ~SettingAdapter() override;
 
         /* *
          * @brief Sets the UIView adapter data, which is a SettingItem linked list.
@@ -45,11 +45,11 @@ namespace OHOS
          * @since 1.0
          * @version 1.0
          */
-        virtual uint16_t GetCount(void) override;
+        uint16_t GetCount(void) override;
 
-        virtual UIView *GetView(UIView *inView, int16_t index) override;
+        UIView *GetView(UIView *inView, int16_t index) override;
 
-        virtual void AddListItem(const SettingItem &item);
+        void AddListItem(const SettingItem &item);
 
         void SetItemClickListener(UIView::OnClickListener *itemclicklistener)
         {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h
index 5f327fa..a3832d7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h
@@ -25,12 +25,12 @@ namespace OHOS
     {
     public:
         SettingView();
-        virtual ~SettingView();
+        ~SettingView() override;
 
-        virtual void OnStart() override;
-        virtual void OnSetUpView() override;
-        virtual void OnTearDownView() override;
-        virtual void OnStop() override;
+        void OnStart() override;
+        void OnSetUpView() override;
+        void OnTearDownView() override;
+        void OnStop() override;
         void AddSettingItemToList(const SettingItem &item);
 
     private:

diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
index 251c6ed..0ac99f3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
@@ -64,7 +64,7 @@ namespace OHOS
     void SettingModel::UpdateBlueToothConnectStatus(bool status)
     {
         btConnectStatus = status;
-        if (PullUpDownView::GetInstance() != NULL)
+        if (PullUpDownView::GetInstance() != nullptr)
         {
             PullUpDownView::GetInstance()->UpdateBlueToothStatus(status);
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingPresenter.cpp
index 9aac7ce..a6a895e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingPresenter.cpp
@@ -99,7 +99,7 @@ namespace OHOS
             // {
             //     NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
             // }
-            NativeAbility::GetInstance().Back();
+            NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
         }
         return true;
     }