增加音量调节限制，禁止设置为0

主机升级版本

android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/util/VoiceManagerUtil.java

@@ -122,8 +122,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_ALARM, (int) (getAlarmMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_ALARM, (int) (getAlarmMax(context) * vPercent));
     }
 
     /**
@@ -136,8 +136,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, (int) (getMusicMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_MUSIC, (int) (getMusicMax(context) * vPercent));
     }
 
     /**
@@ -150,8 +150,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_RING, (int) (getRingMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_RING, (int) (getRingMax(context) * vPercent));
     }
 
     /**
@@ -164,8 +164,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_SYSTEM, (int) (getSystemMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_SYSTEM, (int) (getSystemMax(context) * vPercent));
     }
 
     /**
@@ -178,8 +178,21 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL, (int) (getCallMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_VOICE_CALL, (int) (getCallMax(context) * vPercent));
+    }
+
+    public static void setVolume(Context context, int type, int volume) {
+        try {
+            if (volume < 1) {
+                volume = 1;
+            }
+
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.setStreamVolume(type, volume, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public static void switchAudioMode(Context context, boolean speakerOn) {

android_host/src/main/h10_wke_1h_chile/java/com/wdkl/ncs/android/component/nursehome/util/VoiceManagerUtil.java

@@ -121,8 +121,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_ALARM, (int) (getAlarmMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_ALARM, (int) (getAlarmMax(context) * vPercent));
     }
 
     /**
@@ -135,8 +135,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, (int) (getMusicMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_MUSIC, (int) (getMusicMax(context) * vPercent));
     }
 
     /**
@@ -149,8 +149,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_RING, (int) (getRingMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_RING, (int) (getRingMax(context) * vPercent));
     }
 
     /**
@@ -163,8 +163,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_SYSTEM, (int) (getSystemMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_SYSTEM, (int) (getSystemMax(context) * vPercent));
     }
 
     /**
@@ -177,8 +177,21 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL, (int) (getCallMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_VOICE_CALL, (int) (getCallMax(context) * vPercent));
+    }
+
+    public static void setVolume(Context context, int type, int volume) {
+        try {
+            if (volume < 1) {
+                volume = 1;
+            }
+
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.setStreamVolume(type, volume, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public static void switchAudioMode(Context context, boolean speakerOn) {

android_host/src/main/h10_z3128_1h/java/com/wdkl/ncs/android/component/nursehome/util/VoiceManagerUtil.java

@@ -121,8 +121,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_ALARM, (int) (getAlarmMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_ALARM, (int) (getAlarmMax(context) * vPercent));
     }
 
     /**
@@ -135,8 +135,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, (int) (getMusicMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_MUSIC, (int) (getMusicMax(context) * vPercent));
     }
 
     /**
@@ -149,8 +149,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_RING, (int) (getRingMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_RING, (int) (getRingMax(context) * vPercent));
     }
 
     /**
@@ -163,8 +163,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_SYSTEM, (int) (getSystemMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_SYSTEM, (int) (getSystemMax(context) * vPercent));
     }
 
     /**
@@ -177,8 +177,21 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL, (int) (getCallMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_VOICE_CALL, (int) (getCallMax(context) * vPercent));
+    }
+
+    public static void setVolume(Context context, int type, int volume) {
+        try {
+            if (volume < 1) {
+                volume = 1;
+            }
+
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.setStreamVolume(type, volume, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public static void switchAudioMode(Context context, boolean speakerOn) {

android_host/src/main/h10_z3128_1h_chile/java/com/wdkl/ncs/android/component/nursehome/util/VoiceManagerUtil.java

@@ -121,8 +121,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_ALARM, (int) (getAlarmMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_ALARM, (int) (getAlarmMax(context) * vPercent));
     }
 
     /**
@@ -135,8 +135,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, (int) (getMusicMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_MUSIC, (int) (getMusicMax(context) * vPercent));
     }
 
     /**
@@ -149,8 +149,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_RING, (int) (getRingMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_RING, (int) (getRingMax(context) * vPercent));
     }
 
     /**
@@ -163,8 +163,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_SYSTEM, (int) (getSystemMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_SYSTEM, (int) (getSystemMax(context) * vPercent));
     }
 
     /**
@@ -177,8 +177,21 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL, (int) (getCallMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_VOICE_CALL, (int) (getCallMax(context) * vPercent));
+    }
+
+    public static void setVolume(Context context, int type, int volume) {
+        try {
+            if (volume < 1) {
+                volume = 1;
+            }
+
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.setStreamVolume(type, volume, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public static void switchAudioMode(Context context, boolean speakerOn) {

android_host/src/main/h10_z3128_ke_2h/java/com/wdkl/ncs/android/component/nursehome/util/VoiceManagerUtil.java

@@ -121,8 +121,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_ALARM, (int) (getAlarmMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_ALARM, (int) (getAlarmMax(context) * vPercent));
     }
 
     /**
@@ -135,8 +135,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, (int) (getMusicMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_MUSIC, (int) (getMusicMax(context) * vPercent));
     }
 
     /**
@@ -149,8 +149,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_RING, (int) (getRingMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_RING, (int) (getRingMax(context) * vPercent));
     }
 
     /**
@@ -163,8 +163,8 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_SYSTEM, (int) (getSystemMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_SYSTEM, (int) (getSystemMax(context) * vPercent));
     }
 
     /**
@@ -177,8 +177,21 @@ public class VoiceManagerUtil {
         float vPercent=((float)percent)/100f;
         vPercent = vPercent < 0 ? 0 : vPercent;
         vPercent = vPercent > 1 ? 1 : vPercent;
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL, (int) (getCallMax(context) * vPercent), 0);
+
+        setVolume(context, AudioManager.STREAM_VOICE_CALL, (int) (getCallMax(context) * vPercent));
+    }
+
+    public static void setVolume(Context context, int type, int volume) {
+        try {
+            if (volume < 1) {
+                volume = 1;
+            }
+
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.setStreamVolume(type, volume, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public static void switchAudioMode(Context context, boolean speakerOn) {

build.gradle

@@ -58,12 +58,12 @@ buildscript {
 
     if (app_device_type == "zj_h10_z_3128_1") {
         //rk3128 10寸护士主机
-        ext.app_version_code = 95
-        ext.app_version = "1.2.37"
+        ext.app_version_code = 96
+        ext.app_version = "1.2.38"
     } else if (app_device_type == "zj_h10_w_ke_1") {
         //卡尔10寸护士主机
-        ext.app_version_code = 90
-        ext.app_version = "1.2.32"
+        ext.app_version_code = 91
+        ext.app_version = "1.2.33"
     } else if (app_device_type == "zj_s8_w_ke_1") {
         //卡尔8寸竖屏主机
         ext.app_version_code = 63

common/src/main/code/com/wdkl/ncs/android/lib/utils/AppTool.kt

@@ -457,8 +457,8 @@ object AppTool {
         fun hideKeyBoard(context: Activity) {
             val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
             if (imm.isActive && context.currentFocus != null) {
-                if (context.currentFocus.windowToken != null) {
-                    imm.hideSoftInputFromWindow(context.currentFocus.windowToken, InputMethodManager.HIDE_NOT_ALWAYS)
+                if (context.currentFocus?.windowToken != null) {
+                    imm.hideSoftInputFromWindow(context.currentFocus?.windowToken, InputMethodManager.HIDE_NOT_ALWAYS)
                 }
             }
         }