修改责任医生责任护士标题由服务端配置显示

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -381,7 +381,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
         if (deviceInfo.customerId != null) {
             Constant.CUSTOM_ID = deviceInfo.customerId
         }
-        EventBus.getDefault().post(MessageEvent("updateCustom", Constant.EVENT_UPDATE_CUSTOM))
+        //EventBus.getDefault().post(MessageEvent("updateCustom", Constant.EVENT_UPDATE_CUSTOM))
 
         if (TextUtils.isEmpty(Constant.SIP_ID)) {
             showMessage("SIP ID为空")
@@ -403,31 +403,47 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
     }
 
     override fun setPartSettings(partSetting: PartSettingDO) {
-        //设置白昼起止时间
-        SettingConfig.setInitialDayTime(this, partSetting.dayStart.substring(0,5))
-        SettingConfig.setEndOfDay(this,partSetting.nightStart.substring(0,5))
+        try {
+            //设置白昼起止时间
+            SettingConfig.setInitialDayTime(this, partSetting.dayStart.substring(0,5))
+            SettingConfig.setEndOfDay(this,partSetting.nightStart.substring(0,5))
 
-        //分机白天夜晚亮度
-        SettingConfig.setExtensionDaytimeBrightness(this, partSetting.dayLight)
-        SettingConfig.setExtensionNightBrightness(this, partSetting.nightLight)
+            //分机白天夜晚亮度
+            SettingConfig.setExtensionDaytimeBrightness(this, partSetting.dayLight)
+            SettingConfig.setExtensionNightBrightness(this, partSetting.nightLight)
 
-        //分机白天夜晚护理灯 也就是LED灯的亮度
-        SettingConfig.setExtensionDaytimeLEDBrightness(this, partSetting.dayNurseLed)
-        SettingConfig.setExtensionNightLEDBrightness(this, partSetting.nightNurseLed)
+            //分机白天夜晚护理灯 也就是LED灯的亮度
+            SettingConfig.setExtensionDaytimeLEDBrightness(this, partSetting.dayNurseLed)
+            SettingConfig.setExtensionNightLEDBrightness(this, partSetting.nightNurseLed)
 
-        //分机白天夜晚系统音量
-        SettingConfig.setExtensionDaytimeSystemVolume(this, partSetting.dayBedVol)
-        SettingConfig.setExtensionNightSystemVolume(this, partSetting.nightBedVol)
+            //分机白天夜晚系统音量
+            SettingConfig.setExtensionDaytimeSystemVolume(this, partSetting.dayBedVol)
+            SettingConfig.setExtensionNightSystemVolume(this, partSetting.nightBedVol)
 
-        //分机通话音量  没做白昼区分
-        SettingConfig.setExtensionCallVolume(this, partSetting.dayBedVol)
+            //分机通话音量  没做白昼区分
+            SettingConfig.setExtensionCallVolume(this, partSetting.dayBedVol)
 
-        SettingConfig.setSipOverTime(this, partSetting.sipOvertime)
-        SettingConfig.setSleepTime(this, partSetting.sleepSecondsBed)
+            SettingConfig.setSipOverTime(this, partSetting.sipOvertime)
+            SettingConfig.setSleepTime(this, partSetting.sleepSecondsBed)
+
+            Constant.doctorTitle = partSetting.doctorTitle
+            Constant.nurseTitle = partSetting.nurseTitle
+            if (partSetting.doctorValid != null) {
+                Constant.doctorValid = partSetting.doctorValid
+            }
+            if (partSetting.nurseValid != null) {
+                Constant.nurseValid = partSetting.nurseValid
+            }
 
-        VoiceManagerUtil.setCallVoice(activity, partSetting.dayBedVol)
+            VoiceManagerUtil.setCallVoice(activity, partSetting.dayBedVol)
+        } catch (ex: Exception) {
+            showMessage("获取设置参数信息异常" + ex.message)
+            ex.printStackTrace()
+        }
 
         updateSettings(true)
+
+        EventBus.getDefault().post(MessageEvent("updateCustom", Constant.EVENT_UPDATE_CUSTOM))
     }
 
     override fun updateNurseConfig(list: List<NurseConfigDto>) {

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/MainFragment.kt

@@ -83,6 +83,20 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
             tv_order_content.text = customInfo.advice
         }
 
+        if (Constant.doctorValid == 1) {
+            ll_doctor_view.visibility = View.VISIBLE
+            tv_doctor_title.text = Constant.doctorTitle
+        } else {
+            ll_doctor_view.visibility = View.GONE
+        }
+
+        if (Constant.nurseValid == 1) {
+            ll_nurse_view.visibility = View.VISIBLE
+            tv_nurse_title.text = Constant.nurseTitle
+        } else {
+            ll_nurse_view.visibility = View.GONE
+        }
+
         tv_doctor_name.text = customInfo.doctorName
         tv_nurse_name.text = customInfo.nurseName
 
@@ -123,7 +137,7 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
         showMessage("没有网络")
     }
 
-    fun updateInfo() {
+    private fun updateInfo() {
         if (Constant.DEVICE_STATUS == 0) {
             tv_bed_name.text = "设备未启用"
             tv_bed_name.setTextColor(resources.getColor(R.color.red_color))

callingbed/src/main/res/layout/main_view.xml

@@ -32,6 +32,7 @@
                     android:layout_marginTop="12dp"
                     android:src="@mipmap/ic_doctor_default"/>
                 <TextView
+                    android:id="@+id/tv_doctor_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
@@ -64,6 +65,7 @@
                     android:layout_marginTop="12dp"
                     android:src="@mipmap/ic_nurse_default"/>
                 <TextView
+                    android:id="@+id/tv_nurse_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"

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

@@ -122,6 +122,11 @@ public class Constant {
     //紧急按钮设备id
     public static int EMERGENCY_ID = -1;
 
+    public static String doctorTitle = "责任医生";
+    public static Integer doctorValid = 1;
+    public static String nurseTitle = "责任护士";
+    public static Integer nurseValid = 1;
+
     /**
      * Sip注册状态
      */

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)
@@ -209,6 +209,63 @@ public class PartSettingDO implements Serializable {
     private Integer transferDurationLeader;
 
 
+    /**
+     * 分机通讯模式
+     */
+    @Column(name = "communication_mode_bed")
+    @ApiModelProperty(value = "分机通讯模式(分机通话模式:1-网络电话,2-移动电话,3-座机号)", required = true)
+    private Integer communicationModeBed;
+
+
+    /**
+     * 护士主机通讯模式
+     */
+    @Column(name = "communication_mode_nurse")
+    @ApiModelProperty(value = "护士主机通讯模式(分机通话模式:1-网络电话,2-移动电话,3-座机号)", required = true)
+    private Integer communicationModeNurse;
+
+    /**
+     * 移动端(手机)通讯模式
+     */
+    @Column(name = "communication_mode_mobile")
+    @ApiModelProperty(value = "护士主机通讯模式(分机通话模式:1-网络电话,2-移动电话,3-座机号)", required = true)
+    private Integer communicationModeMobile;
+
+
+    /**
+     * 分机自定义呼叫角色按钮1
+     */
+    @Column(name = "customize_role_call_first")
+    @ApiModelProperty(value = "分机自定义呼叫角色按钮1要呼叫的角色ID", required = true)
+    private Integer customizeRoleCallFirst;
+
+    /**
+     * 分机自定义呼叫角色按钮2
+     */
+    @Column(name = "customize_role_call_second")
+    @ApiModelProperty(value = "分机自定义呼叫角色按钮2要呼叫的角色ID", required = true)
+    private Integer customizeRoleCallSecond;
+
+    @Column(name = "doctor_title")
+    @ApiModelProperty(value = "模拟分机医生标题", required = true)
+    private String doctorTitle;
+
+    @Column(name = "doctor_valid")
+    @ApiModelProperty(value = "是否显示模拟分机医生标题", required = true)
+    private Integer doctorValid;
+
+    @Column(name = "nurse_title")
+    @ApiModelProperty(value = "模拟分机护士标题", required = true)
+    private String nurseTitle;
+
+    @Column(name = "nurse_valid")
+    @ApiModelProperty(value = "是否显示模拟分机护士标题", required = true)
+    private Integer nurseValid;
+
+    @Column(name = "up_seconds")
+    @ApiModelProperty(value = "腕表上传定位时间间隔", required = true)
+    private Integer upSeconds;
+
     @PrimaryKeyField
     public Integer getId() {
         return id;
@@ -463,4 +520,84 @@ public class PartSettingDO implements Serializable {
     public void setTransferDurationLeader(Integer transferDurationLeader) {
         this.transferDurationLeader = transferDurationLeader;
     }
+
+    public Integer getCommunicationModeBed() {
+        return communicationModeBed;
+    }
+
+    public void setCommunicationModeBed(Integer communicationModeBed) {
+        this.communicationModeBed = communicationModeBed;
+    }
+
+    public Integer getCommunicationModeNurse() {
+        return communicationModeNurse;
+    }
+
+    public void setCommunicationModeNurse(Integer communicationModeNurse) {
+        this.communicationModeNurse = communicationModeNurse;
+    }
+
+    public Integer getCommunicationModeMobile() {
+        return communicationModeMobile;
+    }
+
+    public void setCommunicationModeMobile(Integer communicationModeMobile) {
+        this.communicationModeMobile = communicationModeMobile;
+    }
+
+    public Integer getCustomizeRoleCallFirst() {
+        return customizeRoleCallFirst;
+    }
+
+    public void setCustomizeRoleCallFirst(Integer customizeRoleCallFirst) {
+        this.customizeRoleCallFirst = customizeRoleCallFirst;
+    }
+
+    public Integer getCustomizeRoleCallSecond() {
+        return customizeRoleCallSecond;
+    }
+
+    public void setCustomizeRoleCallSecond(Integer customizeRoleCallSecond) {
+        this.customizeRoleCallSecond = customizeRoleCallSecond;
+    }
+
+    public String getDoctorTitle() {
+        return doctorTitle;
+    }
+
+    public void setDoctorTitle(String doctorTitle) {
+        this.doctorTitle = doctorTitle;
+    }
+
+    public Integer getDoctorValid() {
+        return doctorValid;
+    }
+
+    public void setDoctorValid(Integer doctorValid) {
+        this.doctorValid = doctorValid;
+    }
+
+    public String getNurseTitle() {
+        return nurseTitle;
+    }
+
+    public void setNurseTitle(String nurseTitle) {
+        this.nurseTitle = nurseTitle;
+    }
+
+    public Integer getNurseValid() {
+        return nurseValid;
+    }
+
+    public void setNurseValid(Integer nurseValid) {
+        this.nurseValid = nurseValid;
+    }
+
+    public Integer getUpSeconds() {
+        return upSeconds;
+    }
+
+    public void setUpSeconds(Integer upSeconds) {
+        this.upSeconds = upSeconds;
+    }
 }