|
@@ -430,6 +430,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
private final int NEW_INCOMING_CALL = 2006;
|
|
|
private final int TURN_OFF_SCREEN = 2007;
|
|
|
private final int RESET_UPDATE_FLAG = 2008;
|
|
|
+ private final int RESET_BROADCAST_VIEW = 2009;
|
|
|
private MyHandler handler = new MyHandler(this);
|
|
|
|
|
|
private String SCREEN_OFF_LIGHT = "1";
|
|
@@ -502,6 +503,10 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
case RESET_UPDATE_FLAG:
|
|
|
Constants.UPDATE_PATIENTUPDATE_FLAG = false;
|
|
|
break;
|
|
|
+ case RESET_BROADCAST_VIEW:
|
|
|
+ tvBroadcasting.setText("");
|
|
|
+ tvBroadcasting.setVisibility(View.INVISIBLE);
|
|
|
+ break;
|
|
|
}
|
|
|
} else {
|
|
|
// 没有实例不进行操作
|
|
@@ -1647,6 +1652,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
UdpEntity callNoticeEntity;
|
|
|
|
|
|
private long updateAudioTime = 0;
|
|
|
+ private String bcStr = "";
|
|
|
|
|
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
|
|
public void onMoonEvent(MessageEvent messageEvent) {
|
|
@@ -1779,6 +1785,14 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
break;
|
|
|
case "broadcast_1":
|
|
|
boolean isPlay = false;
|
|
|
+ handler.removeMessages(RESET_BROADCAST_VIEW);
|
|
|
+ if (isDownloadMp3) {
|
|
|
+ tvBroadcasting.setVisibility(View.VISIBLE);
|
|
|
+ tvBroadcasting.setText("======音频文件正在下载中,请等待======");
|
|
|
+ handler.sendEmptyMessageDelayed(RESET_BROADCAST_VIEW, 30000);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
switch (Integer.parseInt(broadCastEntity.getZoneId())) {
|
|
|
case 0:
|
|
|
if (initDataEntity.getDeviceZone0().equals("1")) {
|
|
@@ -1818,24 +1832,26 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
//=====================播放廣播===================//
|
|
|
String localAudioFile = isLocalAudioExist(broadCastEntity.getPath());
|
|
|
if (localAudioFile != null) {
|
|
|
+ bcStr = "本地";
|
|
|
LogUtil.d("broadcast", "play local media, url: " + localAudioFile);
|
|
|
MediaPlayerManger.getInstance()
|
|
|
.playMusic(localAudioFile, this, MediaPlayerManger.PLAY);
|
|
|
} else {
|
|
|
+ bcStr = "远端";
|
|
|
LogUtil.d("broadcast", "play stream media, url: " + Constants.URL + Constants.URL_END + "/" + broadCastEntity.getPath());
|
|
|
MediaPlayerManger.getInstance()
|
|
|
.playMusic(Constants.URL + Constants.URL_END + "/"
|
|
|
+ broadCastEntity.getPath(), this, MediaPlayerManger.PLAY);
|
|
|
}
|
|
|
|
|
|
- if (!SharedPreferencesUtil.getStringSp(this, "SetUpBroadcastVoice", "voice").equals("")) {
|
|
|
+ /*if (!SharedPreferencesUtil.getStringSp(this, "SetUpBroadcastVoice", "voice").equals("")) {
|
|
|
float voice = Float.parseFloat(SharedPreferencesUtil.getStringSp(this, "SetUpBroadcastVoice", "voice"));
|
|
|
if (mVolume == 1.0f) {
|
|
|
MediaPlayerManger.getInstance().setVolume(voice);
|
|
|
} else {
|
|
|
MediaPlayerManger.getInstance().setVolume(0);
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
if (!broadCastEntity.getVoiceInt().equals("0")) {
|
|
|
float voice = Float.parseFloat(broadCastEntity.getVoiceInt()) / 100;
|
|
|
if (mVolume == 1.0f) {
|
|
@@ -2560,8 +2576,17 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
tvBroadcasting.setVisibility(View.INVISIBLE);
|
|
|
//播放广播恢复默认状态
|
|
|
Constants.INTIME_BROADCAST = "";
|
|
|
+ }
|
|
|
|
|
|
-
|
|
|
+ @Override
|
|
|
+ public void playMusicError() {
|
|
|
+ LogUtil.d("broadcast", "broadcast error!!!");
|
|
|
+ tvBroadcasting.setVisibility(View.VISIBLE);
|
|
|
+ tvBroadcasting.setText("==广播错误: " + bcStr + "==");
|
|
|
+ //播放广播恢复默认状态
|
|
|
+ Constants.INTIME_BROADCAST = "";
|
|
|
+ handler.removeMessages(RESET_BROADCAST_VIEW);
|
|
|
+ handler.sendEmptyMessageDelayed(RESET_BROADCAST_VIEW, 30000);
|
|
|
}
|
|
|
|
|
|
private float mVolume = 1.0f;
|
|
@@ -2654,6 +2679,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
|
|
|
//广播的实体
|
|
|
private ArrayList<AllBroadcastEntity> allBroadcastList = new ArrayList<>();
|
|
|
+ private boolean isDownloadMp3;
|
|
|
|
|
|
//下载广播音频文件
|
|
|
private void getBroadcastAudioFiles() {
|
|
@@ -2738,6 +2764,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
private void checkAndDownloadMP3(final int index) {
|
|
|
LogUtil.d("broadcast", "checkAndDownloadMP3 start..." + index);
|
|
|
if (allBroadcastList != null && allBroadcastList.size() > 0 && index < allBroadcastList.size()) {
|
|
|
+ isDownloadMp3 = true;
|
|
|
AllBroadcastEntity entity = allBroadcastList.get(index);
|
|
|
String filePath = entity.getFileName();
|
|
|
DownloadUtil2.getInstance().download(Constants.URL + Constants.URL_END + "/" + filePath,
|
|
@@ -2759,6 +2786,8 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
checkAndDownloadMP3(index+1);
|
|
|
}
|
|
|
});
|
|
|
+ } else {
|
|
|
+ isDownloadMp3 = false;
|
|
|
}
|
|
|
}
|
|
|
|