Browse Source

更新来电显示及设置

weizhengliang 3 years ago
parent
commit
4cede39b13

+ 11 - 1
home/src/main/code/com/wdkl/ncs/android/component/home/activity/NewCallListActivity.kt

@@ -176,8 +176,18 @@ class NewCallListActivity : BaseToolActivity(), NewCallItemAdapter.CallClickList
                     iterator.remove()
                 }
             }
+
+            if (Constants.newCallList.size > 0) {
+                adapter.data.clear()
+                adapter.data.addAll(Constants.newCallList)
+                adapter.notifyDataSetChanged()
+            } else {
+                emptyView.visibility = View.VISIBLE
+                AppTool.Time.delay(500) {
+                    finish()
+                }
+            }
         }
-        updateCallList()
     }
 
     override fun callAccept(model: TcpModel) {

+ 1 - 1
home/src/main/res/layout/activity_call_list.xml

@@ -28,7 +28,7 @@
         android:gravity="center"
         android:textSize="24sp"
         android:textColor="@color/warn_orange"
-        android:text="@string/data_empty"
+        android:text="没有呼叫"
         android:background="@color/color_white"
         android:visibility="gone"/>
 </FrameLayout>

+ 90 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/model/dos/PartSettingDO.java

@@ -232,6 +232,40 @@ public class PartSettingDO implements Serializable {
     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;
@@ -510,4 +544,60 @@ public class PartSettingDO implements Serializable {
     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;
+    }
 }

+ 25 - 0
middleware/src/main/code/com/wdkl/ncs/android/middleware/model/vo/HostDevicePartSettingVO.java

@@ -0,0 +1,25 @@
+package com.wdkl.ncs.android.middleware.model.vo;
+
+import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO;
+import com.wdkl.ncs.android.middleware.model.dos.SystemConfigDO;
+
+import java.util.List;
+
+/**
+ * @author
+ * @title: Vothin
+ * @projectName nc
+ * @date 2022/1/1812:19
+ */
+public class HostDevicePartSettingVO extends PartSettingDO {
+
+    List<SystemConfigDO> systemConfigList;
+
+    public List<SystemConfigDO> getSystemConfigList() {
+        return systemConfigList;
+    }
+
+    public void setSystemConfigDOList(List<SystemConfigDO> systemConfigList) {
+        this.systemConfigList = systemConfigList;
+    }
+}