部分配置修改

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 84f0d94..c10398b 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
@@ -12,8 +12,11 @@
 #include "BluetoothModel.h"
 #include "PhoneService.h"
 #include "bts_le_gap.h"
+#include "NativeRegisterManager.h"
+
 namespace OHOS
 {
+    REGIST_SLICE(VIEW_BLUETOOTH_SERVICE_OPTIONS, BluetoothServiceOptionsView, BluetoothServiceOptionsPresenter);
     // 当前Presenter属性实例化的内存指针
     static BluetoothServiceOptionsPresenter *g_pBluetoothServiceOptionsPresenter = nullptr;
 

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 38c639c..6522078 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
@@ -3,8 +3,9 @@
 #include "ConfigModel.h"
 #include "UiConfig.h"
 #include "wearable_log.h"
-#include "PhoneService.h"
+
 #include "phoneservice/include/PhoneService.h"
+
 #include "BluetoothModel.h"
 #include "ui_resource_string.h"
 #include "cmsis_os2.h"

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 34c34de..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
@@ -103,7 +103,7 @@ namespace OHOS
     {
       
         AddViewToRootContainer(GetGoalPageView());
-        // RootView::GetInstance()->Add(GetGoalPageView());
+        // GetRootContainer()->Add(GetGoalPageView());
 
         if (goalSwipeViewList != nullptr)
         {
@@ -134,7 +134,7 @@ namespace OHOS
         
         /* --------------------------------- 添加按键监听 --------------------------------- */
         // RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::MaingoalPresenter::GetInstance();
-        // RootView::GetInstance()->SetOnKeyActListener(keyactListener);
+        //RootView::GetInstance()->SetOnKeyActListener(keyactListener);
         /* -------------------------------------------------------------------------- */
     }
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.cpp
index 0a59025..3dd0294 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.cpp
@@ -171,6 +171,6 @@ namespace OHOS
         GetRootContainer()->SetDraggable(true);
         GetRootContainer()->SetTouchable(true);
         GetRootContainer()->SetOnDragListener(presenter_);     
-        // GetRootContainer()->SetOnKeyActListener(presenter_);
+        //RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 }

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.cpp
index a0a99d2..37bfee7 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.cpp
@@ -33,6 +33,8 @@
 #include "vibrator_service.h"
 #include "custom_runtime.h"
 
+#include "KeyInputListener.h"
+
 namespace OHOS
 {
     static CheckInvalidView *g_pCheckInvalidView{nullptr};
@@ -221,7 +223,7 @@ namespace OHOS
 
         // 增加按键监听
         RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::CheckInvalidPresenter::GetInstance();
-        RootView::GetInstance()->SetOnKeyActListener(keyactListener);
+       RootView::GetInstance()->SetOnKeyActListener(keyactListener);
     }
    
 }

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartView.cpp
index b56dc73..9401531 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartView.cpp
@@ -294,7 +294,7 @@ void HeartChartView::Update_data_Chart(int serialIndex) {
 
   // heartchart->RefreshChart();
 
-  RootView::GetInstance()->Invalidate();
+ RootView::GetInstance()->Invalidate();
 
   //更新为刚刚检测
   SetLastHeart();
@@ -647,7 +647,7 @@ void HeartChartView::OnStart() {
   // 增加按键监听
   RootView::OnKeyActListener *keyactListener =
       (RootView::OnKeyActListener *)OHOS::HeartChartPresenter::GetInstance();
-  RootView::GetInstance()->SetOnKeyActListener(keyactListener);
+ RootView::GetInstance()->SetOnKeyActListener(keyactListener);
 
   AddViewToRootContainer(scrollView);
 }

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 073da09..c6aa90d 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
@@ -141,7 +141,7 @@ namespace OHOS
         GetRootContainer()->SetDraggable(true);
         GetRootContainer()->SetTouchable(true);
         GetRootContainer()->SetOnDragListener(presenter_);     
-        // GetRootContainer()->SetOnKeyActListener(presenter_);
+        //RootView::GetInstance()->SetOnKeyActListener(presenter_);
 
         if (imageAnimator != nullptr)
         {

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 c008893..0f85238 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,7 @@ namespace OHOS
         GetRootContainer()->SetDraggable(true);
         GetRootContainer()->SetTouchable(true);
         GetRootContainer()->SetOnDragListener(presenter_);     
-        // GetRootContainer()->SetOnKeyActListener(presenter_);
+        //RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
     
 }

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 8501d89..4da0519 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
@@ -49,27 +49,19 @@ namespace OHOS
     void LanguageSwitchPresenter::OnStart()
     {
         Presenter<LanguageSwitchView>::OnStart();
-    }
-
-    void LanguageSwitchPresenter::OnResume(void)
-    {
-        Presenter<LanguageSwitchView>::OnResume();
         if (view_ == nullptr)
         {
             return;
         }
-
-#if 0
-        for (uint8_t i = 0; i < MAX_LANGUAGE; i++)
-        {
-            view_->AddLanguageItemToList(languages[i]);
-        }
-#else
         for (uint8_t i = 0; i < 2; i++)
         {
             view_->AddLanguageItemToList(languages[i]);
         }
-#endif
+    }
+
+    void LanguageSwitchPresenter::OnResume(void)
+    {
+        Presenter<LanguageSwitchView>::OnResume();
     }
 
     void LanguageSwitchPresenter::OnPause(void)

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 7010058..9021405 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
@@ -193,7 +193,7 @@ namespace OHOS
     void LanguageSwitchView::show_hint_group(std::string code, bool data)
     {
         group->SetVisible(data);
-        RootView::GetInstance()->Invalidate();
+       RootView::GetInstance()->Invalidate();
         if (data)
         {
             hint_id_code = code;
@@ -264,9 +264,9 @@ namespace OHOS
         button_cancel->SetImagePosition(15, 15);
         button_cancel->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff191919, UIButton::PRESSED);
         button_cancel->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);
-#ifdef FD230_650
+
         button_cancel->SetImageSrc(PNG_SYSTEM_CHECK_OFF_IMAGE, PNG_SYSTEM_CHECK_OFF_IMAGE);
-#endif
+
         button_cancel->SetViewId("BUTTON_CHECK_NO");
         group->Add(button_cancel);
         /* ------------------------ button_ensure ----------------------- */

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp
index f5f408c..9289ede 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp
@@ -34,7 +34,7 @@
 #include "sleep/include/SleepCardView.h"
 #include "sleep/include/SleepModel.h"
 #include "MainModel.h"
-// #include "../../../../../../../drivers/peripheral/utils/custom_runtime.h"
+// #include "custom_runtime.h"
 // #include "rebootandshutdown/include/RebootAndShutdownModelC.h"
 
 #if USE_OFFLINE_DIAL

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/PullUpDownView.cpp
index d0e751a..c6c4099 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/PullUpDownView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/PullUpDownView.cpp
@@ -18,7 +18,9 @@
 #include "custom_utils.h"
 #include "custom_runtime.h"
 #include "bluetooth/include/BluetoothModel.h"
+
 #include "phoneservice/include/PhoneService.h"
+
 #include "ConfigModel.h"
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp
index 7ca2d4c..7981beb 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp
@@ -185,7 +185,7 @@ bool VolumeSliderEventListener::OnDrag(UIView& view, const DragEvent& event)
                 volumeSettingView->SetVisible(false);\r
                 NotificationManager::GetInstance()->SetVolumeScreenStatus(false);\r
             }\r
-            RootView::GetInstance()->Invalidate();\r
+           RootView::GetInstance()->Invalidate();\r
         }\r
     }\r
     return true;\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageModel.h
index 7f736a8..1417859 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageModel.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageModel.h
@@ -3,7 +3,11 @@
 #define MESSAGE_MODEL_H
 
 
-// #include "bletest.h"
+#ifdef SUPPORT_BLE_SERVICE
+#include <bleEvent.h>
+#include "bleService.h"
+#include "bletest.h"
+#endif
 
 #include "message/include/MessagePresenter.h"
 #include <cstdint>

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 49e8c56..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
@@ -276,7 +276,6 @@ namespace OHOS
 
         AddViewToRootContainer(scrollView_);
 
-        // scrollView_->SetOnKeyActListener(presenter_);
     }
    
 }
\ No newline at end of file

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 d51a680..cd6134a 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
@@ -178,7 +178,7 @@ namespace OHOS
         }
 
         // 增加按键监听
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
+        // GetRootContainer()->SetOnKeyActListener(presenter_);
 
         scrollView->Add(Title);
         scrollView->Add(MotionRecognitionImage);

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 a601ad3..4769041 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
@@ -231,7 +231,7 @@ namespace OHOS
         NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(MobileData_toggleButton);
         NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(note);
         AddViewToRootContainer(NetworkAndCallScrollView[NETWORKANDCALLVIEW]);
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
+        //RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 
 
@@ -266,7 +266,7 @@ namespace OHOS
         if (NetworkAndCallScrollView[thisView] == nullptr)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NetworkAndCallView::ChangeNetworkAndCallView");
-            RootView::GetInstance()->Add(NetworkAndCallScrollView[thisView]);
+            GetRootContainer()->Add(NetworkAndCallScrollView[thisView]);
         }
         return true;
     }
@@ -284,7 +284,7 @@ namespace OHOS
                 return false;
             }
             NetworkAndCallScrollView[thisView] = mobileDataOptionsView->MobileDataOptionsViewInit();
-            RootView::GetInstance()->Add(NetworkAndCallScrollView[thisView]);
+            GetRootContainer()->Add(NetworkAndCallScrollView[thisView]);
         }
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp
index 6bbfe2f..14ace55 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp
@@ -524,7 +524,7 @@ void VoiceAssistance::CreateWordLabel(std::string Word, int isclearFlag) // 识
         return;\r
     }\r
     MainVocassistView::GetInstance()->GetVocassist()->Invalidate();\r
-    RootView::GetInstance()->Invalidate();\r
+   RootView::GetInstance()->Invalidate();\r
     return;\r
 }\r
 \r
@@ -565,7 +565,7 @@ void VoiceAssistance::CloseVocassist()
         }\r
         // 刷新界面\r
         MainVocassistView::GetInstance()->GetVocassist()->Invalidate();\r
-        RootView::GetInstance()->Invalidate();\r
+       RootView::GetInstance()->Invalidate();\r
     } else {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Somethings wrongs cause in CloseVocassist!!");\r
         return;\r

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 daa5f68..bc9ac10 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
@@ -12,11 +12,9 @@
 #include "vibrator_service.h"\r
 #include "NativeRegisterManager.h"\r
 \r
-\r
-namespace OHOS {\r
-  \r
-  REGIST_MENU_PRO(VIEW_SAVEELE, SaveEleView, SaveElePresenter,\r
-    PNG_APPLIST_SAVEELE_IMAGE_BIG, PNG_APPLIST_SAVEELE_IMAGE, PNG_APPLIST_SAVEELE_IMAGE, "省电模式", STR_POWER_SAVE_MODE);\r
+namespace OHOS\r
+{\r
+    REGIST_SLICE(VIEW_SAVEELE, SaveEleView, SaveElePresenter);\r
 \r
 // 当前Presenter属性实例化的内存指针\r
 static SaveElePresenter *g_pSaveElePresenter = nullptr;\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp
index 01dd8b3..2788958 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp
@@ -35,7 +35,7 @@ namespace OHOS
 
     void SetCardPresenter::OnStop(void)
     {
-        RootView::GetInstance()->ClearOnKeyActListener();
+    
     }
 
     bool SetCardPresenter::OnClick(UIView &view, const ClickEvent &event)

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 9a9ec29..45421f7 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
@@ -37,7 +37,7 @@ namespace OHOS
             SetUpRollerView();
         }
 
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
+       RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 
     void SetDialView::SetUpCoverflowView(void)

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepControlView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepControlView.cpp
index dd1492e..b91c737 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepControlView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepControlView.cpp
@@ -106,7 +106,7 @@ namespace OHOS
         GetRootContainer()->SetTouchable(true);
         GetRootContainer()->SetDraggable(true);
         AddViewToRootContainer(GetSleepControlPageView());
-        // RootView::GetInstance()->Add(GetSleepControlPageView());
+        // GetRootContainer()->Add(GetSleepControlPageView());
 
         if (SleepSwipeViewList == nullptr)
         {
@@ -132,7 +132,7 @@ namespace OHOS
             return;
         }
 
-        RootView::GetInstance()->SetOnKeyActListener(keyactListener);
+       RootView::GetInstance()->SetOnKeyActListener(keyactListener);
     }
    
 

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 26d714d..fd53606 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,7 @@ namespace OHOS
 
         AddViewToRootContainer(ScrollView_);
 
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
+       RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 
  

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp
index fed442c..19129a3 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp
@@ -43,6 +43,7 @@ namespace OHOS {
     void SettingItemView::SetItemInfo(const SettingItem itemInfo)
     {
         sItemInfo = itemInfo;
+        WEARABLE_LOGE("SettingItemView::SetItemInfo: %s", sItemInfo.label);
         sIcon.SetSrc(itemInfo.icon);
         sLabel.SetText(itemInfo.label);
         sNextImage.SetVisible(itemInfo.hasSecondMenu);

diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a
index 7efb9ea..0cc557d 100644 (file)
Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a differ

diff --git a/code/sdk/zhihui/UI/producttest/include/testView.h b/code/sdk/zhihui/UI/producttest/include/testView.h
index 9c0d29c..c0e420a 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/include/testView.h
+++ b/code/sdk/zhihui/UI/producttest/include/testView.h
@@ -51,9 +51,7 @@ namespace OHOS
         static testView *GetInstance(void);\r
 \r
         void OnStart() override;\r
-        void OnSetUpView() override;\r
-        void OnTearDownView() override;\r
-        void OnStop() override;\r
+   \r
         struct ButtonConfig\r
         {\r
             int x;\r

diff --git a/code/sdk/zhihui/UI/producttest/src/testView.cpp b/code/sdk/zhihui/UI/producttest/src/testView.cpp
index bbb64bd..10e318d 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testView.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testView.cpp
@@ -889,10 +889,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
             uapi_set4GCapability(true);\r
 \r
         start_custom_ble_service();\r
-    }\r
 \r
-    void testView::OnSetUpView()\r
-    {\r
         View<testPresenter>::OnSetUpView();\r
         if (SystemScrollView[TESTVIEW] == nullptr)\r
         {\r
@@ -915,21 +912,7 @@ SystemScrollView[TESTVIEW]->SetStyle(STYLE_BORDER_RADIUS, 0);
         // SystemScrollView[SYSTEMVIEW]->Add(SystemUpgradeButtonExt);\r
 \r
         RootView::GetInstance()->Add(SystemScrollView[TESTVIEW]);\r
-        Draw();\r
     }\r
 \r
-    void testView::OnTearDownView()\r
-    {\r
-\r
-        View<testPresenter>::OnTearDownView();\r
-        return;\r
-    }\r
-\r
-    void testView::OnStop()\r
-    {\r
-\r
-        View<testPresenter>::OnStop();\r
-        RootView::GetInstance()->RemoveAll();\r
-        return;\r
-    }\r
+    \r
 }
\ No newline at end of file