1。补充上传

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

@@ -2185,7 +2185,6 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNewN
                     if (tcpModel.action == TcpAction.REMOTEVISITAction.CALL) {
                         //通知分机进入探视
                         val json = JSON.parseObject(tcpModel.data.toString())
-//                        val bedId = json.getString("bed")
                         val visitid = json.getString("id")
                         val toId = json.getString("callBedId")
                         val callTcp = SwVisitUtil.visitCall(Constant.DEVICE_ID,toId.toInt() ,visitid)
@@ -2205,13 +2204,10 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNewN
                         }
                     }else if (tcpModel.action == TcpAction.REMOTEVISITAction.CANCEL) {
                         //收到 小程序取消 通知页面 比对id，取消探视（或者刷新页面）直接转给分机
-//                        val json = JSON.parseObject(tcpModel.data.toString())
                         val visitid = tcpModel.data.toString()
                         val callTcp = SwVisitUtil.visitCancel(Constant.DEVICE_ID,visitid)
                         TcpClient.getInstance().sendMsg(callTcp.toJson())
                         removeValueFromViditingList(visitid.toString())
-                        //寻找 需要补充一个如果挂断提示，如果正在查看的情况下
-//                        showMessage("通话已取消.....")
                         if (skyCallFragment is VisitCallFragment){
                             EventBus.getDefault().post(MessageEvent("BackCall", Constant.EVENT_REMOVE_CALL_FRAGMENT))
                         }else{
@@ -2233,8 +2229,6 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNewN
                             TcpClient.getInstance().sendMsg(callTcp.toJson())
                             removeValueFromViditingList(visitid.toString())
                         }
-                        //寻找 需要补充一个如果挂断提示，如果正在查看的情况下
-//                        showMessage("通话已挂断.....")
                         if (skyCallFragment is VisitCallFragment){
                             EventBus.getDefault().post(MessageEvent("BackCall", Constant.EVENT_REMOVE_CALL_FRAGMENT))
                         }else{
@@ -2249,8 +2243,6 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNewN
                         val visitid = tcpModel.data.toString()
                         val callTcp = SwVisitUtil.visitIngCall(visitid)
                         VisitTcpClient.getInstance().sendMsg(callTcp.toJson())
-                        //寻找 需要补充一个如果挂断提示，如果正在查看的情况下
-//                        showMessage("通话异常.....")
                         removeValueFromViditingList(visitid.toString())
                         if (skyCallFragment is VisitCallFragment){
                             EventBus.getDefault().post(MessageEvent("BackCall", Constant.EVENT_REMOVE_CALL_FRAGMENT))

android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/visit/tcp/VisitTcpClientHandler.java

@@ -64,8 +64,8 @@ public class VisitTcpClientHandler extends SimpleChannelInboundHandler<String> {
         Constant.Visit_TCP_CONNECTED = true;
 //        EventBus.getDefault().post(new MessageEvent(1, Constant.EVENT_TCP_STATE));
         //寻找
-//        TcpModel tcpModel = DeviceUtil.deviceConnect4(Constant.union_id,Constant.DEVICE_REGISTER_ID);
-        TcpModel tcpModel = DeviceUtil.deviceConnect4("610a4ebae21b840007887b95",Constant.DEVICE_REGISTER_ID);
+        TcpModel tcpModel = DeviceUtil.deviceConnect4(Constant.union_id,Constant.DEVICE_REGISTER_ID);
+//        TcpModel tcpModel = DeviceUtil.deviceConnect4("610a4ebae21b840007887b95",Constant.DEVICE_REGISTER_ID);
         VisitTcpClient.getInstance().sendMsg(tcpModel.toJson());
     }
 

build.gradle

@@ -47,8 +47,8 @@ buildscript {
     /**
      * 配置要打包的模块
      */
-    ext.callingdoor = false
-    ext.android_bed = true
+    ext.callingdoor = true
+    ext.android_bed = false
     ext.android_host = false
     ext.android_mobile = false
     ext.android_visiting = false
@@ -61,14 +61,15 @@ buildscript {
 
     //433
     ext.open_433 = false
+
     //设备类型  0 医院 1 月子中心 2 养老院 3 公寓
     ext.device_type = "0"
 
     //设备类型  0 4g 1 串口 2 蓝牙 3 wifi
-    ext.sleep_type = "3"
+    ext.sleep_type = "0"
 
     //声网探视
-    ext.is_agore = false
+    ext.is_agora = false
 
 
 

settings.gradle

@@ -1,3 +1,4 @@
 include ':app', ':common', ':welcome',  ':resource', ':middleware',
         ':callingdoor',  ':android_bed', ':android_host',
         ':bedlib', ':janus', ':listenvision', ':gstream', 'keepalive', ':android_mobile', ':android_visiting'
+//, ':modules_agora'