|
@@ -1685,6 +1685,21 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
flickerStatus = setWSHLightFlicker(serialPortUtil, false);
|
|
|
}
|
|
|
break;
|
|
|
+ case "call_status": //分机通话状态
|
|
|
+ if (MediaPlayerManger.getInstance().isPlay()) {
|
|
|
+ if (udpEntity.getNurseHostID().equals(initDataEntity.getDeviceHostingID())
|
|
|
+ && udpEntity.getRoomNumber().equals(initDataEntity.getDeviceRoomNum())
|
|
|
+ && !udpEntity.getBedNumber().equals(initDataEntity.getDeviceBedNum())) {
|
|
|
+ if (udpEntity.getLevel().equals("1")) {
|
|
|
+ //同房间有通话,降低广播音量
|
|
|
+ downBroadcastVolume();
|
|
|
+ } else {
|
|
|
+ //通话已经结束,恢复广播音量
|
|
|
+ resumeBroadcastVolume();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ break;
|
|
|
}
|
|
|
break;
|
|
|
case Constants.EVENT_NOTICE:
|
|
@@ -2189,6 +2204,12 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private void downBroadcastVolume() {
|
|
|
+ if (MediaPlayerManger.getInstance().isPlay()) {
|
|
|
+ MediaPlayerManger.getInstance().setVolume(0.3f);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private void resumeBroadcastVolume() {
|
|
|
if (MediaPlayerManger.getInstance().isPlay()) {
|
|
|
float voice = Float.parseFloat(SharedPreferencesUtil.getStringSp(this, "SetUpBroadcastVoice", "voice"));
|
|
@@ -2367,6 +2388,8 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
|
|
|
//通话中广播静音
|
|
|
muteBroadcastVolume();
|
|
|
+ //通知其他分机,若是同一个房间且在播放广播则降低广播音量
|
|
|
+ UdpSendUtil.sendCallStatus(initDataEntity, "1");
|
|
|
|
|
|
/*if (CALL_STATUS.equals(Constants.STANDBY)) {
|
|
|
//主机主动呼叫分机
|
|
@@ -2413,6 +2436,9 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
|
|
|
Constants.IS_CALLED = 0;
|
|
|
|
|
|
+ //通知其他分机通话已结束
|
|
|
+ UdpSendUtil.sendCallStatus(initDataEntity, "0");
|
|
|
+
|
|
|
CallingBedActivity.initPlayerVolume(1.0f);
|
|
|
CALL_STATUS = Constants.STANDBY;
|
|
|
showThisView(vMain);
|