<1.更新二维码 2.解决同一房间内的床位分机直连门灯后若其他未连门灯的分机呼叫，门灯不亮的问题>

app/build.gradle

@@ -25,7 +25,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.23"
+        versionName "1.24"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         buildConfigField "String", "BUILD_TIME", getDate()

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

@@ -11,7 +11,8 @@ public class Constants {
 
     public static final String MSG_SP = "msg_sp";
 
-    public static  String TWO_DIMENSION_CODE_PATH = "http://id.wdklian.com:88/app/?id=";
+    //public static  String TWO_DIMENSION_CODE_PATH = "http://id.wdklian.com:88/app/?id=";
+    public static  String TWO_DIMENSION_CODE_PATH = "http://m.wdklian.com/care/apk/care.user?type=NCS_DEVICE&no=?";
 
     public static final String INITENTITY = "initEntity";
     /**

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

@@ -1565,10 +1565,17 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                     case "call_1": //子机呼叫护士主机
                         showSnackbarPrompt(udpEntity.getBedNumber() + "床呼叫！");
                         callNoticeEntity = udpEntity;
+                        //适配无门口机但是有门灯的情况，门灯直接接到其中一个床位分机，房间内任何一个分机呼叫都需要点亮门灯
+                        if (serialPortUtil != null && initDataEntity != null && initDataEntity.getDeviceRoomNum().equals(udpEntity.getRoomNumber())) {
+                            setDoorLight(serialPortUtil, "200");//门灯红色闪烁
+                        }
                         break;
                     case "call_2"://卫生间呼叫护士主机
                         showSnackbarPrompt(udpEntity.getRoomNumber() + "房卫生间紧急呼叫！");
                         callNoticeEntity = udpEntity;
+                        if (serialPortUtil != null && initDataEntity != null && initDataEntity.getDeviceRoomNum().equals(udpEntity.getRoomNumber())) {
+                            setDoorLight(serialPortUtil, "200");//门灯红色闪烁
+                        }
                         break;
                     case "call_4"://增援呼叫护士主机
                         showSnackbarPrompt(udpEntity.getBedNumber() + "床请求增援！");