|
@@ -803,10 +803,9 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
|
|
|
Constants.SCREENEXTINGUISHTIME = object.getString("screenExtinguishTime");
|
|
|
Constants.DOORCALLVOICE = object.getString("DoorSipVol");
|
|
|
|
|
|
- Constants.DAY_RING_TIMES = object.getString("dayRingTimes");//白天播报次数
|
|
|
- Constants.NIGHT_RING_TIMES = object.getString("nightRingTimes");//晚上播报次数
|
|
|
- Constants.VOICE_BROADCAST_TYPE = object.getString("voiceBroadcastType");//是否要报号,是否要播报“房” 0不要 1要 2为关闭语音
|
|
|
-
|
|
|
+ //Constants.DAY_RING_TIMES = object.getString("dayRingTimes");//白天播报次数
|
|
|
+ //Constants.NIGHT_RING_TIMES = object.getString("nightRingTimes");//晚上播报次数
|
|
|
+ //Constants.VOICE_BROADCAST_TYPE = object.getString("voiceBroadcastType");//是否要报号,是否要播报“房” 0不要 1要 2为关闭语音
|
|
|
setSYSParameter(false);
|
|
|
|
|
|
}
|
|
@@ -980,9 +979,10 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
|
|
|
case "call_4"://增援呼叫护士主机
|
|
|
case "call_6": //门口机呼叫护士主机
|
|
|
|
|
|
- if (!PalyPhonetics.speakEntityList.contains(udpEntity)) {
|
|
|
+ /*if (!PalyPhonetics.speakEntityList.contains(udpEntity)) {
|
|
|
+ voiceBroadcastType = SharedPreferencesUtil.getStringSp(CallingDoorActivity.this, Constants.MSG_SP, Constants.VOICE_BROADCAST_TAG);
|
|
|
addPhonetics(udpEntity); //在此加入列表队列 Waderson 20171101
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
if (udpEntity.getIndexes().equals("call_1")) {
|
|
|
//============接收全部床头机呼叫udp============
|
|
@@ -2017,7 +2017,7 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
|
|
|
/**
|
|
|
* 后台控制关闭语音播报 是否要播报“房” 0不要 1要 2为关闭语音
|
|
|
*/
|
|
|
- String voiceBroadcastType ="0";
|
|
|
+ String voiceBroadcastType ="2";
|
|
|
|
|
|
/**
|
|
|
* 播放语音(waderson 20171031)
|
|
@@ -2025,7 +2025,7 @@ public class CallingDoorActivity extends BaseActivity implements SerialPortUtil.
|
|
|
private void palyPhonetics() {
|
|
|
if (null != PalyPhonetics.speakEntityList && PalyPhonetics.speakEntityList.size() > 0) {
|
|
|
|
|
|
- voiceBroadcastType = SharedPreferencesUtil.getStringSp(CallingDoorActivity.this, Constants.MSG_SP, Constants.VOICE_BROADCAST_TAG);
|
|
|
+ //voiceBroadcastType = SharedPreferencesUtil.getStringSp(CallingDoorActivity.this, Constants.MSG_SP, Constants.VOICE_BROADCAST_TAG);
|
|
|
if ("2".equals(voiceBroadcastType)) return;
|
|
|
|
|
|
if (null == loopVoice) {
|