修改activity禁止滑动退出，更新设备数据对象

app/src/main/code/com/wdkl/app/ncs/application/Application.kt

@@ -74,11 +74,8 @@ class Application : BaseApplication() {
      * @return rx观察者
      */
     private fun initFrame() {
-        if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.LOLLIPOP) {
-            BaseConfig.getInstance().addActivity("WelcomeActivity", "HomeActivity")
-        } else {
-            BaseConfig.getInstance().closeScrollBack()
-        }
+        BaseConfig.getInstance().addActivity("HomeActivity", "AppUpdateActivity")
+
         NetEngineConfig.init(baseContext)
                 .openLogger()
                 .addNetInterceptor(RestfulExceptionInterceptor())

build.gradle

@@ -108,7 +108,7 @@ allprojects {
         maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter'}
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
         maven { url 'https://jitpack.io' }
-        maven { url 'https://dl.bintray.com/geamtear/maven' }
+        //maven { url 'https://dl.bintray.com/geamtear/maven' }
 
     }
     tasks.withType(Javadoc) { // 新增

home/src/main/code/com/wdkl/ncs/android/component/home/activity/HomeActivity.kt

@@ -160,7 +160,7 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
                     presenter.getTcpServerHost()
                 })
                 try {
-                    Thread.sleep(5000)
+                    Thread.sleep(15000)
                 } catch (e: Exception) {
                 }
             }

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

@@ -2,13 +2,14 @@ package com.wdkl.ncs.android.middleware.model.dos;
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import com.wdkl.ncs.android.middleware.model.annotation.Column;
 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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.Objects;
 
@@ -65,6 +66,10 @@ public class DeviceDO implements Serializable {
     @Column(name = "device_type")
     @ApiModelProperty(value = "注册设备类型：1：护士主机  2：医生主机  3：门口机  4：病床分机 5：LCD走廊屏  6：LED点阵屏  7：移动设备  8：护工腕表  9：病人腕表  10：手机App", required = false)
     private Integer deviceType;
+
+    @Column(name = "sign_type")
+    @ApiModelProperty(value = "体征设备类型",required = false)
+    private Integer signType;
     /**
      * 注册设备出厂编号
      */
@@ -96,6 +101,12 @@ public class DeviceDO implements Serializable {
     @ApiModelProperty(value = "设备别名", required = false)
     private String name;
     /**
+     *	设备号码
+     */
+    @Column(name = "phone_number" )
+    @ApiModelProperty(value="设备号码",required=false)
+    private String phoneNumber;
+    /**
      * 该设备的有线以太网卡MAC地址
      */
     @Column(name = "eth_mac")
@@ -170,7 +181,7 @@ public class DeviceDO implements Serializable {
     /**
      * null
      */
-    @Column(name = "member_id")
+    @Column(name = "member_id", allowNullUpdate = true)
     @ApiModelProperty(value = "null", required = false)
     private Integer memberId;
     /**
@@ -199,10 +210,23 @@ public class DeviceDO implements Serializable {
     /**
      * roleId
      */
-    @Column(name = "role_id")
+    @Column(name = "role_id", allowNullUpdate = true)
     @ApiModelProperty(value = "roleId", required = false)
     private Integer roleId;
 
+    @Column(name = "trans_rs485_id", allowNullUpdate = true)
+    @ApiModelProperty(value = "485转换盒ID", required = false)
+    private Integer transRs485Id;
+
+    @Column(name = "trans_audio_id", allowNullUpdate = true)
+    @ApiModelProperty(value = "语音转换盒ID", required = false)
+    private Integer transAudioId;
+
+    @Column(name = "group_id", allowNullUpdate = true)
+    @ApiModelProperty(value = "体征设备组id", required = false)
+    private Integer groupId;
+
+
     @PrimaryKeyField
     public Integer getId() {
         return id;
@@ -274,6 +298,13 @@ public class DeviceDO implements Serializable {
         this.deviceType = deviceType;
     }
 
+    public Integer getSignType() {
+        return signType;
+    }
+
+    public void setSignType(Integer signType) {
+        this.signType = signType;
+    }
 
     public String getCode() {
         return code;
@@ -320,6 +351,15 @@ public class DeviceDO implements Serializable {
     }
 
 
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+
     public String getEthMac() {
         return ethMac;
     }
@@ -473,6 +513,30 @@ public class DeviceDO implements Serializable {
         this.config = config;
     }
 
+    public Integer getTransRs485Id() {
+        return transRs485Id;
+    }
+
+    public void setTransRs485Id(Integer transRs485Id) {
+        this.transRs485Id = transRs485Id;
+    }
+
+    public Integer getTransAudioId() {
+        return transAudioId;
+    }
+
+    public void setTransAudioId(Integer transAudioId) {
+        this.transAudioId = transAudioId;
+    }
+
+    public Integer getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Integer groupId) {
+        this.groupId = groupId;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/vo/DeviceVO.java

@@ -6,7 +6,7 @@ import com.wdkl.ncs.android.middleware.model.dos.DeviceDO;
 @Table(name = "ncs_device")
 public class DeviceVO extends DeviceDO {
 
-    private String memberName; // 使用人(护士腕表)
+    private String member_name; // 使用人(护士腕表)
 
     private String roleName; // 使用角色
 
@@ -16,12 +16,16 @@ public class DeviceVO extends DeviceDO {
 
     private String fullName; // 空间结构全名
 
-    public String getMemberName() {
-        return memberName;
+    private String trans485Mac; // 485地址
+
+    private String transAudioMac; // 485语音地址
+
+    public String getMember_name() {
+        return member_name;
     }
 
-    public void setMemberName(String memberName) {
-        this.memberName = memberName;
+    public void setMember_name(String member_name) {
+        this.member_name = member_name;
     }
 
     public String getRoleName() {
@@ -55,4 +59,20 @@ public class DeviceVO extends DeviceDO {
     public void setFullName(String fullName) {
         this.fullName = fullName;
     }
+
+    public String getTrans485Mac() {
+        return trans485Mac;
+    }
+
+    public void setTrans485Mac(String trans485Mac) {
+        this.trans485Mac = trans485Mac;
+    }
+
+    public String getTransAudioMac() {
+        return transAudioMac;
+    }
+
+    public void setTransAudioMac(String transAudioMac) {
+        this.transAudioMac = transAudioMac;
+    }
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/vo/DeviceWatchInfoVO.java

@@ -5,14 +5,15 @@ import com.wdkl.ncs.android.middleware.model.dos.DeviceDO;
 
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 /**
  * @author
  * @title: Vothin
  * @projectName nc
- * @description: TODO
  * @date 2021/6/1810:54
  */
-public class DeviceWatchInfoVO extends DeviceDO {
+public class DeviceWatchInfoVO extends DeviceDO implements Serializable {
 
     @Column(name = "hospital_id")
     @ApiModelProperty(value = "医院id", required = false)