<修改分机灯显示异常问题，修改其他bug>

app/src/main/java/com/wdkl/callingbed2/ui/CallingBedActivity.java

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

app/src/main/java/com/wdkl/callingbed2/ui/InitActivity.java

@@ -53,6 +53,7 @@ import serialporttest.utils.SerialPortUtil;
 
 import static com.wdkl.callingbed2.util.AutoRebootUtil.ethreboot;
 import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.closeHeart;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.setCallStatus;
 import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.setNurseBrightness;
 
 /**
@@ -106,6 +107,9 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
         if (!file.exists()) {
             file.mkdir();
         }
+
+        //重置分机灯
+        setCallStatus(serialPortUtil, "0");
     }
 
     @Override

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

@@ -40,7 +40,7 @@ public class UdpSendUtil {
                 , initDataEntity.getId()
                 , initDataEntity.getDeviceSipId()
                 , initDataEntity.getDeviceRoomNum()
-                , initDataEntity.getDeviceBedNum()
+                , ""
                 , "255"
                 , Constants.WSHROOM_CALL
                 , "卫生间"