<修改音量调节值>

app/src/main/java/com/wdkl/callingbed2/ui/CallingBedActivity.java

@@ -644,8 +644,10 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
             public void onStopTrackingTouch(SeekBar seekBar) {
                 int progress = seekBar.getProgress();
                 if (progress >= 0 && progress <= 100) {
-                    Constants.SYSVOICE = Integer.toString(progress);
-                    setSYSVoice(CallingBedActivity.this, progress);
+                    //Constants.SYSVOICE = Integer.toString(progress);
+                    //setSYSVoice(CallingBedActivity.this, progress);
+                    Constants.BEDCALLVOICE = Integer.toString(progress);
+                    VoiceManagerUtil.setCallVoice(CallingBedActivity.this, progress);
                 }
             }
         });
@@ -1040,7 +1042,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                                     Constants.NURSINGLIGHT = object.getString("nursingLight");
                                     Constants.CALLINGTIMEOUT = object.getString("CallingTimeOut");
                                     Constants.SCREENEXTINGUISHTIME = object.getString("screenExtinguishTime");
-                                    Constants.DOORCALLVOICE = object.getString("DoorSipVol");
+                                    //Constants.DOORCALLVOICE = object.getString("DoorSipVol");
                                     Constants.BEDCALLVOICE = object.getString("BedSipVol");
                                     handler.sendEmptyMessage(SYSTEM_DATA_RESPONSE);
                                     setSYSParameter();
@@ -1904,9 +1906,9 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
         if (StringUtils.isInt(Constants.SCREENLIGHT)) {
             setSYSBrightness(CallingBedActivity.this, StringUtils.parseInt(Constants.SCREENLIGHT));
         }
-        if (StringUtils.isInt(Constants.SYSVOICE)) {
+        /*if (StringUtils.isInt(Constants.SYSVOICE)) {
             setSYSVoice(CallingBedActivity.this, StringUtils.parseInt(Constants.SYSVOICE));
-        }
+        }*/
         if (/*StringUtils.isInt(Constants.NURSINGLIGHT) && */null != mainDataEntity) {
             //7寸分机不带护理灯
             /*new Thread(new Runnable() {
@@ -2045,8 +2047,8 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
             if (StringUtils.isInt(Constants.SCREENLIGHT)) {
                 sbBrightness.setProgress(StringUtils.parseInt(Constants.SCREENLIGHT));
             }
-            if (StringUtils.isInt(Constants.SYSVOICE)) {
-                sbVolume.setProgress(StringUtils.parseInt(Constants.SYSVOICE));
+            if (StringUtils.isInt(Constants.BEDCALLVOICE)) {
+                sbVolume.setProgress(StringUtils.parseInt(Constants.BEDCALLVOICE));
             }
             updateVersionInfo();
         }

app/src/main/java/com/wdkl/callingbed2/util/VoiceManagerUtil.java

@@ -179,6 +179,8 @@ public class VoiceManagerUtil {
         vPercent = vPercent > 1 ? 1 : vPercent;
         AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         audioManager.setStreamVolume(AudioManager.STREAM_VOICE_CALL, (int) (getCallMax(context) * vPercent), 0);
+        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, (int) (getMusicMax(context) * vPercent), 0);
+        audioManager.setStreamVolume(AudioManager.STREAM_SYSTEM, (int) (getSystemMax(context) * vPercent), 0);
     }
 
 }