format codes.

diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
index 6dcc9c4..36a4e4f 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -123,7 +123,7 @@ public class SilentManager extends AbstractInvokeHandlerService {
                         mHandler.postDelayed(new Runnable() {
                             @Override
                             public void run() {
-                                ICAudioManager.restoreVolumn(mContext); //2秒后恢复音量
+                                ICAudioManager.restoreVolume(mContext); //2秒后恢复音量
                                 ICAudioManager.needMute = false;
                             }
                         }, 2000);
@@ -154,7 +154,7 @@ public class SilentManager extends AbstractInvokeHandlerService {
                 {
                     if (ICAudioManager.needMute == false) {
                         if (Config.custom_name.equals("AK"))
-                            ICAudioManager.setVoiceCallMaxVolumn(mContext); //设置最大音量
+                            ICAudioManager.setVoiceCallMaxVolume(mContext); //设置最大音量
                     }
                 }
                 case PRECISE_CALL_STATE_HOLDING://接电话

diff --git a/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java b/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java
index d65d078..fd1a9c2 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ICAudioManager.java
@@ -10,65 +10,52 @@ public class ICAudioManager {
     private static int saved_volumn = 0;
     public static boolean needMute = false;
 
-    public static void setMasterVolumn(Context context,int volume) {
+    public static void setMasterVolumn(Context context, int volume) {
         AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        int maxvolume=audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL);
-        ICLogger.i("======setVolumn "+volume +" maxvolmun "+maxvolume);
-        if( volume>maxvolume) {
-            volume = maxvolume;
+        int maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL);
+        ICLogger.i("======setVolumn " + volume + " maxvolmun " + maxVolume);
+        if (volume > maxVolume) {
+            volume = maxVolume;
         }
-        if(volume<0){
-            volume=0;
+        if (volume < 0) {
+            volume = 0;
         }
-        if (audioManager != null) {
-            audioManager.setStreamVolume(AudioManager.STREAM_MUSIC,volume,AudioManager.FLAG_PLAY_SOUND);
-            audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION,volume,AudioManager.FLAG_PLAY_SOUND);
-            audioManager.setStreamVolume(AudioManager.STREAM_ALARM,volume,AudioManager.FLAG_PLAY_SOUND);
-            audioManager.setStreamVolume(AudioManager.STREAM_RING,volume,AudioManager.FLAG_PLAY_SOUND);
-        }
-//        SimSignalUtil.SetRingMode(context, AudioManager.RINGER_MODE_SILENT, false);
-//        CloseSpeaker(context);//
+        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, volume, AudioManager.FLAG_PLAY_SOUND);
+        audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION, volume, AudioManager.FLAG_PLAY_SOUND);
+        audioManager.setStreamVolume(AudioManager.STREAM_ALARM, volume, AudioManager.FLAG_PLAY_SOUND);
+        audioManager.setStreamVolume(AudioManager.STREAM_RING, volume, AudioManager.FLAG_PLAY_SOUND);
     }
 
     public static void setVolumnMute(Context context) {
         AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        ICLogger.i("======setVolumnMute");
-//        saved_volumn = audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL);
+        ICLogger.i("======setVolumeMute");
         if (audioManager != null) {
             audioManager.setMasterMute(true);
-
             audioManager.setStreamMute(AudioManager.STREAM_VOICE_CALL, true);
             audioManager.setSpeakerphoneOn(false);
         }
-//        SimSignalUtil.SetRingMode(context, AudioManager.RINGER_MODE_SILENT, false);
-//        CloseSpeaker(context);//
-
     }
 
-    public static void restoreVolumn(Context context) {
-        ICLogger.i("======restoreVolumn "+saved_volumn);
+    public static void restoreVolume(Context context) {
+        ICLogger.i("======restoreVolume " + saved_volumn);
         AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         if (audioManager != null) {
             audioManager.setMasterMute(false);
-
             audioManager.setStreamMute(AudioManager.STREAM_VOICE_CALL, false);
             audioManager.setSpeakerphoneOn(true);
         }
-//        changeToSpeaker(context);
-
-//        SimSignalUtil.SetRingMode(context, AudioManager.RINGER_MODE_NORMAL, true);
-       // OpenSpeaker(context);
     }
-    public static void setVoiceCallMaxVolumn(Context context) {
-        ICLogger.i("======setVoiceCallMaxVolumn ");
+
+    public static void setVoiceCallMaxVolume(Context context) {
+        ICLogger.i("======setVoiceCallMaxVolume ");
         AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         if (audioManager != null) {
             audioManager.setMasterMute(false);
-            int currentvolume=audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL);
-            int maxvolume=audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL);
-            audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL,maxvolume,0);
-            int currentvolume1=audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL);
-            ICLogger.i("===== current "+currentvolume+" max "+maxvolume+" to "+currentvolume1);
+            int currentVolume = audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL);
+            int maxVolume = audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL);
+            audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL, maxVolume, 0);
+            int currentVolume1 = audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL);
+            ICLogger.i("===== current " + currentVolume + " max " + maxVolume + " to " + currentVolume1);
             audioManager.setSpeakerphoneOn(true);
         }
     }
@@ -78,7 +65,7 @@ public class ICAudioManager {
      */
     public static void changeToSpeaker(Context context) {
         AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB){
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
             audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
         } else {
             audioManager.setMode(AudioManager.MODE_IN_CALL);
@@ -91,7 +78,7 @@ public class ICAudioManager {
      */
     public static void changeToHeadset(Context context) {
         AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB){
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
             audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
         } else {
             audioManager.setMode(AudioManager.MODE_IN_CALL);
@@ -106,7 +93,7 @@ public class ICAudioManager {
     public static void changeToReceiver(Context context) {
         AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         audioManager.setSpeakerphoneOn(false);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB){
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
             audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
         } else {
             audioManager.setMode(AudioManager.MODE_IN_CALL);
@@ -126,30 +113,31 @@ public class ICAudioManager {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            ICLogger.e(e.getMessage(),e);
+            ICLogger.e(e.getMessage(), e);
         }
         //Toast.makeText(context,"扬声器已经关闭",Toast.LENGTH_SHORT).show();
     }
-//打开扬声器
- public static void OpenSpeaker(Context context) {
-
- try{
- AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
- //audioManager.setMode(AudioManager.ROUTE_SPEAKER);
- audioManager.setMode(AudioManager.MODE_IN_CALL);
-     saved_volumn = audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL);
-
- if(!audioManager.isSpeakerphoneOn()) {
- audioManager.setSpeakerphoneOn(true);
-
- audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL,
-                        audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL ),
-                         AudioManager.STREAM_VOICE_CALL);
- }
- } catch (Exception e) {
- e.printStackTrace();
-     ICLogger.e(e.getMessage(),e);
- }
- }
+
+    //打开扬声器
+    public static void OpenSpeaker(Context context) {
+
+        try {
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            //audioManager.setMode(AudioManager.ROUTE_SPEAKER);
+            audioManager.setMode(AudioManager.MODE_IN_CALL);
+            saved_volumn = audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL);
+
+            if (!audioManager.isSpeakerphoneOn()) {
+                audioManager.setSpeakerphoneOn(true);
+
+                audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL,
+                        audioManager.getStreamMaxVolume(AudioManager.STREAM_VOICE_CALL),
+                        AudioManager.STREAM_VOICE_CALL);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            ICLogger.e(e.getMessage(), e);
+        }
+    }
 
 }