From 71f4a6fca68bba5d3637975c42e4aaeafba8e4f9 Mon Sep 17 00:00:00 2001 From: lizhanwei <Dana_Lee1016@126.com> Date: 星期三, 26 八月 2020 19:57:45 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge --- lib/src/main/java/com/anyun/exam/lib/RemoteService.java | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/lib/src/main/java/com/anyun/exam/lib/RemoteService.java b/lib/src/main/java/com/anyun/exam/lib/RemoteService.java index 18150db..0fd34d3 100644 --- a/lib/src/main/java/com/anyun/exam/lib/RemoteService.java +++ b/lib/src/main/java/com/anyun/exam/lib/RemoteService.java @@ -45,7 +45,7 @@ private Speaker speaker = null; private boolean ttsInitSucc = false; private int ringIndex = -1; - private Uri ringUri; + private Uri ringUri = null; private Upgrade upgrade = null; @@ -101,12 +101,27 @@ upgrade = Upgrade.getInstance(getApplicationContext()); upgrade.CheckUpgrade(); - ringUri = GetRingIndex(this, "Mira"); - PlayRing(this, ringUri); + ringUri = GetRingIndex(this, "Antimony"); +// PlayRing(this, ringUri); + LimitMaxMinVolume(); Log.d(TAG, "鍩哄甫鐗堟湰 " + getBaseband_Ver()); String ver = getBaseband_Ver(); + } + + private void LimitMaxMinVolume() { + AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); + if (audioManager != null) { + int currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_RING); + int maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_RING); + Log.d(TAG, String.format("Ring闊抽噺 = %d Max = %d", currentVolume, maxVolume)); + + if (currentVolume < maxVolume - 1) { + Log.d(TAG, "璋冭嚦榛樿Ring闊抽噺"); + audioManager.setStreamVolume(AudioManager.STREAM_RING, maxVolume - 1, 0); + } + } } public String getBaseband_Ver(){ @@ -243,6 +258,12 @@ return null; } + public void PlayBreakRing() { + if (ringUri != null) { + PlayRing(this, ringUri); + } + } + public void TextSpeak(String text, int id) { if (speaker != null && ttsInitSucc) { speaker.speak(text, Integer.toString(id)); -- Gitblit v1.8.0