|
@@ -1613,10 +1613,10 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
LogUtil.d("WWW", "呼叫护士键==-1");
|
|
|
} else if (buffer[8] == 0) { //挂断键按住不动
|
|
|
LogUtil.d("WWW", "呼叫护士键==0");
|
|
|
- } else if (buffer[8] == 1 || buffer[8] == 2) {//挂断键短按长按松开
|
|
|
+ } else if (buffer[8] == 1) {//挂断键短按松开
|
|
|
CallingBedActivity.this.runOnUiThread(new Runnable() {
|
|
|
public void run() {
|
|
|
- LogUtil.d("WWW", "挂断键==1,2");
|
|
|
+ LogUtil.d("WWW", "挂断键==1");
|
|
|
wakeUpScreen();
|
|
|
endCallNurse();
|
|
|
tvNurseTimeOut.setText("");
|
|
@@ -1625,6 +1625,24 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
handsMICStatus = setHandsMIC(serialPortUtil, false);//点击了外部按键就将手柄MIC关掉
|
|
|
}
|
|
|
});
|
|
|
+ } else if (buffer[8] == 2) { //挂断键长按松开
|
|
|
+ CallingBedActivity.this.runOnUiThread(new Runnable() {
|
|
|
+ public void run() {
|
|
|
+ LogUtil.d("WWW", "挂断键==2");
|
|
|
+ wakeUpScreen();
|
|
|
+ if (CALL_STATUS.equals(Constants.STANDBY)) {
|
|
|
+ if (isNurseStatus) {//进入护理后;子机请求转接
|
|
|
+ UdpSendUtil.sendCall1Transfer(initDataEntity, mainDataEntity);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ endCallNurse();
|
|
|
+ tvNurseTimeOut.setText("");
|
|
|
+ //呼叫超时倒计时开启
|
|
|
+ callTypeCallNurse = "1";
|
|
|
+ handsMICStatus = setHandsMIC(serialPortUtil, false);//点击了外部按键就将手柄MIC关掉
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
if (buffer[6] == 1 || buffer[6] == 2) { //手柄短按松开,手柄长按松开 都要执行
|