浏览代码

优化调音器音叉播放默认音频部分问题

Pq 1 年之前
父节点
当前提交
85f9f056e0

+ 2 - 2
musictuner/src/main/java/com/cooleshow/musictuner/MusicTunerActivity.java

@@ -307,10 +307,10 @@ public class MusicTunerActivity extends BaseActivity<ActivityMusicTunerLayoutBin
         if (mTuningForkDialog != null) {
             currentMusicMenu = mTuningForkDialog.getCurrentMusicMenu();
             if (currentMusicMenu == -1) {
-                currentMusicMenu = (int) VoiceDataUtils.DEFAULT_MUSIC_FORK_MUSIC;
+                currentMusicMenu = (int) VoiceDataUtils.getInstance().getDefaultPlayMusicHz();
             }
         } else {
-            currentMusicMenu = (int) VoiceDataUtils.DEFAULT_MUSIC_FORK_MUSIC;
+            currentMusicMenu = (int) VoiceDataUtils.getInstance().getDefaultPlayMusicHz();
         }
         AudioTrackManager.getInstance().play(currentMusicMenu);
         isOnPlayMusicFork = true;

+ 5 - 1
musictuner/src/main/java/com/cooleshow/musictuner/utils/VoiceDataUtils.java

@@ -28,7 +28,7 @@ public class VoiceDataUtils {
     public static final int MAX_MUSIC_HZ_STANDARD_445_HZ = 445;//最大445Hz
     public static final int MUSIC_HZ_STANDARD_440_HZ = 440;//440
     public static final int MUSIC_HZ_STANDARD_442_HZ = 442;//442
-    public static final int DEFAULT_MUSIC_HZ_STANDARD_SELECT_HZ = MUSIC_HZ_STANDARD_442_HZ;//默认440
+    public static final int DEFAULT_MUSIC_HZ_STANDARD_SELECT_HZ = MUSIC_HZ_STANDARD_440_HZ;//默认440
     public static final int MAX_MUSIC_POS = 8;//最大C8 D8这种
     public static final int MIN_MUSIC_POS = 0;//最小C0 D0这种
     public static final int DEFAULT_MUSIC_POS = 4;//默认
@@ -223,6 +223,10 @@ public class VoiceDataUtils {
         return value;
     }
 
+    public double getDefaultPlayMusicHz(){
+        return countWithMusicHzStandard(DEFAULT_MUSIC_FORK_MUSIC);
+    }
+
     /**
      * 设置移调值
      *