From: 罗正yun <1732036298@qq.com>
Date: Thu, 18 Jan 2024 11:14:03 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1361
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=c5ca69ec50774b9a2ffcba7f2c4e9b9940c86642;p=mirrors%2FFD230.git

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

c5ca69ec50774b9a2ffcba7f2c4e9b9940c86642
diff --cc code/sdk/application/wearable/nativeapp/nativeui/blood/src/BloodView.cpp
index 25cdaf53d,b78c05035..131540ea4
--- a/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
       */
      bool BloodView::InitView()
      {
 -        // printf("Function: %s, Line: %d\n", __PRETTY_FUNCTION__, __LINE__);
 +        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool BloodView::InitView()");
          if (!Initbackground())
          {
-             printf("Initbackground error!\n");
+             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Initbackground error!\n");
          };
          if (!InitLable())
          {
diff --cc code/sdk/application/wearable/nativeapp/nativeui/main/src/MainViewSample.cpp
index 45175b63a,c3adb8b18..891de3e92
--- a/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},
 +        {PLAYER,&MainViewSample::InitMusicPlayerPage}
-         //{APPLIST,&MainViewSample::InitApplistPage}
+         {COMPASS, &MainViewSample::InitCompassPage},
+ #if 0
+         {APPLIST,&MainViewSample::InitApplistPage}
+ #endif
      };
  
      MainViewSample::MainViewSample()