-责任医生和责任护士名称及显示动态显示，由服务端配置

-修改一处语音播报bug
-四川眉山项目app名称需要修改

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 13
+    ext.app_version_code = 14
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.0.13"
+    ext.app_version = "1.0.14"
 
     /**
      * 项目依赖库

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/bean/SettingConfiguration.java

@@ -33,6 +33,10 @@ public class SettingConfiguration {
     public int sipOvertime;
     public int transferDuration;
     public int transferDurationLeader;
+    public String doctorTitle;
+    public Integer doctorValid = 1;
+    public String nurseTitle;
+    public Integer nurseValid = 1;
 
 
     private static SettingConfiguration instance;

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

@@ -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;
+    }
 }

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -713,6 +713,15 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
                 SettingConfiguration.getInstance().transferDurationLeader = data.transferDurationLeader
             }
 
+            SettingConfiguration.getInstance().doctorTitle = data.doctorTitle
+            SettingConfiguration.getInstance().nurseTitle = data.nurseTitle
+            if (data.doctorValid != null) {
+                SettingConfiguration.getInstance().doctorValid = data.doctorValid
+            }
+            if (data.nurseValid != null) {
+                SettingConfiguration.getInstance().nurseValid = data.nurseValid
+            }
+
             setSettingConfiguration()
             initCountDownTimer()
             initTransferCountDownTimer()

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/FramePartFragment.kt

@@ -25,6 +25,7 @@ import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.FramePartContract
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.FramePartPresenter
+import com.wdkl.ncs.android.middleware.model.bean.SettingConfiguration
 import com.wdkl.ncs.android.middleware.model.dto.ExaminationConfigByGroupNameDto
 import com.wdkl.ncs.android.middleware.model.dto.FeeConfigByGroupNameDto
 import com.wdkl.ncs.android.middleware.model.vo.*
@@ -256,6 +257,22 @@ class FramePartFragment: BaseFragment<FramePartPresenter, FragmentFramePartBindi
 
     override fun showCustomerInfo(data: CustomerInfoVO) {
         //基本信息
+        if (SettingConfiguration.getInstance().doctorValid == 1) {
+            doctor_duty_relalyout.visibility = View.VISIBLE
+            advice_layout.visibility = View.VISIBLE
+            illness_layout.visibility = View.VISIBLE
+        } else {
+            doctor_duty_relalyout.visibility = View.GONE
+            advice_layout.visibility = View.GONE
+            illness_layout.visibility = View.GONE
+        }
+        if (SettingConfiguration.getInstance().nurseValid == 1) {
+            nurse_duty_relalyout.visibility = View.VISIBLE
+        } else {
+            nurse_duty_relalyout.visibility = View.GONE
+        }
+        tv_doctor_title.text = SettingConfiguration.getInstance().doctorTitle
+        tv_nurse_title.text = SettingConfiguration.getInstance().nurseTitle
         tv_doctor_name.text = data.doctorName
         tv_nurse_name.text = data.nurseName
         var nurseConfigs = ""

nursehome/src/main/res/layout/right_basic_information.xml

@@ -263,9 +263,11 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="10dp"
                     android:layout_below="@+id/phone_relalyout"
-                    android:layout_marginTop="8dp">
+                    android:layout_marginTop="8dp"
+                    android:visibility="gone">
 
                     <TextView
+                        android:id="@+id/tv_doctor_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="8dp"
@@ -291,9 +293,11 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="10dp"
                     android:layout_below="@+id/doctor_duty_relalyout"
-                    android:layout_marginTop="8dp">
+                    android:layout_marginTop="8dp"
+                    android:visibility="gone">
 
                     <TextView
+                        android:id="@+id/tv_nurse_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="8dp"
@@ -349,7 +353,8 @@
                     android:layout_marginTop="8dp"
                     android:paddingTop="4dp"
                     android:background="#F3F9FE"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -380,7 +385,8 @@
                     android:layout_marginTop="8dp"
                     android:paddingTop="4dp"
                     android:background="#F3F9FE"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"

resource/src/main/res/values/strings.xml

@@ -1,5 +1,6 @@
 <resources>
     <string name="javashop_app_name">NCS-护士主机卡尔版</string>
+    <!--<string name="javashop_app_name">东坡区敬老院呼叫系统</string>-->
     <string name="javashop_qrcode_name">扫啊扫</string>
     <string name="javashop_navigation_home_title">首页</string>
     <string name="javashop_navigation_category_title">分类</string>

webrtc/src/main/java/com/wdkl/core/voip/SpeechUtil.java

@@ -158,7 +158,7 @@ public class SpeechUtil {
 
     public void stopSpeak() {
         speechTextList.clear();
-        if (textToSpeech.isSpeaking()) {
+        if (textToSpeech != null && textToSpeech.isSpeaking()) {
             textToSpeech.stop();
             isStop = true;
             speakIndex = 0;