#标题栏增加科室名称及时间显示

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

@@ -48,6 +48,7 @@ import com.wdkl.ncs.android.middleware.logic.presenter.home.HomeActivityPresente
 import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
 import com.wdkl.ncs.android.middleware.model.vo.DeviceVO
+import com.wdkl.ncs.android.middleware.model.vo.DeviceWatchInfoVO
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.tcp.TcpClient
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel
@@ -220,7 +221,7 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
     /**
      * 返回的设备信息
      */
-    override fun setDeviceDo(data: DeviceVO) {
+    override fun setDeviceDo(data: DeviceWatchInfoVO) {
         activity_register_layout.visibility = View.GONE
         watch_activity_home_linyout.visibility = View.VISIBLE
 
@@ -247,6 +248,8 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
         initSDK()
         presenter.getDeviceSettingData(""+Constants.partId)
 
+        tv_part_name.setText(data.hospitalName + data.partName)
+
         showMessage("初始化完成")
     }
 

home/src/main/res/layout/activity_home.xml

@@ -46,6 +46,24 @@
             android:layout_alignParentTop="true"/>
 
         <TextView
+            android:id="@+id/tv_part_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_alignParentTop="true"
+            android:textColor="#2F9DF1"/>
+
+        <TextClock
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginRight="5dp"
+            android:format12Hour="HH:mm"
+            android:format24Hour="HH:mm"
+            android:textColor="#2F9DF1"/>
+
+        <TextView
             android:id="@+id/tv_version_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/home/HomeActivityContract.kt

@@ -6,12 +6,13 @@ import com.wdkl.ncs.android.middleware.model.dos.DeviceDO
 import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
 import com.wdkl.ncs.android.middleware.model.vo.DeviceVO
+import com.wdkl.ncs.android.middleware.model.vo.DeviceWatchInfoVO
 import com.wdkl.ncs.android.middleware.model.vo.WatchContactsVO
 
 interface HomeActivityContract{
     interface View : BaseContract.BaseView{
         //显示设备信息
-        fun setDeviceDo(data : DeviceVO)
+        fun setDeviceDo(data : DeviceWatchInfoVO)
         //显示tcp通讯地址
         fun setTcpServerHost(tcpSeverDTO: TcpSeverDTO)
         //设置设备设置数据

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/home/HomeActivityPresenter.kt

@@ -18,6 +18,7 @@ import com.wdkl.ncs.android.middleware.logic.contract.home.HomeActivityContract
 import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
 import com.wdkl.ncs.android.middleware.model.vo.DeviceVO
+import com.wdkl.ncs.android.middleware.model.vo.DeviceWatchInfoVO
 import io.reactivex.disposables.Disposable
 import javax.inject.Inject
 
@@ -47,10 +48,10 @@ class HomeActivityPresenter @Inject constructor(): RxPresenter<HomeActivityContr
         override fun onNextWithConnection(result: Any, connectionQuality: ConnectionQuality) {
             providerView().complete()
             when (result) {
-                is DeviceVO -> {
+                is DeviceWatchInfoVO -> {
                     //设备信息
                     providerView().complete()
-                    providerView().setDeviceDo(result as DeviceVO)
+                    providerView().setDeviceDo(result)
                 }
 
                 is TcpSeverDTO -> {
@@ -61,7 +62,7 @@ class HomeActivityPresenter @Inject constructor(): RxPresenter<HomeActivityContr
                 is PartSettingDO -> {
                     //设备设置数据
                     providerView().complete("")
-                    providerView().setDeviceSettingData(result as PartSettingDO)
+                    providerView().setDeviceSettingData(result)
                 }
 
             }
@@ -88,10 +89,8 @@ class HomeActivityPresenter @Inject constructor(): RxPresenter<HomeActivityContr
     override fun getDeviceVO(ethMac:String) {
 
         registerDeviceApi.getDeviceMessage(ethMac).map {
-            var deviceVO = DeviceVO()
-
             var gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
-            deviceVO = gson.fromJson(it.getJsonString(), DeviceVO::class.java)
+            var deviceVO = gson.fromJson(it.getJsonString(), DeviceWatchInfoVO::class.java)
             return@map deviceVO
         }
                 .compose(ThreadFromUtils.defaultSchedulers())

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

@@ -0,0 +1,89 @@
+package com.wdkl.ncs.android.middleware.model.vo;
+
+import com.wdkl.ncs.android.middleware.model.annotation.Column;
+import com.wdkl.ncs.android.middleware.model.dos.DeviceDO;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author
+ * @title: Vothin
+ * @projectName nc
+ * @description: TODO
+ * @date 2021/6/1810:54
+ */
+public class DeviceWatchInfoVO extends DeviceDO {
+
+    @Column(name = "hospital_id")
+    @ApiModelProperty(value = "医院id", required = false)
+    private Integer hospitalId;
+
+    @Column(name = "hospital_name")
+    @ApiModelProperty(value = "医院名称", required = false)
+    private String hospitalName;
+
+    @Column(name = "part_name")
+    @ApiModelProperty(value = "科室名称", required = false)
+    private String partName;
+
+    @Column(name = "full_name")
+    @ApiModelProperty(value = "病房病床名称", required = false)
+    private String fullName;
+
+    @Column(name = "member_name")
+    @ApiModelProperty(value = "用户名称", required = false)
+    private String memberName;
+
+    @Column(name = "role_name")
+    @ApiModelProperty(value = "角色名称", required = false)
+    private String roleName;
+
+
+    public Integer getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Integer hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public String getHospitalName() {
+        return hospitalName;
+    }
+
+    public void setHospitalName(String hospitalName) {
+        this.hospitalName = hospitalName;
+    }
+
+    public String getPartName() {
+        return partName;
+    }
+
+    public void setPartName(String partName) {
+        this.partName = partName;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+}