|
@@ -10,6 +10,7 @@ import android.support.v7.widget.GridLayoutManager;
|
|
|
import android.support.v7.widget.LinearLayoutManager;
|
|
|
import android.support.v7.widget.RecyclerView;
|
|
|
import android.support.v7.widget.helper.ItemTouchHelper;
|
|
|
+import android.text.TextUtils;
|
|
|
import android.util.Log;
|
|
|
import android.view.LayoutInflater;
|
|
|
import android.view.MotionEvent;
|
|
@@ -582,9 +583,8 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
} else {
|
|
|
deleteCallingItem(upScrllUdpEntity, 0);
|
|
|
}
|
|
|
-
|
|
|
//发送医生主机挂断电话udp add wang
|
|
|
- UdpSendUtil.sendDoctorHangUpPhone(callingEntity);
|
|
|
+ UdpSendUtil.sendDoctorHangUpPhone(upScrllUdpEntity);
|
|
|
Constants.NurseHostCallStatus = Constants.STANDBY;
|
|
|
|
|
|
}
|
|
@@ -1443,7 +1443,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
Constants.NurseHostCallStatus = Constants.IN_CALL;
|
|
|
}
|
|
|
break;
|
|
|
- case "call_13_hang_up": //医生主机取消呼叫 add by waderson 20191108
|
|
|
+ case "call_13_hang_up": //护士主机取消呼叫 add by waderson 20191108
|
|
|
Log.e(TAG,"call_13_hang_up.....");
|
|
|
|
|
|
deleteManagerCallingItem(udpEntity);
|
|
@@ -1454,7 +1454,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
Constants.NurseHostCallStatus = Constants.STANDBY;
|
|
|
Constants.CALL_STATE = Constants.STANDBY;
|
|
|
break;
|
|
|
- case "call_15": //护士主机转接医生主机
|
|
|
+ case "call_15": //护士主机转接分机的呼叫给医生主机
|
|
|
if (isBelongSupervisor(nurseHostID)) {
|
|
|
Log.e("call_15","call_15 nurseHostID "+nurseHostID);
|
|
|
if (!PalyPhonetics.speakEntityList.contains(udpEntity)) {
|
|
@@ -1936,6 +1936,12 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
resIdlist.clear();
|
|
|
String type = loopingUdpentity.getType();
|
|
|
|
|
|
+ //护士主机转接过来的
|
|
|
+ if(!TextUtils.isEmpty(loopingUdpentity.getDeviceMAC())&&loopingUdpentity.getDeviceMAC().length()<3
|
|
|
+ &&!loopingUdpentity.getDeviceMAC().equals("0")){
|
|
|
+ type = loopingUdpentity.getDeviceMAC();
|
|
|
+ }
|
|
|
+
|
|
|
String rnb = loopingUdpentity.getRoomNumber();
|
|
|
String bnb = loopingUdpentity.getBedNumber();
|
|
|
boolean haveVip = false;
|
|
@@ -2063,28 +2069,28 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
resIdlist.add(R.raw.nurse_host);
|
|
|
resIdlist.add(R.raw.hujiao);
|
|
|
break;
|
|
|
- case Constants.MUlTITAP_CALL://护士主机转接给医生机
|
|
|
- ArrayList<String> list_str8 = StringUtils.substringBySing(roomnumber);
|
|
|
- ArrayList<String> list_str88 = StringUtils.substringBySing(bednumber);
|
|
|
- if (null != list_str8 && "1".equals(voiceBroadcastType)) {//是否要播报“房” 0不要 1要
|
|
|
- for (String s : list_str8) {
|
|
|
- resIdlist.add(PalyPhonetics.getResIdInt(s));
|
|
|
- }
|
|
|
- resIdlist.add(R.raw.fang);
|
|
|
- }
|
|
|
-
|
|
|
- if (null != list_str88) {
|
|
|
- if (haveVip) {// add by waderson 20191212
|
|
|
- resIdlist.add(R.raw.vip);
|
|
|
- }
|
|
|
-
|
|
|
- for (String s : list_str88) {
|
|
|
- resIdlist.add(PalyPhonetics.getResIdInt(s));
|
|
|
- }
|
|
|
- resIdlist.add(R.raw.chuang);
|
|
|
- resIdlist.add(R.raw.hujiao);
|
|
|
- }
|
|
|
- break;
|
|
|
+// case Constants.MUlTITAP_CALL://护士主机转接给医生机
|
|
|
+// ArrayList<String> list_str8 = StringUtils.substringBySing(roomnumber);
|
|
|
+// ArrayList<String> list_str88 = StringUtils.substringBySing(bednumber);
|
|
|
+// if (null != list_str8 && "1".equals(voiceBroadcastType)) {//是否要播报“房” 0不要 1要
|
|
|
+// for (String s : list_str8) {
|
|
|
+// resIdlist.add(PalyPhonetics.getResIdInt(s));
|
|
|
+// }
|
|
|
+// resIdlist.add(R.raw.fang);
|
|
|
+// }
|
|
|
+//
|
|
|
+// if (null != list_str88) {
|
|
|
+// if (haveVip) {// add by waderson 20191212
|
|
|
+// resIdlist.add(R.raw.vip);
|
|
|
+// }
|
|
|
+//
|
|
|
+// for (String s : list_str88) {
|
|
|
+// resIdlist.add(PalyPhonetics.getResIdInt(s));
|
|
|
+// }
|
|
|
+// resIdlist.add(R.raw.chuang);
|
|
|
+// resIdlist.add(R.raw.hujiao);
|
|
|
+// }
|
|
|
+// break;
|
|
|
|
|
|
}
|
|
|
if (null != loopVoice) {
|
|
@@ -2212,8 +2218,17 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
|
|
|
endCall(); //挂断电话!
|
|
|
}
|
|
|
// ivCallPic.setImageResource(R.mipmap.ic_calling_sickbed_right_calling);
|
|
|
+
|
|
|
+ if (handTelephone) {
|
|
|
+ if (Constants.CallType.equals(Constants.DOCTOR_CALL)) {
|
|
|
+ UdpSendUtil.sendNurseHostHangUp(Constants.CALLING_NURSE_HOST_ID);//通知护士主机改变状态
|
|
|
+ Constants.NurseHostCallStatus = Constants.STANDBY;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
handTelephone = false;
|
|
|
MainFragmentActivity.initCallVoiceShowProgress();//20190801 waderson
|
|
|
+
|
|
|
}
|
|
|
if (0 == data) {//拿起状态
|
|
|
Constants.HANDS_FREE = false;
|