修改GetRootContainer的更新

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmCloseRingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmCloseRingView.cpp
index e69e8b6..f6bd43d 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmCloseRingView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmCloseRingView.cpp
@@ -14,8 +14,10 @@
 #include "graphic_timer.h"\r
 \r
 #include "AlarmPopUpPresenter.h"\r
-#include "PhoneService.h"\r
 \r
+#ifdef FD230_650\r
+#include "PhoneService.h"\r
+#endif\r
 namespace OHOS {\r
 #define CLOSE "关闭"\r
 \r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantView.cpp
index 24b8526..50e4d78 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantView.cpp
@@ -241,7 +241,7 @@ void AssistantView::OnStart() {
 
   InitView();
 
-  // RootView::GetInstance()->SetOnKeyActListener(presenter_);
+  //RootView::GetInstance()->SetOnKeyActListener(presenter_);
   AddViewToRootContainer(AssistantScrollView[ASSISTANT_MAIN_VIEW]);
 }
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp
index a3a0386..76075bf 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp
@@ -157,9 +157,9 @@ namespace OHOS
             imageAnimator->Start();
         }
 
-        GetRootContainer()->SetDraggable(true);
-        GetRootContainer()->SetTouchable(true);
-        GetRootContainer()->SetOnDragListener(presenter_);
+       RootView::GetInstance()->SetDraggable(true);
+       RootView::GetInstance()->SetTouchable(true);
+       RootView::GetInstance()->SetOnDragListener(presenter_);
 
         // 增加按键监听
         // presenter_->SetOnKeyActListener(keyactListener);

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
index 19e2735..8d5a118 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp
@@ -202,13 +202,13 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodResultView::InitBloodView fail");
         }
 
-        GetRootContainer()->SetDraggable(true);
-        GetRootContainer()->SetTouchable(true);
-        GetRootContainer()->SetOnDragListener(presenter_);
+       RootView::GetInstance()->SetDraggable(true);
+       RootView::GetInstance()->SetTouchable(true);
+       RootView::GetInstance()->SetOnDragListener(presenter_);
 
         // 增加按键监听
         // RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::BloodResultPresenter::GetInstance();
-        // RootView::GetInstance()->SetOnKeyActListener(keyactListener);
+        //RootView::GetInstance()->SetOnKeyActListener(keyactListener);
     }
 
 }

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorView.cpp
index d032f7b..1e89cf6 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorView.cpp
@@ -25,7 +25,7 @@ CalculatorView::CalculatorView()
 CalculatorView::~CalculatorView()
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "::CalculatorView::~CalculatorView ");
-    RootView::GetInstance()->ClearOnKeyActListener();
+ 
     g_pMainView = nullptr;
     group->RemoveAll();
     if(number)
@@ -624,12 +624,12 @@ void CalculatorView::OnStart()
     View<CalculatorPresenter>::OnStart();
 
     AddViewToRootContainer(new UIViewGroup());
-    GetRootContainer()->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
-    GetRootContainer()->SetTouchable(true);
-    GetRootContainer()->SetDraggable(true);
+   RootView::GetInstance()->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
+   RootView::GetInstance()->SetTouchable(true);
+   RootView::GetInstance()->SetDraggable(true);
 
     RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::CalculatorPresenter::GetInstance();
-    RootView::GetInstance()->SetOnKeyActListener(keyactListener);
+   RootView::GetInstance()->SetOnKeyActListener(keyactListener);
 
     group = new UIViewGroup();
     if (group == nullptr) {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp
index d3c285e..a233fb3 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp
@@ -336,7 +336,7 @@ namespace OHOS
         {
             ThemeStyleViewInit();
         }
-        RootView::GetInstance()->SetOnKeyActListener(presenter_);
+       RootView::GetInstance()->SetOnKeyActListener(presenter_);
     }
 
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingEnddataView.cpp
index 8922ed4..c209ac3 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingEnddataView.cpp
@@ -667,7 +667,7 @@ static void SetKeyActListener() {
   // 增加按键监听
   RootView::OnKeyActListener *keyactListener =
       (RootView::OnKeyActListener *)OHOS::TraingEnddataPresenter::GetInstance();
-  RootView::GetInstance()->SetOnKeyActListener(keyactListener);
+ RootView::GetInstance()->SetOnKeyActListener(keyactListener);
 }
 void TraingEnddataView::OnStart() {
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalView.cpp
index 7e4e204..1260685 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalView.cpp
@@ -98,7 +98,7 @@ namespace OHOS
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener");
         // 增加按键监听
         RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::TraingNomalPresenter::GetInstance();
-        RootView::GetInstance()->SetOnKeyActListener(keyactListener);
+       RootView::GetInstance()->SetOnKeyActListener(keyactListener);
     }
     void TraingNomalView::OnStart()
     {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingSetView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingSetView.cpp
index a9a2735..0b6b4a1 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingSetView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingSetView.cpp
@@ -244,7 +244,7 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingSetView:: new container[%d] fail", thisview);\r
                 return false;\r
             }\r
-            RootView::GetInstance()->Add(SetTagScrollView[thisview]);\r
+            GetRootContainer()->Add(SetTagScrollView[thisview]);\r
         }\r
         return true;\r
     }\r
@@ -260,7 +260,7 @@ namespace OHOS
                 return false;\r
             }\r
             SetTagScrollView[thisview] = setcalories->SetCaluliViewInit();\r
-            RootView::GetInstance()->Add(SetTagScrollView[thisview]);\r
+            GetRootContainer()->Add(SetTagScrollView[thisview]);\r
         }\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetTagScrollView[%d] is not null", thisview);\r
         return true;\r
@@ -277,7 +277,7 @@ namespace OHOS
                 return false;\r
             }\r
             SetTagScrollView[thisview] = settime->SetTimeViewInit();\r
-            RootView::GetInstance()->Add(SetTagScrollView[thisview]);\r
+            GetRootContainer()->Add(SetTagScrollView[thisview]);\r
         }\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetTagScrollView[%d] is not null", thisview);\r
         return true;\r
@@ -294,7 +294,7 @@ namespace OHOS
                 return false;\r
             }\r
             SetTagScrollView[thisview] = setmile->SetMileViewInit();\r
-            RootView::GetInstance()->Add(SetTagScrollView[thisview]);\r
+            GetRootContainer()->Add(SetTagScrollView[thisview]);\r
         }\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetTagScrollView[%d] is not null", thisview);\r
         return true;\r
@@ -311,7 +311,7 @@ namespace OHOS
                 return false;\r
             }\r
             SetTagScrollView[thisview] = setstep->SetStepViewInit();\r
-            RootView::GetInstance()->Add(SetTagScrollView[thisview]);\r
+            GetRootContainer()->Add(SetTagScrollView[thisview]);\r
         }\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetTagScrollView[%d] is not null", thisview);\r
         return true;\r
@@ -390,7 +390,7 @@ namespace OHOS
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener");\r
         // 增加按键监听\r
         RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::TraingSetPresenter::GetInstance();\r
-        RootView::GetInstance()->SetOnKeyActListener(keyactListener);\r
+       RootView::GetInstance()->SetOnKeyActListener(keyactListener);\r
     }\r
     void TraingSetView::OnStart()\r
     {\r
@@ -425,13 +425,13 @@ namespace OHOS
         }\r
 \r
         SetKeyActListener();\r
-        // RootView::GetInstance()->Add(SetTagScrollView[SET_VIEW]);\r
+        // GetRootContainer()->Add(SetTagScrollView[SET_VIEW]);\r
         // SetCurrentViewId(SET_VIEW); // 设置当前页面ID\r
 \r
         if (group != nullptr)\r
         {\r
             SetTagScrollView[SET_VIEW] = group;\r
-            RootView::GetInstance()->Add(SetTagScrollView[SET_VIEW]);\r
+            GetRootContainer()->Add(SetTagScrollView[SET_VIEW]);\r
             SetCurrentViewId(SET_VIEW);\r
         }\r
     }\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingView.cpp
index fa6af93..b79ec68 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingView.cpp
@@ -223,7 +223,7 @@ static void SetKeyActListener() {
   // 增加按键监听\r
   RootView::OnKeyActListener *keyactListener =\r
       (RootView::OnKeyActListener *)OHOS::TraingPresenter::GetInstance();\r
-  RootView::GetInstance()->SetOnKeyActListener(keyactListener);\r
+ RootView::GetInstance()->SetOnKeyActListener(keyactListener);\r
 }\r
 void TraingView::OnStart() {\r
 #if 0\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h
index 8422992..b2f2fdd 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h
@@ -9,7 +9,11 @@
 #include "traing/training_card/include/TrainingDataView.h"\r
 #include "traing/training_card/include/TrainingDetailView.h"\r
 \r
-// #include "bletest.h"\r
+#ifdef SUPPORT_BLE_SERVICE\r
+#include <bleEvent.h>\r
+#include "bleService.h"\r
+#include "bletest.h"\r
+#endif\r
 \r
 #include "components/root_view.h"\r
 #include "components/ui_swipe_view.h"\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
index 49d42be..70cf11f 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
@@ -618,7 +618,7 @@ void TraingCardView ::InitView() {
   }\r
   swipe_->SetOnSwipeListener(onSwipeListener);\r
 \r
-  RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
+ RootView::GetInstance()->SetOnKeyActListener(presenter_);\r
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingCardView::InitPage over");\r
 }\r
 \r
@@ -840,7 +840,7 @@ void TraingCardView::ShowEndView() {
   back->SetImageSrc(YES_IMAGE, YES_IMAGE);\r
   endView->Add(exit);\r
   endView->Add(back);\r
-  RootView::GetInstance()->Add(endView);\r
+  GetRootContainer()->Add(endView);\r
   endView->SetDraggable(false);\r
   endView->SetTouchable(true);\r
   endView->SetVisible(false); // 界面隐藏\r
@@ -885,7 +885,7 @@ void TraingCardView::ShowGetTagView() {
   getView->Add(buttonok_);\r
 \r
   InitImageAnimator();\r
-  RootView::GetInstance()->Add(getView);\r
+  GetRootContainer()->Add(getView);\r
   getView->SetDraggable(false);\r
   getView->SetTouchable(true);\r
   getView->SetVisible(false); // 界面隐藏\r
@@ -931,7 +931,7 @@ void TraingCardView::ShowHeartView() {
       TraingCardPresenter::GetInstance()));\r
   heartView->Add(buttonnote_);\r
 \r
-  RootView::GetInstance()->Add(heartView);\r
+  GetRootContainer()->Add(heartView);\r
   heartView->SetDraggable(false);\r
   heartView->SetTouchable(true);\r
   heartView->SetVisible(false); // 界面隐藏\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp
index 6769b0b..c36af53 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp
@@ -32,7 +32,7 @@ void TraingAquaticView::SetKeyActListener() {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener");
   auto keyActListener = static_cast<RootView::OnKeyActListener *>(
       TraingAquaticPresenter::GetInstance());
-  RootView::GetInstance()->SetOnKeyActListener(keyActListener);
+ RootView::GetInstance()->SetOnKeyActListener(keyActListener);
 }
 
 void TraingAquaticView::InitScrollView() {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ball/src/TraingBallView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ball/src/TraingBallView.cpp
index 5ca38c4..6d66afc 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ball/src/TraingBallView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ball/src/TraingBallView.cpp
@@ -30,7 +30,7 @@ void TraingBallView::SetKeyActListener() {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener");
   auto keyActListener = static_cast<RootView::OnKeyActListener *>(
       TraingBallPresenter::GetInstance());
-  RootView::GetInstance()->SetOnKeyActListener(keyActListener);
+ RootView::GetInstance()->SetOnKeyActListener(keyActListener);
 }
 
 void TraingBallView::InitScrollView() {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_dance/src/TraingDanceView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_dance/src/TraingDanceView.cpp
index 52a7042..602e005 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_dance/src/TraingDanceView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_dance/src/TraingDanceView.cpp
@@ -30,7 +30,7 @@ void TraingDanceView::SetKeyActListener() {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener");
   auto keyActListener = static_cast<RootView::OnKeyActListener *>(
       TraingDancePresenter::GetInstance());
-  RootView::GetInstance()->SetOnKeyActListener(keyActListener);
+ RootView::GetInstance()->SetOnKeyActListener(keyActListener);
 }
 
 void TraingDanceView::InitScrollView() {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp
index 6a93662..a7da83a 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp
@@ -32,7 +32,7 @@ void TraingFitnessView::SetKeyActListener() {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener");
   auto keyActListener = static_cast<RootView::OnKeyActListener *>(
       TraingFitnessPresenter::GetInstance());
-  RootView::GetInstance()->SetOnKeyActListener(keyActListener);
+ RootView::GetInstance()->SetOnKeyActListener(keyActListener);
 }
 
 void TraingFitnessView::InitScrollView() {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ice/src/TraingIceView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ice/src/TraingIceView.cpp
index ace4ad7..9e97dbe 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ice/src/TraingIceView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ice/src/TraingIceView.cpp
@@ -32,7 +32,7 @@ void TraingIceView::SetKeyActListener() {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener");
   auto keyActListener = static_cast<RootView::OnKeyActListener *>(
       TraingIcePresenter::GetInstance());
-  RootView::GetInstance()->SetOnKeyActListener(keyActListener);
+ RootView::GetInstance()->SetOnKeyActListener(keyActListener);
 }
 
 void TraingIceView::InitScrollView() {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_limit/src/TraingLimitView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_limit/src/TraingLimitView.cpp
index 2fbb6cf..c0eb69a 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_limit/src/TraingLimitView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_limit/src/TraingLimitView.cpp
@@ -33,7 +33,7 @@ void TraingLimitView::SetKeyActListener() {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener");\r
   auto keyActListener = static_cast<RootView::OnKeyActListener *>(\r
       TraingLimitPresenter::GetInstance());\r
-  RootView::GetInstance()->SetOnKeyActListener(keyActListener);\r
+ RootView::GetInstance()->SetOnKeyActListener(keyActListener);\r
 }\r
 \r
 void TraingLimitView::InitScrollView() {\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMoreView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMoreView.cpp
index 6627d50..dae4905 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMoreView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMoreView.cpp
@@ -30,7 +30,7 @@ void TraingMoreView::SetKeyActListener() {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener");\r
   auto keyActListener = static_cast<RootView::OnKeyActListener *>(\r
       TraingMorePresenter::GetInstance());\r
-  RootView::GetInstance()->SetOnKeyActListener(keyActListener);\r
+ RootView::GetInstance()->SetOnKeyActListener(keyActListener);\r
 }\r
 \r
 void TraingMoreView::InitScrollView() {\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_other/src/TraingOtherView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_other/src/TraingOtherView.cpp
index f6c9ae4..abaf5af 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_other/src/TraingOtherView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_other/src/TraingOtherView.cpp
@@ -32,7 +32,7 @@ void TraingOtherView::SetKeyActListener() {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener");
   auto keyActListener = static_cast<RootView::OnKeyActListener *>(
       TraingOtherPresenter::GetInstance());
-  RootView::GetInstance()->SetOnKeyActListener(keyActListener);
+ RootView::GetInstance()->SetOnKeyActListener(keyActListener);
 }
 
 void TraingOtherView::InitScrollView() {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_rest/src/TraingRestView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_rest/src/TraingRestView.cpp
index 42853f3..50dbfe6 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_rest/src/TraingRestView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_rest/src/TraingRestView.cpp
@@ -31,7 +31,7 @@ void TraingRestView::SetKeyActListener() {
   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetKeyActListener");
   auto keyActListener = static_cast<RootView::OnKeyActListener *>(
       TraingRestPresenter::GetInstance());
-  RootView::GetInstance()->SetOnKeyActListener(keyActListener);
+ RootView::GetInstance()->SetOnKeyActListener(keyActListener);
 }
 
 void TraingRestView::InitScrollView() {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/src/TraingRecordView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/src/TraingRecordView.cpp
index b810c02..a136b54 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/src/TraingRecordView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/src/TraingRecordView.cpp
@@ -160,7 +160,7 @@ void TraingRecordView::ShowLackView() {
   lackView->Add(imagerecord);
   lackView->Add(buttongo);
 
-  // RootView::GetInstance()->lackView
+  // GetRootContainer()->lackView
   scrollview->Add(lackView);
   // printf("lackView Add\r\n");
 
@@ -271,7 +271,7 @@ void TraingRecordView::OnStart() {
   // 增加按键监听
   RootView::OnKeyActListener *keyactListener =
       (RootView::OnKeyActListener *)OHOS::TraingRecordPresenter::GetInstance();
-  RootView::GetInstance()->SetOnKeyActListener(keyactListener);
+ RootView::GetInstance()->SetOnKeyActListener(keyactListener);
 
   if (TraingRecordModel::GetInstance().GetJsonStatus()) {
     recordView->Add(TraingRecordList);

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISampleView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISampleView.cpp
index d2d7777..85b6fef 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISampleView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISampleView.cpp
@@ -51,7 +51,7 @@ void UISampleView::InitView()
         mainList_->SetOnDragListener(dragListener_);
     }
     AddViewToRootContainer(mainList_);
-    GetRootContainer()->Invalidate();
+    RootView::GetInstance()->Invalidate();
 }
 
 void UISampleView::OnStart()

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/uitest/framework/src/test_case_list_adapter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/uitest/framework/src/test_case_list_adapter.cpp
index d2161b6..6e6fb1b 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/uitest/framework/src/test_case_list_adapter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/uitest/framework/src/test_case_list_adapter.cpp
@@ -50,7 +50,7 @@ public:
         if (uiTest != nullptr) {
             uiTest->TearDown();
         }
-        RootView::GetInstance()->SetOnKeyActListener(g_keyListener);
+       RootView::GetInstance()->SetOnKeyActListener(g_keyListener);
         g_keyListener = nullptr;
         UISampleView::GetInstance()->InitView();
         return true;
@@ -83,8 +83,8 @@ public:
             tempView->SetViewId(view.GetViewId());
             tempView->SetPosition(tempView->GetX(), tempView->GetY());
             rootContainer->Add(tempView);
-            g_keyListener = RootView::GetInstance()->GetOnKeyActListener();
-            RootView::GetInstance()->SetOnKeyActListener(nullptr);
+            g_keyListener =     RootView::GetInstance()->GetOnKeyActListener();
+           RootView::GetInstance()->SetOnKeyActListener(nullptr);
         }
         if (backBtn_ == nullptr) {
             backBtn_ = new TransparentBackButton();

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherView.cpp
index caa57f4..591a505 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/MainWeatherView.cpp
@@ -113,7 +113,7 @@ namespace OHOS
                 weatherSwipeViewList->SetVisible(false);\r
                 weatherScrllView->SetOnDragListener(presenter_);\r
             }\r
-            GetRootContainer()->Invalidate();\r
+            RootView::GetInstance()->Invalidate();\r
             return true;\r
         }\r
         return false;\r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/player/include/BluetoothView.h b/code/sdk/application/wearable/nativeapp/nativeui/player/include/BluetoothView.h
deleted file mode 100644 (file)
index a5465e5..0000000
--- a/code/sdk/application/wearable/nativeapp/nativeui/player/include/BluetoothView.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*\r
- * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.\r
- * Description: Bluetooth view 设置页面\r
- * Create: 2021-09-5\r
- */\r
-\r
-#ifndef BLUETOOTH_VIEW_H\r
-#define BLUETOOTH_VIEW_H\r
-\r
-#include "components/ui_label.h"\r
-#include "components/ui_image_view.h"\r
-#include "components/ui_radio_button.h"\r
-#include "components/ui_label_button.h"\r
-#include "components/ui_view_group.h"\r
-\r
-namespace OHOS {\r
-class PlayerOnDragListener;\r
-class BluetoothView {\r
-public:\r
-    BluetoothView();\r
-    virtual ~BluetoothView();\r
-    UIViewGroup *LoadBluetoothView(void);\r
-    static BluetoothView *GetInstance(void);\r
-    UIViewGroup *group{nullptr};\r
-    UIRadioButton *GetPhoneButton(void);\r
-    UIRadioButton *GetWatchButton(void);\r
-    UIButton *GetSettingButton(void);\r
-    UILabelButton *GetDeleteButton(void);\r
-private:\r
-    UILabel *watchLabel{nullptr};\r
-    UILabel *phoneLabel{nullptr};\r
-    UILabel *bluetoothLabel{nullptr};\r
-    UIImageView *watchImage{nullptr};\r
-    UIImageView *phoneImage{nullptr};\r
-    UIImageView *bluetoothImage{nullptr};\r
-    UIRadioButton *watchButton{nullptr};\r
-    UIRadioButton *phoneButton{nullptr};\r
-    UIButton *settingButton{nullptr};\r
-    UILabelButton *deleteButton{nullptr};\r
-    int LoadRadioButton();\r
-    int LoadButtonView();\r
-    int LoadLabelButton();\r
-    int LoadLabel();\r
-    int LoadImage();\r
-\r
-    void SetUpButton(UILabelButton *btn, const Point& point, int16_t width, int16_t height,\r
-                     UIView::OnClickListener *listener);\r
-};\r
-} // namespace OHOS\r
-#endif
\ No newline at end of file