Explorar o código

需求:有呼叫时即使接通了门灯也不灭,必须点击门口机上的护理按钮进入护理才切换门灯状态。该功能可由服务端配置,默认关闭

weizhengliang %!s(int64=2) %!d(string=hai) anos
pai
achega
b9d422e8e0

+ 36 - 12
callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -407,7 +407,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         }
 
         val executor = Executors.newSingleThreadScheduledExecutor()
-        executor!!.scheduleAtFixedRate(timerTask, 100, 30, TimeUnit.SECONDS)
+        executor!!.scheduleAtFixedRate(timerTask, 100, 100, TimeUnit.SECONDS)
     }
 
     private fun showMsgMain(msg: String) {
@@ -600,7 +600,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 showMessage(R.string.net_error)
             }
 
-            Constant.callNums == 0
+            Constant.callNums = 0
             DoorLightHelper.resetDoorLight()
 
             SpeechUtil.getInstance().stopSpeak()
@@ -947,6 +947,20 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 room_action_nurse.visibility = View.GONE
             }
 
+            if (partSetting.roomCallBed != null && partSetting.roomCallBed == 0) {
+                room_action_call_bed.visibility = View.GONE
+                //room_cancel_call.visibility = View.GONE
+            } else {
+                room_action_call_bed.visibility = View.VISIBLE
+                //room_cancel_call.visibility = View.VISIBLE
+            }
+
+            if (partSetting.boolDoorLightAlwaysOn != null && partSetting.boolDoorLightAlwaysOn == 1) {
+                SettingConfig.setDoorLightAlwaysOn(activity, 1)
+            } else {
+                SettingConfig.setDoorLightAlwaysOn(activity, 0)
+            }
+
             //护理门灯颜色
             if (partSetting.nursingColorRgb != null && partSetting.nursingColorRgb.length == 3 && TextUtils.isDigitsOnly(partSetting.nursingColorRgb)) {
                 Constant.nursingColor = partSetting.nursingColorRgb
@@ -1333,14 +1347,18 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 Constant.callNums = 0
             }
 
-            //如果当前还有其他床位呼叫或者是紧急呼叫则不重置门灯
-            if (Constant.callNums == 0 && !Constant.sosOn) {
-                DoorLightHelper.resetDoorLight()
+            if (SettingConfig.getDoorLightAlwaysOn(activity) == 0) {
+                //如果当前还有其他床位呼叫或者是紧急呼叫则不重置门灯
+                if (Constant.callNums == 0 && !Constant.sosOn) {
+                    DoorLightHelper.resetDoorLight()
+                }
             }
         } else if (tcpModel.action == TcpAction.SideAction.SOS_CANCEL) {
             Constant.sosOn = false
-            if (Constant.callNums == 0) {
-                DoorLightHelper.resetDoorLight()
+            if (SettingConfig.getDoorLightAlwaysOn(activity) == 0) {
+                if (Constant.callNums == 0) {
+                    DoorLightHelper.resetDoorLight()
+                }
             }
         }
     }
@@ -1440,21 +1458,27 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
     private fun checkCalls() {
         //5分钟无人处理自动清除
         try {
+            var update = false
             if (bedCalls.size > 0) {
                 val iterator = bedCalls.iterator()
                 while (iterator.hasNext()) {
                     val it = iterator.next()
-                    if (System.currentTimeMillis() - it.time >= 5 * 60 * 1000) {
+                    if (System.currentTimeMillis() - it.time >= 30 * 60 * 1000) {
                         iterator.remove()
+                        update = true
                     }
                 }
 
-                runOnUiThread {
-                    showCalls()
+                if (update) {
+                    runOnUiThread {
+                        showCalls()
+                    }
                 }
             } else {
-                Constant.callNums == 0
-                DoorLightHelper.resetDoorLight()
+                Constant.callNums = 0
+                if (SettingConfig.getDoorLightAlwaysOn(activity) == 0) {
+                    DoorLightHelper.resetDoorLight()
+                }
             }
         } catch (ex: Exception) {
             ex.printStackTrace()

+ 6 - 3
callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/fragment/MainFragment.kt

@@ -11,6 +11,7 @@ import com.wdkl.app.ncs.callingdoor.databinding.MainViewLayoutBinding
 import com.wdkl.app.ncs.callingdoor.helper.DoorLightHelper
 import com.wdkl.app.ncs.callingdoor.helper.Utils
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
+import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.errorLog
 import com.wdkl.ncs.android.lib.utils.showMessage
@@ -95,9 +96,11 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
 
             Constant.bedCustomIn = count > 0
 
-            //当前没有呼叫则
-            if (Constant.callNums == 0 && !Constant.sosOn) {
-                DoorLightHelper.resetDoorLight()
+            //当前没有呼叫
+            if (SettingConfig.getDoorLightAlwaysOn(activity) == 0) {
+                if (Constant.callNums == 0 && !Constant.sosOn) {
+                    DoorLightHelper.resetDoorLight()
+                }
             }
 
             if (simulateBed) {

+ 4 - 1
callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/fragment/SkyCallFragment.kt

@@ -13,6 +13,7 @@ import com.wdkl.app.ncs.callingdoor.R
 import com.wdkl.app.ncs.callingdoor.helper.DoorLightHelper
 import com.wdkl.app.ncs.callingdoor.helper.RingPlayHelper
 import com.wdkl.app.ncs.callingdoor.helper.SerialPortHelper
+import com.wdkl.app.ncs.callingdoor.settings.SettingConfig
 import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.common.Constant
@@ -193,7 +194,9 @@ class SkyCallFragment: BaseCallFragment(), CallSessionCallback {
         //如果当前在护理中则不操作门灯,如果不在护理中则重置门灯
         if (("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL)) && !Constant.inNursing) {
             //SerialPortHelper.setDoorLight(1, "111") //白色
-            DoorLightHelper.resetDoorLight()
+            if (SettingConfig.getDoorLightAlwaysOn(activity) == 0) {
+                DoorLightHelper.resetDoorLight()
+            }
         }
     }
 

+ 9 - 5
callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/SOSHelper.java

@@ -5,6 +5,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 
+import com.wdkl.app.ncs.callingdoor.settings.SettingConfig;
+import com.wdkl.ncs.android.lib.base.BaseApplication;
 import com.wdkl.ncs.android.middleware.common.Constant;
 import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil;
 
@@ -46,11 +48,13 @@ public class SOSHelper {
             Constant.sosOn = false;
 
             //如果当前在护理中则不操作门灯,如果不在护理中则重置门灯
-            if (Constant.inNursing) {
-                SerialPortHelper.setDoorLight(1, Constant.nursingColor); //绿色
-            } else {
-                //SerialPortHelper.setDoorLight(1, "111"); //白色
-                DoorLightHelper.resetDoorLight();
+            if (SettingConfig.getDoorLightAlwaysOn(BaseApplication.appContext) == 0) {
+                if (Constant.inNursing) {
+                    SerialPortHelper.setDoorLight(1, Constant.nursingColor); //绿色
+                } else {
+                    //SerialPortHelper.setDoorLight(1, "111"); //白色
+                    DoorLightHelper.resetDoorLight();
+                }
             }
         }
     }

+ 11 - 0
callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/settings/SettingConfig.java

@@ -64,6 +64,9 @@ public class SettingConfig {
     private static final String KEY_IN_NURSING = "KEY_IN_NURSING";
     private static final String KEY_NURSING_ID = "KEY_NURSING_ID";
 
+    //呼叫时门灯是否持续亮,需要手动按护理按键切换
+    private static final String KEY_DOOR_LIGHT_ALWAYS_ON = "KEY_DOOR_LIGHT_ALWAYS_ON";
+
     public static int getLanguageId(Context context) {
         //0--auto, 1--English, 2--中文, 3--西班牙语, 4--俄语
         return getSP(context).getInt(KEY_LANGUAGE_ID, 2);
@@ -98,6 +101,14 @@ public class SettingConfig {
         getEditor(context).putInt(KEY_NURSING_ID, nursingId).apply();
     }
 
+    public static int getDoorLightAlwaysOn(Context context) {
+        return getSP(context).getInt(KEY_DOOR_LIGHT_ALWAYS_ON, 0);
+    }
+
+    public static void setDoorLightAlwaysOn(Context context, int alwaysOn) {
+        getEditor(context).putInt(KEY_DOOR_LIGHT_ALWAYS_ON, alwaysOn).apply();
+    }
+
     /**
      * 获取白天亮度
      *

+ 391 - 6
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)
@@ -207,6 +207,26 @@ public class PartSettingDO implements Serializable {
     @Column(name = "transfer_duration_leader")
     @ApiModelProperty(value = "护士组长转接时长,单位:秒", required = false)
     private Integer transferDurationLeader;
+    /**
+     *	linux分机的呼出声音音量
+     */	@Column(name = "linux_bed_volume_native" )
+    @ApiModelProperty(value="linux分机的呼出声音音量",required=false)
+    private Integer linuxBedVolumeNative;
+    /**
+     *	linux分机的呼出声音增益
+     */	@Column(name = "linux_bed_gain_size" )
+    @ApiModelProperty(value="linux分机的呼出声音增益",required=false)
+    private Integer linuxBedGainSize;
+    /**
+     *	linux门口机的呼出声音音量
+     */	@Column(name = "linux_door_volume_native" )
+    @ApiModelProperty(value="linux门口机的呼出声音音量",required=false)
+    private Integer linuxDoorVolumeNative;
+    /**
+     *	linux门口机的呼出声音增益
+     */	@Column(name = "linux_door_gain_size" )
+    @ApiModelProperty(value="linux门口机的呼出声音增益",required=false)
+    private Integer linuxDoorGainSize;
 
 
     /**
@@ -245,6 +265,67 @@ public class PartSettingDO implements Serializable {
     @Column(name = "customize_role_call_second")
     @ApiModelProperty(value = "分机自定义呼叫角色按钮2要呼叫的角色ID", required = true)
     private Integer customizeRoleCallSecond;
+    /**
+     *	分机自定义呼叫角色按钮3对应的角色id
+     */	@Column(name = "customize_role_call_third" )
+    @ApiModelProperty(value="分机自定义呼叫角色按钮3对应的角色id",required=false)
+    private Integer customizeRoleCallThird;
+    /**
+     *	分机自定义呼叫角色按钮4对应的角色id
+     */	@Column(name = "customize_role_call_fourth" )
+    @ApiModelProperty(value="分机自定义呼叫角色按钮4对应的角色id",required=false)
+    private Integer customizeRoleCallFourth;
+    /**
+     *	分机自定义呼叫角色按钮5对应的角色id
+     */	@Column(name = "customize_role_call_fifth" )
+    @ApiModelProperty(value="分机自定义呼叫角色按钮5对应的角色id",required=false)
+    private Integer customizeRoleCallFifth;
+    /**
+     *	科室自定义呼叫医院级设备1的id
+     */	@Column(name = "customize_hospital_call_first" )
+    @ApiModelProperty(value="科室自定义呼叫医院级设备1的id",required=false)
+    private Integer customizeHospitalCallFirst;
+    /**
+     *	科室自定义呼叫医院级设备1的名称
+     */	@Column(name = "customize_hospital_call_first_name" )
+    @ApiModelProperty(value="科室自定义呼叫医院级设备1的名称",required=false)
+    private String customizeHospitalCallFirstName;
+    /**
+     *	科室自定义呼叫医院级设备2的id
+     */	@Column(name = "customize_hospital_call_second" )
+    @ApiModelProperty(value="科室自定义呼叫医院级设备2的id",required=false)
+    private Integer customizeHospitalCallSecond;
+    /**
+     *	科室自定义呼叫医院级设备2的名称
+     */	@Column(name = "customize_hospital_call_second_name" )
+    @ApiModelProperty(value="科室自定义呼叫医院级设备2的名称",required=false)
+    private String customizeHospitalCallSecondName;
+    /**
+     *	科室自定义呼叫医院级设备3的id
+     */	@Column(name = "customize_hospital_call_third" )
+    @ApiModelProperty(value="科室自定义呼叫医院级设备3的id",required=false)
+    private Integer customizeHospitalCallThird;
+    /**
+     *	科室自定义呼叫医院级设备3的名称
+     */
+    @Column(name = "customize_hospital_call_third_name" )
+    @ApiModelProperty(value="科室自定义呼叫医院级设备3的名称",required=false)
+    private String customizeHospitalCallThirdName;
+
+    /**
+     *	用户名字是否隐藏,0就是不隐藏,1就是隐藏
+     */
+    @Column(name = "customer_name_hidden" )
+    @ApiModelProperty(value="用户名字是否隐藏,0就是不隐藏,1就是隐藏",required=false)
+    private Integer customerNameHidden;
+
+    /**
+     *	工作人员名字是否隐藏,0就是不隐藏,1就是隐藏
+     */
+    @Column(name = "clerk_name_hidden" )
+    @ApiModelProperty(value="工作人员名字是否隐藏,0就是不隐藏,1就是隐藏",required=false)
+    private Integer clerkNameHidden;
+
 
     @Column(name = "doctor_title")
     @ApiModelProperty(value = "模拟分机医生标题", required = true)
@@ -296,7 +377,7 @@ public class PartSettingDO implements Serializable {
 
     @Column(name = "board_show_empty_bed")
     @ApiModelProperty(value = "信息看板显示空床位", required = true)
-    private Boolean boardShowEmptyBed;
+    private boolean boardShowEmptyBed;
 
     /**
      *	事件是否开启转发
@@ -306,9 +387,52 @@ public class PartSettingDO implements Serializable {
     /**
      *	护理灯颜色
      */	@Column(name = "nursing_color_rgb" )
-    @ApiModelProperty(value="护理灯颜色",required=false)
+    @ApiModelProperty(value="护理灯颜色",required=false)
     private String nursingColorRgb;
+    /**
+     *	是否开启双色门灯
+     */	@Column(name = "two_color_door_light_valid" )
+    @ApiModelProperty(value="是否开启双色门灯",required=false)
+    private Integer twoColorDoorLightValid;
+    /**
+     *	图片地址
+     */	@Column(name = "qr_url" )
+    @ApiModelProperty(value="图片地址",required=false)
+    private String qrUrl;
+    /**
+     *	群留言记录保留天数
+     */	@Column(name = "channel_im_history_store_days" )
+    @ApiModelProperty(value="群留言记录保留天数",required=false)
+    private Integer channelImHistoryStoreDays;
+    /**
+     *	是否开启双色门灯
+     */	@Column(name = "record_enabled" )
+    @ApiModelProperty(value="是否开启录音录像功能",required=false)
+    private Integer recordEnabled;
+    /**
+     *	是否点击按钮亮屏并触发功能,0为点击按钮只亮屏,1为点击按钮亮屏并且触发功能
+     */	@Column(name = "screen_light" )
+    @ApiModelProperty(value="是否点击按钮亮屏,0为点击按钮只亮屏,1为点击按钮亮屏并且触发功能",required=false)
+    private Integer screenLight;
+
+    /**
+     *	是否开启门口机呼叫床位的按钮,0为关闭,1为开启
+     */	@Column(name = "room_call_bed" )
+    @ApiModelProperty(value="是否开启门口机呼叫床位的按钮,0为关闭,1为开启",required=false)
+    private Integer roomCallBed;
 
+    /**
+     *	呼叫时是否开启所有门口机呼显示,0不开启,1开启
+     */	@Column(name = "bool_all_door_status" )
+    @ApiModelProperty(value="呼叫时是否开启所有门口机呼显示,0不开启,1开启",required=false)
+    private Integer boolAllDoorStatus;
+
+    /**
+     *	呼叫时是否开启所有门口机呼显示,0不开启,1开启
+     */
+    @Column(name = "bool_door_light_always_on" )
+    @ApiModelProperty(value="门灯是否常亮,0否、1是",required=false)
+    private Integer boolDoorLightAlwaysOn;
 
     @PrimaryKeyField
     public Integer getId() {
@@ -565,6 +689,38 @@ public class PartSettingDO implements Serializable {
         this.transferDurationLeader = transferDurationLeader;
     }
 
+    public Integer getLinuxBedVolumeNative() {
+        return linuxBedVolumeNative;
+    }
+
+    public void setLinuxBedVolumeNative(Integer linuxBedVolumeNative) {
+        this.linuxBedVolumeNative = linuxBedVolumeNative;
+    }
+
+    public Integer getLinuxBedGainSize() {
+        return linuxBedGainSize;
+    }
+
+    public void setLinuxBedGainSize(Integer linuxBedGainSize) {
+        this.linuxBedGainSize = linuxBedGainSize;
+    }
+
+    public Integer getLinuxDoorVolumeNative() {
+        return linuxDoorVolumeNative;
+    }
+
+    public void setLinuxDoorVolumeNative(Integer linuxDoorVolumeNative) {
+        this.linuxDoorVolumeNative = linuxDoorVolumeNative;
+    }
+
+    public Integer getLinuxDoorGainSize() {
+        return linuxDoorGainSize;
+    }
+
+    public void setLinuxDoorGainSize(Integer linuxDoorGainSize) {
+        this.linuxDoorGainSize = linuxDoorGainSize;
+    }
+
     public Integer getCommunicationModeBed() {
         return communicationModeBed;
     }
@@ -605,6 +761,94 @@ public class PartSettingDO implements Serializable {
         this.customizeRoleCallSecond = customizeRoleCallSecond;
     }
 
+    public Integer getCustomizeRoleCallThird() {
+        return customizeRoleCallThird;
+    }
+
+    public void setCustomizeRoleCallThird(Integer customizeRoleCallThird) {
+        this.customizeRoleCallThird = customizeRoleCallThird;
+    }
+
+    public Integer getCustomizeRoleCallFourth() {
+        return customizeRoleCallFourth;
+    }
+
+    public void setCustomizeRoleCallFourth(Integer customizeRoleCallFourth) {
+        this.customizeRoleCallFourth = customizeRoleCallFourth;
+    }
+
+    public Integer getCustomizeRoleCallFifth() {
+        return customizeRoleCallFifth;
+    }
+
+    public void setCustomizeRoleCallFifth(Integer customizeRoleCallFifth) {
+        this.customizeRoleCallFifth = customizeRoleCallFifth;
+    }
+
+    public Integer getCustomizeHospitalCallFirst() {
+        return customizeHospitalCallFirst;
+    }
+
+    public void setCustomizeHospitalCallFirst(Integer customizeHospitalCallFirst) {
+        this.customizeHospitalCallFirst = customizeHospitalCallFirst;
+    }
+
+    public String getCustomizeHospitalCallFirstName() {
+        return customizeHospitalCallFirstName;
+    }
+
+    public void setCustomizeHospitalCallFirstName(String customizeHospitalCallFirstName) {
+        this.customizeHospitalCallFirstName = customizeHospitalCallFirstName;
+    }
+
+    public Integer getCustomizeHospitalCallSecond() {
+        return customizeHospitalCallSecond;
+    }
+
+    public void setCustomizeHospitalCallSecond(Integer customizeHospitalCallSecond) {
+        this.customizeHospitalCallSecond = customizeHospitalCallSecond;
+    }
+
+    public String getCustomizeHospitalCallSecondName() {
+        return customizeHospitalCallSecondName;
+    }
+
+    public void setCustomizeHospitalCallSecondName(String customizeHospitalCallSecondName) {
+        this.customizeHospitalCallSecondName = customizeHospitalCallSecondName;
+    }
+
+    public Integer getCustomizeHospitalCallThird() {
+        return customizeHospitalCallThird;
+    }
+
+    public void setCustomizeHospitalCallThird(Integer customizeHospitalCallThird) {
+        this.customizeHospitalCallThird = customizeHospitalCallThird;
+    }
+
+    public String getCustomizeHospitalCallThirdName() {
+        return customizeHospitalCallThirdName;
+    }
+
+    public void setCustomizeHospitalCallThirdName(String customizeHospitalCallThirdName) {
+        this.customizeHospitalCallThirdName = customizeHospitalCallThirdName;
+    }
+
+    public Integer getCustomerNameHidden() {
+        return customerNameHidden;
+    }
+
+    public void setCustomerNameHidden(Integer customerNameHidden) {
+        this.customerNameHidden = customerNameHidden;
+    }
+
+    public Integer getClerkNameHidden() {
+        return clerkNameHidden;
+    }
+
+    public void setClerkNameHidden(Integer clerkNameHidden) {
+        this.clerkNameHidden = clerkNameHidden;
+    }
+
     public String getDoctorTitle() {
         return doctorTitle;
     }
@@ -685,11 +929,11 @@ public class PartSettingDO implements Serializable {
         this.autoAccept = autoAccept;
     }
 
-    public Boolean getBoardShowEmptyBed() {
+    public boolean isBoardShowEmptyBed() {
         return boardShowEmptyBed;
     }
 
-    public void setBoardShowEmptyBed(Boolean boardShowEmptyBed) {
+    public void setBoardShowEmptyBed(boolean boardShowEmptyBed) {
         this.boardShowEmptyBed = boardShowEmptyBed;
     }
 
@@ -708,4 +952,145 @@ public class PartSettingDO implements Serializable {
     public void setNursingColorRgb(String nursingColorRgb) {
         this.nursingColorRgb = nursingColorRgb;
     }
+
+    public Integer getTwoColorDoorLightValid() {
+        return twoColorDoorLightValid;
+    }
+
+    public void setTwoColorDoorLightValid(Integer twoColorDoorLightValid) {
+        this.twoColorDoorLightValid = twoColorDoorLightValid;
+    }
+
+    public String getQrUrl() {
+        return qrUrl;
+    }
+
+    public void setQrUrl(String qrUrl) {
+        this.qrUrl = qrUrl;
+    }
+
+    public Integer getChannelImHistoryStoreDays() {
+        return channelImHistoryStoreDays;
+    }
+
+    public void setChannelImHistoryStoreDays(Integer channelImHistoryStoreDays) {
+        this.channelImHistoryStoreDays = channelImHistoryStoreDays;
+    }
+
+    public Integer getRecordEnabled() {
+        if (recordEnabled == null){
+            return 0;
+        }
+        return recordEnabled;
+    }
+
+    public void setRecordEnabled(Integer recordEnabled) {
+        this.recordEnabled = recordEnabled;
+    }
+
+    public Integer getScreenLight() {
+        if (screenLight == null) {
+            return 0;
+        }
+        return screenLight;
+    }
+
+    public void setScreenLight(Integer screenLight) {
+        this.screenLight = screenLight;
+    }
+
+    public Integer getRoomCallBed() {
+        return roomCallBed;
+    }
+
+    public void setRoomCallBed(Integer roomCallBed) {
+        this.roomCallBed = roomCallBed;
+    }
+
+    public Integer getBoolAllDoorStatus() {
+        if (boolAllDoorStatus == null) {
+            return 0;
+        }
+        return boolAllDoorStatus;
+    }
+
+    public void setBoolAllDoorStatus(Integer boolAllDoorStatus) {
+        this.boolAllDoorStatus = boolAllDoorStatus;
+    }
+
+    public Integer getBoolDoorLightAlwaysOn() {
+        return boolDoorLightAlwaysOn;
+    }
+
+    public void setBoolDoorLightAlwaysOn(Integer boolDoorLightAlwaysOn) {
+        this.boolDoorLightAlwaysOn = boolDoorLightAlwaysOn;
+    }
+
+    @Override
+    public String toString() {
+        return "PartSettingDO{" +
+                "id=" + id +
+                ", unionId='" + unionId + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", partId=" + partId +
+                ", dayStart='" + dayStart + '\'' +
+                ", dayLight=" + dayLight +
+                ", dayVol=" + dayVol +
+                ", dayRingVol=" + dayRingVol +
+                ", dayRingTimes=" + dayRingTimes +
+                ", dayNurseLed=" + dayNurseLed +
+                ", dayDoorVol=" + dayDoorVol +
+                ", dayBedVol=" + dayBedVol +
+                ", dayTransferBoxVol=" + dayTransferBoxVol +
+                ", dayTransferBoxSystemVol=" + dayTransferBoxSystemVol +
+                ", nightStart='" + nightStart + '\'' +
+                ", nightLight=" + nightLight +
+                ", nightVol=" + nightVol +
+                ", nightRingVol=" + nightRingVol +
+                ", nightRingTimes=" + nightRingTimes +
+                ", nightNurseLed=" + nightNurseLed +
+                ", nightDoorVol=" + nightDoorVol +
+                ", nightBedVol=" + nightBedVol +
+                ", nightTransferBoxVol=" + nightTransferBoxVol +
+                ", nightTransferBoxSystemVol=" + nightTransferBoxSystemVol +
+                ", sleepSecondsNurse=" + sleepSecondsNurse +
+                ", sleepSecondsDoor=" + sleepSecondsDoor +
+                ", sleepSecondsBed=" + sleepSecondsBed +
+                ", sipOvertime=" + sipOvertime +
+                ", transferDuration=" + transferDuration +
+                ", transferDurationLeader=" + transferDurationLeader +
+                ", communicationModeBed=" + communicationModeBed +
+                ", communicationModeNurse=" + communicationModeNurse +
+                ", communicationModeMobile=" + communicationModeMobile +
+                ", customizeRoleCallFirst=" + customizeRoleCallFirst +
+                ", customizeRoleCallSecond=" + customizeRoleCallSecond +
+                ", customizeRoleCallThird=" + customizeRoleCallThird +
+                ", customizeRoleCallFourth=" + customizeRoleCallFourth +
+                ", customizeRoleCallFifth=" + customizeRoleCallFifth +
+                ", customizeHospitalCallFirst=" + customizeHospitalCallFirst +
+                ", customizeHospitalCallFirstName='" + customizeHospitalCallFirstName + '\'' +
+                ", customizeHospitalCallSecond=" + customizeHospitalCallSecond +
+                ", customizeHospitalCallSecondName='" + customizeHospitalCallSecondName + '\'' +
+                ", customizeHospitalCallThird=" + customizeHospitalCallThird +
+                ", customizeHospitalCallThirdName='" + customizeHospitalCallThirdName + '\'' +
+                ", customerNameHidden=" + customerNameHidden +
+                ", doctorTitle='" + doctorTitle + '\'' +
+                ", doctorValid=" + doctorValid +
+                ", nurseTitle='" + nurseTitle + '\'' +
+                ", nurseValid=" + nurseValid +
+                ", doorNurseTitle='" + doorNurseTitle + '\'' +
+                ", doorNurseValid=" + doorNurseValid +
+                ", doorNursingTitle='" + doorNursingTitle + '\'' +
+                ", doorNursingValid=" + doorNursingValid +
+                ", upSeconds=" + upSeconds +
+                ", autoAccept=" + autoAccept +
+                ", boardShowEmptyBed=" + boardShowEmptyBed +
+                ", eventForward=" + eventForward +
+                ", nursingColorRgb='" + nursingColorRgb + '\'' +
+                ", twoColorDoorLightValid=" + twoColorDoorLightValid +
+                ", qrUrl='" + qrUrl + '\'' +
+                ", channelImHistoryStoreDays=" + channelImHistoryStoreDays +
+                '}';
+    }
 }

+ 1 - 1
middleware/src/main/code/com/wdkl/ncs/android/middleware/utils/CommonUtils.java

@@ -19,7 +19,7 @@ public class CommonUtils {
     private static final String DEFAULT_URL = "172.28.100.100";
     //private static final String DEFAULT_URL = "192.168.9.200";
     //private static final String DEFAULT_URL = "192.168.8.5";
-    //private static final String DEFAULT_URL = "192.168.101.1";
+    //private static final String DEFAULT_URL = "192.168.101.1";  //潼南
     private static final String DEFAULT_URL_PORT = "8006";
     private static final String DEFAULT_SIP_PORT = "8188";