272:屏蔽指南针

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h
index 2766c4a..ba41e66 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h
@@ -20,7 +20,7 @@ namespace OHOS
         WATCH_FACE = 0, /* 主表盘枚举值不能修改 */
         HEART_RATE,
         TRAINING,
-        COMPASS,
+        // COMPASS,
         SLEEP,
         BLOODOXGEN,
         GOAL,

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp
index d4ec6c6..4b1b281 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/compass/src/MainCompassPresenter.cpp
@@ -18,7 +18,7 @@
 
 namespace OHOS {
 
-    REGIST_MENU_PRO(VIEW_COMPASS, MainCompassView, MainCompassPresenter, PNG_APPLIST_COMPASS_IMAGE_BIG, PNG_APPLIST_COMPASS_IMAGE, PNG_APPLIST_COMPASS_IMAGE,"指南针", STR_COMPASS);
+    // REGIST_MENU_PRO(VIEW_COMPASS, MainCompassView, MainCompassPresenter, PNG_APPLIST_COMPASS_IMAGE_BIG, PNG_APPLIST_COMPASS_IMAGE, PNG_APPLIST_COMPASS_IMAGE,"指南针", STR_COMPASS);
 
 
 static MainCompassPresenter *g_pMainView = nullptr;

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp
index 800465e..d979f5c 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainModel.cpp
@@ -36,7 +36,7 @@ namespace OHOS
     const CardInfo cardInfoMap[] = {\r
         {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE},\r
         {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING},\r
-        {COMPASS, PNG_SET_CARD_COMPASS, false,STR_COMPASS},\r
+        // {COMPASS, PNG_SET_CARD_COMPASS, false,STR_COMPASS},\r
         {SLEEP, PNG_SET_CARD_SLEEP, true,STR_SLEEP},\r
         {BLOODOXGEN, PNG_SET_CARD_BLOOD, false,STR_BLOOD_OXYGEN},\r
         {GOAL, PNG_SET_CARD_ACTIVITY, false,STR_ACTIVITY},\r
@@ -51,7 +51,7 @@ namespace OHOS
     CardInfoSet cardInfoSet[] = {\r
     {HEART_RATE, true},\r
     {TRAINING, true},\r
-    {COMPASS, false},\r
+    // {COMPASS, false},\r
     {SLEEP, true},\r
     {BLOODOXGEN, false},\r
     {GOAL, false},\r
@@ -71,7 +71,7 @@ namespace OHOS
     //卡片map\r
     const CardInfo printfMap[] = {\r
         {HEART_RATE, "心率卡片"},\r
-        {COMPASS, "指南针"},\r
+        // {COMPASS, "指南针"},\r
         {MUSIC_PLAYER, "音乐"},\r
         {BLOODOXGEN, "血氧"},\r
         {WEATHER, "天气"},\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainPresenterSample.cpp
index 99ca8ec..fcb57c1 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainPresenterSample.cpp
@@ -277,9 +277,10 @@
      void MainPresenterSample::SetTaskPeroid(CardId cardId)
      {
          SetLastRun(0);
-         if (cardId == COMPASS) {
-             SetPeriod(DEFAULT_TASK_PERIOD);
-         } else if (cardId == WATCH_FACE) {
+        //  if (cardId == COMPASS) {
+        //      SetPeriod(DEFAULT_TASK_PERIOD);
+        //  } else if (cardId == WATCH_FACE) {
+        if (cardId == WATCH_FACE) {
              uint32_t time;
              DialSetting &setting = GetDialSetting();
              if (setting.dialFlag) {
@@ -392,12 +393,12 @@
  
      void MainPresenterSample::SetCompassRotate()
      {
-         bool status = CompassModel::GetInstance()->GetCalibrationStatus();
-         dynamic_cast<CompassControlView *>(view_->GetViewById(COMPASS))->SetCalibrationView(status);
-         if (!status)
-         {
-             DetermineToRotate();
-         }
+        //  bool status = CompassModel::GetInstance()->GetCalibrationStatus();
+        //  dynamic_cast<CompassControlView *>(view_->GetViewById(COMPASS))->SetCalibrationView(status);
+        //  if (!status)
+        //  {
+        //      DetermineToRotate();
+        //  }
      }
  
      // 滑动到指南针卡片开启指南针传感器
@@ -435,10 +436,10 @@
              HeartModel::GetInstance()->Heart_Control(HeartState::End,HeartCheck::CARDCHECK); //主动检测心率
          }
          // 从指南针卡片跳转到其他卡片时切换到关闭长亮屏
-         if (previousCardId == COMPASS && currentCardId != COMPASS)
-         {
-             CloseCompassSensor();
-         }
+        //  if (previousCardId == COMPASS && currentCardId != COMPASS)
+        //  {
+        //      CloseCompassSensor();
+        //  }
  
          // 从睡眠卡片跳转到其他卡片时切换到睡眠卡片主界面
          if (previousCardId == SLEEP && currentCardId != SLEEP)
@@ -467,10 +468,10 @@
              StartHeartRateDetection();
              break;
  
-         case COMPASS:
-             OpenCompassSensor();
-             SetCompassRotate();
-             break;
+        //  case COMPASS:
+        //      OpenCompassSensor();
+        //      SetCompassRotate();
+        //      break;
  
          case MUSIC_PLAYER:
              PlayersModel::GetInstance()->SetCircleProgress();

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp
index 343a1e6..668f749 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp
@@ -37,7 +37,7 @@ namespace OHOS
         {WATCH_FACE, &MainViewSample::InitWatchFacePage},
         {HEART_RATE, &MainViewSample::InitHeartRatePage},
         {TRAINING, &MainViewSample::InitTrainingPage},
-        {COMPASS, &MainViewSample::InitCompassPage},
+        // {COMPASS, &MainViewSample::InitCompassPage},
         {SLEEP, &MainViewSample::InitSleepPage},
         {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},
         {GOAL, &MainViewSample::InitGoalPage},