提交修改的代码

app/build.gradle

@@ -24,7 +24,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.42"
+        versionName "1.47"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

app/src/main/java/com/wdkl/callingmainnurse/common/Constants.java

@@ -227,8 +227,8 @@ public class Constants {
     public static final String TRADITION_CALL = "12";
     public static String CallType = "";
     public static String DoctorMachineCallStatus = "0";//医生主机呼叫护士主机的状态
-    //呼叫医生主机id
-    public static String CALLING_HOST_ID = "";
+    //呼叫的医生主机id
+    public static String CALLING_DOCTOR_HOST_ID = "";
 
     public static String MYSELF_ID = "";//自己的机器ID
     public static String CALLMAIN_ID = "";//所属主机机器ID

app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/CallingBedFragment.java

@@ -1019,7 +1019,9 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                     //ToastUtil.showToast(sipAddress+"===="+callingEntity.getDeviceMAC());
                     callBed = false;
                     ivCallListPic.setImageResource(R.mipmap.ic_calling_sickbed_right_hang_up);
+                    Log.e(TAG,"sipAddress "+sipAddress+" getType() "+callItemChooseEntity.getType()+" DeviceMAC "+callItemChooseEntity.getDeviceMAC());
                     mainFragmentActivity.initiateCall(sipAddress, callingEntity.getType(), callingEntity.getDeviceMAC());
+//                    mainFragmentActivity.initiateCall("4000180040", "3", "0");
                     removeCallList(callingEntity);
                 }
             } else {
@@ -1060,6 +1062,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                         callSipId = sipAddress;
                         callBed = true;
                         ivCallPic.setImageResource(R.mipmap.ic_calling_sickbed_right_hang_up);
+//                        Log.e(TAG,"sipAddress "+sipAddress+" getType() "+callItemChooseEntity.getType()+" DeviceMAC "+callItemChooseEntity.getDeviceMAC());
                         mainFragmentActivity.initiateCall(sipAddress, "", sickBedInfo.getDeviceMAC() == null ? "-1" : sickBedInfo.getDeviceMAC());
                         Constants.CallType = Constants.MAIN_CALL;//设置呼叫类型标记
                     }
@@ -1260,7 +1263,10 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                         LogUtil.d("sipAddress", "Call==sipAddress==" + sipAddress);
                         LogUtil.d("sipAddress", "Call==deviceMAC==" + callItemChooseEntity.getDeviceMAC());
                         //ToastUtil.showToast(sipAddress+"===="+callItemChooseEntity.getDeviceMAC());
+                        Log.e(TAG,"sipAddress "+sipAddress+" getType() "+callItemChooseEntity.getType()+" DeviceMAC "+callItemChooseEntity.getDeviceMAC());
                         mainFragmentActivity.initiateCall(sipAddress, callItemChooseEntity.getType(), callItemChooseEntity.getDeviceMAC());
+                        //删除医生机转接给护士机的集合
+                        removeCallList(MyApplication.callEntityList.get(position));
                     }
                 } else {
                     endCall();
@@ -1510,7 +1516,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                         Constants.DoctorMachineCallStatus = Constants.STANDBY;
                         Constants.CALL_STATE = Constants.STANDBY;
                         break;
-                    case "call_15_doctor_hang_up_phone"://医生主机挂断电话，这时可以进行下一个床头分机的呼叫转移
+                    case "call_15_doctor_hang_up_phone"://医生主机挂断电话，这时可以进行下一个床头分机的呼叫转移给医生机
                         transmitThreadBool = true;
                         break;
                     case "call_1_b1": //护士已经退出护理
@@ -2211,8 +2217,16 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                             endCall(); //挂断电话！
                         }
                         // ivCallPic.setImageResource(R.mipmap.ic_calling_sickbed_right_calling);
+                        if (handTelephone) {
+                            if (Constants.CallType.equals(Constants.NURSE_CALL)) {
+                                UdpSendUtil.sendNurseHostHangUp(Constants.CALLING_DOCTOR_HOST_ID);//通知医生主机改变状态
+                                Constants.DoctorMachineCallStatus = Constants.STANDBY;
+                            }
+                        }
+
                         handTelephone = false;
                         MainFragmentActivity.initCallVoiceShowProgress();//20190801 waderson
+
                     }
                     if (0 == data) {//拿起状态
                         Constants.HANDS_FREE = false;
@@ -2222,6 +2236,11 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                         if (!handTelephone) { //拨打电话开始！
                             autoStartCall();
                         }
+
+                        //删除医生机转接给护士机的集合
+                        if(MyApplication.callEntityList.size()>0){
+                            removeCallList(MyApplication.callEntityList.get(0));
+                        }
                         handTelephone = true;
                         MainFragmentActivity.initCallVoiceShowProgress();//20190801 waderson
                     }

app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/CallingHostFragment.java

@@ -429,7 +429,7 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
             Log.e(TAG,"callClick 正在呼叫");
             UdpSendUtil.sendNurseHostCall(hostId);
             Constants.CALL_STATE = Constants.IN_CALL;
-            Constants.CALLING_HOST_ID = hostId;
+            Constants.CALLING_DOCTOR_HOST_ID = hostId;
             Constants.CallType = Constants.NURSE_CALL;
         } else {
             //主动挂断
@@ -439,7 +439,7 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
                 nurse_CallStaus.setText("");
                 UdpSendUtil.sendNurseHostHangUp(hostId);
                 Constants.CALL_STATE = Constants.STANDBY;
-                Constants.CALLING_HOST_ID = "";
+                Constants.CALLING_DOCTOR_HOST_ID = "";
             }
         }
     }

app/src/main/java/com/wdkl/callingmainnurse/util/AnalysisUdpUtil.java

@@ -119,7 +119,7 @@ public class AnalysisUdpUtil {
                         doctor_call_14_hang_up.setShowText("总控制室主机取消呼叫");
                         EventBus.getDefault().post(new MessageEvent(doctor_call_14_hang_up, Constants.EVENT_UDP));
                         break;
-                    case "call_14_upremove": //医生主机上滑移除了呼叫列表中的一个条目
+                    case "call_14_upremove": //医生主机上滑移除了护士主机的呼叫
                         UdpEntity call_13_upremove = new UdpEntity();
                         call_13_upremove.setIndexes(data[0]);
                         call_13_upremove.setNurseHostID(data[1]);
@@ -267,7 +267,9 @@ public class AnalysisUdpUtil {
                 case "call_11":
                     //手表呼叫护士主机");
                     break;
-                case "call_15_doctor_hang_up_phone"://医生主机挂断电话
+                case "call_15_doctor_hang_up_phone"://医生主机挂断电话通知护士主机可以继续转接分机呼叫
+                    Log.e(TAG,"call_15_doctor_hang_up_phone");
+
                     UdpEntity udpEntity_15_doctor_hang_up_phone = new UdpEntity();
                     udpEntity_15_doctor_hang_up_phone.setIndexes(data[0]);
                     udpEntity_15_doctor_hang_up_phone.setNurseHostID(data[1]);

app/src/main/java/com/wdkl/callingmainnurse/util/PalyPhonetics.java

@@ -132,7 +132,7 @@ public class PalyPhonetics {
         } else if (id == R.raw.manager) {
             return 1150;
         }
-        return 700;
+        return 900;
     }
 
 

app/src/main/java/com/wdkl/callingmainnurse/util/UdpSendUtil.java

@@ -177,7 +177,7 @@ public class UdpSendUtil {
     }
 
     /**
-     * 上滑移除后发UDP通知外面
+     * 护士主机上滑移除后发UDP通知总控主机
      *
      * @param udpEntity
      * @param hostId
@@ -197,7 +197,7 @@ public class UdpSendUtil {
     }
 
     /**
-     * 医生机上滑移除后发UDP通知外面
+     * 护士主机上滑移除后发UDP通知医生主机
      *
      * @param udpEntity
      * @param hostId
@@ -285,7 +285,7 @@ public class UdpSendUtil {
     }
 
     /**
-     * 护士主机挂断通话,需要通知对方医生主机
+     * 护士主机取消呼叫,需要通知对方医生主机
      */
     public static void sendNurseHostHangUp(String hostId) {
         AnalysisUdpUtil.sendUdpData("call_13_hang_up",
@@ -395,7 +395,7 @@ public class UdpSendUtil {
     }
 
     /**
-     * 护士主机转接床头分机呼叫医生主机
+     * 护士主机转接床头分机的呼叫给医生主机
      *
      * @param callListEntity
      */
@@ -411,7 +411,7 @@ public class UdpSendUtil {
                 , callListEntity.getUdpEntity().getLevel()
                 , Constants.MUlTITAP_CALL
                 , callListEntity.getUdpEntity().getName()
-                , "0");
+                , callListEntity.getUdpEntity().getType());//传的呼叫类型
     }