|
@@ -422,6 +422,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
private final int MAIN_DATA_ERROR = 2004;
|
|
private final int MAIN_DATA_ERROR = 2004;
|
|
private final int UPDATE_BROADCAST = 2005;
|
|
private final int UPDATE_BROADCAST = 2005;
|
|
private final int NEW_INCOMING_CALL = 2006;
|
|
private final int NEW_INCOMING_CALL = 2006;
|
|
|
|
+ private final int RESET_BROADCAST_VIEW = 2007;
|
|
private MyHandler handler = new MyHandler(this);
|
|
private MyHandler handler = new MyHandler(this);
|
|
|
|
|
|
class MyHandler extends Handler {
|
|
class MyHandler extends Handler {
|
|
@@ -485,6 +486,10 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
case NEW_INCOMING_CALL:
|
|
case NEW_INCOMING_CALL:
|
|
//newCalling();
|
|
//newCalling();
|
|
break;
|
|
break;
|
|
|
|
+ case RESET_BROADCAST_VIEW:
|
|
|
|
+ tvBroadcasting.setText("");
|
|
|
|
+ tvBroadcasting.setVisibility(View.INVISIBLE);
|
|
|
|
+ break;
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
// 没有实例不进行操作
|
|
// 没有实例不进行操作
|
|
@@ -1596,6 +1601,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
UdpEntity callNoticeEntity;
|
|
UdpEntity callNoticeEntity;
|
|
|
|
|
|
private long updateAudioTime = 0;
|
|
private long updateAudioTime = 0;
|
|
|
|
+ private String bcStr = "";
|
|
|
|
|
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
|
public void onMoonEvent(MessageEvent messageEvent) {
|
|
public void onMoonEvent(MessageEvent messageEvent) {
|
|
@@ -1735,6 +1741,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
break;
|
|
break;
|
|
case "broadcast_1":
|
|
case "broadcast_1":
|
|
boolean isPlay = false;
|
|
boolean isPlay = false;
|
|
|
|
+ handler.removeMessages(RESET_BROADCAST_VIEW);
|
|
switch (Integer.parseInt(broadCastEntity.getZoneId())) {
|
|
switch (Integer.parseInt(broadCastEntity.getZoneId())) {
|
|
case 0:
|
|
case 0:
|
|
if (initDataEntity.getDeviceZone0().equals("1")) {
|
|
if (initDataEntity.getDeviceZone0().equals("1")) {
|
|
@@ -1775,23 +1782,25 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
String localAudioFile = isLocalAudioExist(broadCastEntity.getPath());
|
|
String localAudioFile = isLocalAudioExist(broadCastEntity.getPath());
|
|
if (localAudioFile != null) {
|
|
if (localAudioFile != null) {
|
|
LogUtil.d("broadcast", "play local media, url: " + localAudioFile);
|
|
LogUtil.d("broadcast", "play local media, url: " + localAudioFile);
|
|
|
|
+ bcStr = "本地";
|
|
MediaPlayerManger.getInstance()
|
|
MediaPlayerManger.getInstance()
|
|
.playMusic(localAudioFile, this, MediaPlayerManger.PLAY);
|
|
.playMusic(localAudioFile, this, MediaPlayerManger.PLAY);
|
|
} else {
|
|
} else {
|
|
|
|
+ bcStr = "远端";
|
|
LogUtil.d("broadcast", "play stream media, url: " + Constants.URL + Constants.URL_END + "/" + broadCastEntity.getPath());
|
|
LogUtil.d("broadcast", "play stream media, url: " + Constants.URL + Constants.URL_END + "/" + broadCastEntity.getPath());
|
|
MediaPlayerManger.getInstance()
|
|
MediaPlayerManger.getInstance()
|
|
.playMusic(Constants.URL + Constants.URL_END + "/"
|
|
.playMusic(Constants.URL + Constants.URL_END + "/"
|
|
+ broadCastEntity.getPath(), this, MediaPlayerManger.PLAY);
|
|
+ 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"));
|
|
float voice = Float.parseFloat(SharedPreferencesUtil.getStringSp(this, "SetUpBroadcastVoice", "voice"));
|
|
if (mVolume == 1.0f) {
|
|
if (mVolume == 1.0f) {
|
|
MediaPlayerManger.getInstance().setVolume(voice);
|
|
MediaPlayerManger.getInstance().setVolume(voice);
|
|
} else {
|
|
} else {
|
|
MediaPlayerManger.getInstance().setVolume(0);
|
|
MediaPlayerManger.getInstance().setVolume(0);
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
if (!broadCastEntity.getVoiceInt().equals("0")) {
|
|
if (!broadCastEntity.getVoiceInt().equals("0")) {
|
|
float voice = Float.parseFloat(broadCastEntity.getVoiceInt()) / 100;
|
|
float voice = Float.parseFloat(broadCastEntity.getVoiceInt()) / 100;
|
|
if (mVolume == 1.0f) {
|
|
if (mVolume == 1.0f) {
|
|
@@ -2509,8 +2518,17 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
tvBroadcasting.setVisibility(View.INVISIBLE);
|
|
tvBroadcasting.setVisibility(View.INVISIBLE);
|
|
//播放广播恢复默认状态
|
|
//播放广播恢复默认状态
|
|
Constants.INTIME_BROADCAST = "";
|
|
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;
|
|
private float mVolume = 1.0f;
|