|
@@ -1997,6 +1997,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case EVENT_MGR_RESET:
|
|
case EVENT_MGR_RESET:
|
|
|
|
+ UdpSendUtil.sendHangUp(initDataEntity, mainDataEntity); //出院入院换床等操作
|
|
resetAPP();
|
|
resetAPP();
|
|
break;
|
|
break;
|
|
// case EVENT_INTERNET_STATUS://刷新网络状态==================================暂时注掉(排除以太网开关硬件问题)===============================
|
|
// case EVENT_INTERNET_STATUS://刷新网络状态==================================暂时注掉(排除以太网开关硬件问题)===============================
|
|
@@ -2111,6 +2112,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
if (isVisible(blackView)) {
|
|
if (isVisible(blackView)) {
|
|
blackView.setVisibility(View.GONE);
|
|
blackView.setVisibility(View.GONE);
|
|
showThisView(vMain);
|
|
showThisView(vMain);
|
|
|
|
+ setCallStatus(serialPortUtil, "0");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
@@ -2119,6 +2121,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
if (isVisible(blackView)) {
|
|
if (isVisible(blackView)) {
|
|
blackView.setVisibility(View.GONE);
|
|
blackView.setVisibility(View.GONE);
|
|
showThisView(vMain);
|
|
showThisView(vMain);
|
|
|
|
+ setCallStatus(serialPortUtil, "0");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (StringUtils.isInt(Constants.SCREENLIGHT)) {
|
|
if (StringUtils.isInt(Constants.SCREENLIGHT)) {
|
|
@@ -2189,6 +2192,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
goneLlRightView(true);
|
|
goneLlRightView(true);
|
|
} else {
|
|
} else {
|
|
showThisView(vMain);
|
|
showThisView(vMain);
|
|
|
|
+ setCallStatus(serialPortUtil, "0");
|
|
//changeTextColor(tvMain);
|
|
//changeTextColor(tvMain);
|
|
goneLlRightView(true);
|
|
goneLlRightView(true);
|
|
if (null != initDataEntity) {
|
|
if (null != initDataEntity) {
|
|
@@ -2611,6 +2615,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
case R.id.view_support_layout_tv_call_end:
|
|
case R.id.view_support_layout_tv_call_end:
|
|
case R.id.view_call_care_layout_tv_call_end:
|
|
case R.id.view_call_care_layout_tv_call_end:
|
|
showThisView(vMain);
|
|
showThisView(vMain);
|
|
|
|
+ setCallStatus(serialPortUtil, "0");
|
|
break;
|
|
break;
|
|
case R.id.view_call_nurse_layout_tv_call_end:
|
|
case R.id.view_call_nurse_layout_tv_call_end:
|
|
endCallNurse();
|
|
endCallNurse();
|
|
@@ -2856,6 +2861,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
|
|
|
CALL_STATUS = Constants.NURSE_CALL_TIMEOUT;
|
|
CALL_STATUS = Constants.NURSE_CALL_TIMEOUT;
|
|
showThisView(vMain);
|
|
showThisView(vMain);
|
|
|
|
+ setCallStatus(serialPortUtil, "0");
|
|
goneLlRightView(false);
|
|
goneLlRightView(false);
|
|
tvSupportTimeOut.setText("");
|
|
tvSupportTimeOut.setText("");
|
|
tvCallTextTimeOut.setText("");
|
|
tvCallTextTimeOut.setText("");
|