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