Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...

diff --cc code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodView.cpp
index 25cdaf5,b78c050..131540e
--- 1/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodView.cpp
--- 2/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodView.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodView.cpp
@@@ -186,10 -184,10 +186,10 @@@ namespace OHO
       */\r
      bool BloodView::InitView()\r
      {\r
 -        // printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);\r
 +        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool BloodView::InitView()");\r
          if (!Initbackground())\r
          {\r
-             printf("Initbackground error!\n");\r
+             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Initbackground error!\n");\r
          };\r
          if (!InitLable())\r
          {\r

diff --cc code/sdk/application/wearable/nativeapp/nativeui/dial/src/Digital_clockView.cpp
Simple merge

diff --cc code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
index 45175b6,c3adb8b..891de3e
--- 1/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
--- 2/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
@@@ -28,11 -28,12 +28,13 @@@ namespace OHO
      static const MainViewMapper PageMapper[] = {
          {NEW_DAIL, &MainViewSample::InitWatchFacePage},
          {HEART_RATE, &MainViewSample::InitHeartRatePage},
-         {COMPASS, &MainViewSample::InitCompassPage},
          {BloodOxygen, &MainViewSample::InitBloodOxygenPage},
          {TRAINING, &MainViewSample::InitTrainingPage},
-         //{APPLIST,&MainViewSample::InitApplistPage}
 +        {PLAYER,&MainViewSample::InitMusicPlayerPage}
+         {COMPASS, &MainViewSample::InitCompassPage},
+ #if 0
+         {APPLIST,&MainViewSample::InitApplistPage}
+ #endif
      };
  
      MainViewSample::MainViewSample()

diff --cc code/sdk/application/wearable/nativeapp/nativeui/screensetting/include/ScreenModels.h
Simple merge