fd272：屏蔽掉音乐功能

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 ba41e66..95640a2 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativelauncher/include/UiConfig.h
@@ -25,7 +25,7 @@ namespace OHOS
         BLOODOXGEN,
         GOAL,
         WEATHER,
-        MUSIC_PLAYER,
+        // MUSIC_PLAYER,
         SETCARD,
         MAX_CARD,
     } CardId;

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 d979f5c..10cfe58 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
@@ -41,7 +41,7 @@ namespace OHOS
         {BLOODOXGEN, PNG_SET_CARD_BLOOD, false,STR_BLOOD_OXYGEN},\r
         {GOAL, PNG_SET_CARD_ACTIVITY, false,STR_ACTIVITY},\r
         {WEATHER, PNG_SET_CARD_WEATHER, false,STR_WEATHER},\r
-        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false,STR_MUSIC},\r
+        // {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false,STR_MUSIC},\r
     };\r
     /*维护卡片*/\r
     /*\r
@@ -56,7 +56,7 @@ namespace OHOS
     {BLOODOXGEN, false},\r
     {GOAL, false},\r
     {WEATHER, false},\r
-    {MUSIC_PLAYER, false},\r
+    // {MUSIC_PLAYER, false},\r
     };\r
 \r
     /*自定义map配置*/\r
@@ -72,7 +72,7 @@ namespace OHOS
     const CardInfo printfMap[] = {\r
         {HEART_RATE, "心率卡片"},\r
         // {COMPASS, "指南针"},\r
-        {MUSIC_PLAYER, "音乐"},\r
+        // {MUSIC_PLAYER, "音乐"},\r
         {BLOODOXGEN, "血氧"},\r
         {WEATHER, "天气"},\r
         {TRAINING, "训练"},\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 fcb57c1..714dace 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
@@ -289,9 +289,11 @@
                  time = DEFAULT_TASK_PERIOD;
              }
              SetPeriod(time);
-         } else if (cardId == MUSIC_PLAYER) {
-             SetPeriod(PLAYER_PERIOD);
-         } else {
+         } 
+        //  else if (cardId == MUSIC_PLAYER) {
+        //      SetPeriod(PLAYER_PERIOD);
+        //  } 
+         else {
              SetPeriod(MAX_PERIOD);
          }
      }
@@ -348,7 +350,7 @@
  
      void MainPresenterSample::SetCircleProgress()
      {
-         #if 1
+         #if 0
          PlayersView *playersView = dynamic_cast<PlayersView *>(view_->GetViewById(MUSIC_PLAYER));
          if (playersView == nullptr)
          {
@@ -473,9 +475,9 @@
         //      SetCompassRotate();
         //      break;
  
-         case MUSIC_PLAYER:
-             PlayersModel::GetInstance()->SetCircleProgress();
-             break;
+        //  case MUSIC_PLAYER:
+        //      PlayersModel::GetInstance()->SetCircleProgress();
+        //      break;
  
          case WATCH_FACE:
              UpdateWatchFace();

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 668f749..266042f 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
@@ -42,7 +42,7 @@ namespace OHOS
         {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},
         {GOAL, &MainViewSample::InitGoalPage},
         {WEATHER, &MainViewSample::InitWeatherPage},
-        {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
+        // {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
         {SETCARD, &MainViewSample::InitSetMainPage},
     };
     MainViewSample::MainViewSample()

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp
index fb7eabc..caed17c 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/musicplayer/src/MusicPlayerPresenter.cpp
@@ -20,8 +20,8 @@
 namespace OHOS
 {
 
-    REGIST_MENU_PRO(VIEW_MUSIC_PLAYER, MusicPlayerView, MusicPlayerPresenter,
-        PNG_APPLIST_MUSIC_IMAGE_BIG, PNG_APPLIST_MUSIC_IMAGE,PNG_APPLIST_MUSIC_IMAGE, "音乐", STR_MUSIC);
+    // REGIST_MENU_PRO(VIEW_MUSIC_PLAYER, MusicPlayerView, MusicPlayerPresenter,
+    //     PNG_APPLIST_MUSIC_IMAGE_BIG, PNG_APPLIST_MUSIC_IMAGE,PNG_APPLIST_MUSIC_IMAGE, "音乐", STR_MUSIC);
 
     static MusicPlayerPresenter *g_pMusicPlayerPresenter = nullptr;
 

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/player/src/MusicPlayerSourceView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/player/src/MusicPlayerSourceView.cpp
index 65f47c1..e4d902a 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/player/src/MusicPlayerSourceView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/player/src/MusicPlayerSourceView.cpp
@@ -120,8 +120,8 @@ namespace OHOS
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnClick bluetoothHeadsetLableButton");\r
             NativeAbility::GetInstance().EnterSlice(VIEW_BLUETOOTH_EARPHONE);\r
             // 配置主界面回退界面\r
-            MainModel::GetInstance().SetFromSetCardView(true);\r
-            MainModel::GetInstance().SetFromCardId(MUSIC_PLAYER);\r
+            // MainModel::GetInstance().SetFromSetCardView(true);\r
+            // MainModel::GetInstance().SetFromCardId(MUSIC_PLAYER);\r
         }\r
 \r
         return true;\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
index 30a9397..109edee 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardView.cpp
@@ -598,12 +598,12 @@ void TraingCardView ::InitView() {
 \r
   InitControlPage();\r
   InitDataPage();\r
-  InitMusicPage();\r
+  // InitMusicPage();\r
   // InitDetailPage();\r
 \r
   swipe_->HorAdd(controlview_);\r
   swipe_->HorAdd(dataallview_);\r
-  swipe_->HorAdd(musicview_);\r
+  // swipe_->HorAdd(musicview_);\r
 \r
   ShowEndView();\r
   ShowGetTagView();\r