护理门灯颜色支持服务端定义

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -237,7 +237,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             } else {
                 Constant.inNursing = true
                 if ("rk3128".equals(Build.MODEL)) {
-                    SerialPortHelper.setDoorLight(1, "010") //绿色
+                    SerialPortHelper.setDoorLight(1, Constant.nursingColor) //绿色
                 }
                 //room_action_nurse.text = "退出护理"
                 room_action_nurse.setBackgroundResource(R.mipmap.ic_bottom_btn_bg)
@@ -589,6 +589,11 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
             if (partSetting.doorNursingValid != null && partSetting.doorNursingValid == 0) {
                 room_action_nurse.visibility = View.GONE
             }
+
+            //护理门灯颜色
+            if (partSetting.nursingColorRgb != null && partSetting.nursingColorRgb.length == 3 && TextUtils.isDigitsOnly(partSetting.nursingColorRgb)) {
+                Constant.nursingColor = partSetting.nursingColorRgb
+            }
         } catch (ex: Exception) {
             showMessage("获取设置参数信息异常" + ex.message)
             ex.printStackTrace()

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/DoorLightHelper.java

@@ -15,7 +15,9 @@ public class DoorLightHelper {
             || TcpAction.SideAction.CANCEL == tcpModel.getAction()
             || TcpAction.SideAction.SOS_CANCEL == tcpModel.getAction()) {
             //如果当前在护理中则不操作门灯，如果不在护理中则重置门灯
-            if (!Constant.inNursing) {
+            if (Constant.inNursing) {
+                SerialPortHelper.setDoorLight(1, Constant.nursingColor); //绿色
+            } else {
                 SerialPortHelper.setDoorLight(1, "111"); //白色
             }
         }

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constant.java

@@ -119,6 +119,8 @@ public class Constant {
 
     //是否护理状态
     public static boolean inNursing = false;
+    //护理门灯颜色
+    public static String nursingColor = "010";
 
     //来电设备id
     public static Integer fromId = -1;

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/dos/PartSettingDO.java

@@ -7,11 +7,11 @@ import com.wdkl.ncs.android.middleware.model.annotation.Id;
 import com.wdkl.ncs.android.middleware.model.annotation.PrimaryKeyField;
 import com.wdkl.ncs.android.middleware.model.annotation.Table;
 
+import java.io.Serializable;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.io.Serializable;
-
 @Table(name = "ncs_part_setting")
 @ApiModel
 @JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class)
@@ -263,22 +263,26 @@ public class PartSettingDO implements Serializable {
     private Integer nurseValid;
     /**
      *	门口机呼叫护士的标题
-     */	@Column(name = "door_nurse_title" )
+     */
+    @Column(name = "door_nurse_title" )
     @ApiModelProperty(value="门口机呼叫护士的标题",required=false)
     private String doorNurseTitle;
     /**
      *	是否显示门口机呼叫护士的标题
-     */	@Column(name = "door_nurse_valid" )
+     */
+    @Column(name = "door_nurse_valid" )
     @ApiModelProperty(value="是否显示门口机呼叫护士的标题",required=false)
     private Integer doorNurseValid;
     /**
      *	门口机进入护理的标题
-     */	@Column(name = "door_nursing_title" )
+     */
+    @Column(name = "door_nursing_title" )
     @ApiModelProperty(value="门口机进入护理的标题",required=false)
     private String doorNursingTitle;
     /**
      *	是否显示进入护理的标题
-     */	@Column(name = "door_nursing_valid" )
+     */
+    @Column(name = "door_nursing_valid" )
     @ApiModelProperty(value="是否显示进入护理的标题",required=false)
     private Integer doorNursingValid;
 
@@ -294,6 +298,17 @@ public class PartSettingDO implements Serializable {
     @ApiModelProperty(value = "信息看板显示空床位", required = true)
     private Boolean boardShowEmptyBed;
 
+    /**
+     *	事件是否开启转发
+     */	@Column(name = "event_forward" )
+    @ApiModelProperty(value="事件是否开启转发",required=false)
+    private Integer eventForward;
+    /**
+     *	护理灯颜色
+     */	@Column(name = "nursing_color_rgb" )
+    @ApiModelProperty(value="护理灯颜色",required=false)
+    private String nursingColorRgb;
+
 
     @PrimaryKeyField
     public Integer getId() {
@@ -677,4 +692,20 @@ public class PartSettingDO implements Serializable {
     public void setBoardShowEmptyBed(Boolean boardShowEmptyBed) {
         this.boardShowEmptyBed = boardShowEmptyBed;
     }
+
+    public Integer getEventForward() {
+        return eventForward;
+    }
+
+    public void setEventForward(Integer eventForward) {
+        this.eventForward = eventForward;
+    }
+
+    public String getNursingColorRgb() {
+        return nursingColorRgb;
+    }
+
+    public void setNursingColorRgb(String nursingColorRgb) {
+        this.nursingColorRgb = nursingColorRgb;
+    }
 }