|
@@ -1200,7 +1200,19 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurse
|
|
}
|
|
}
|
|
if (SettingConfig.getTtsMode(activity) == SettingConfig.TTS_ON) {
|
|
if (SettingConfig.getTtsMode(activity) == SettingConfig.TTS_ON) {
|
|
//val frameName = item.interactionVO.fromFrameFullName.replace("-", "")
|
|
//val frameName = item.interactionVO.fromFrameFullName.replace("-", "")
|
|
- val frameName = Util.appendSpace(item.interactionVO.fromFrameFullName.replace("-", ","))
|
|
|
|
|
|
+ var frameName = ""
|
|
|
|
+ if (DeviceTypeEnum.DOCTOR_HOST.value() == item.interactionVO.fromDeviceType
|
|
|
|
+ || DeviceTypeEnum.NURSE_HOST.value() == item.interactionVO.fromDeviceType
|
|
|
|
+ || DeviceTypeEnum.OTHER_HOST.value() == item.interactionVO.fromDeviceType) {
|
|
|
|
+ //医生机,护士主机,其他主机,总控主机等
|
|
|
|
+ frameName = item.interactionVO.fromDeviceName
|
|
|
|
+ } else if (DeviceTypeEnum.NURSE_WATCH.value() == item.interactionVO.fromDeviceType) {
|
|
|
|
+ //移动设备
|
|
|
|
+ frameName = item.interactionVO.fromMemberName
|
|
|
|
+ } else {
|
|
|
|
+ //其他
|
|
|
|
+ frameName = Util.appendSpace(item.interactionVO.fromFrameFullName.replace("-", ","))
|
|
|
|
+ }
|
|
SpeechUtil.getInstance().removeSpeak(frameName + "呼叫")
|
|
SpeechUtil.getInstance().removeSpeak(frameName + "呼叫")
|
|
} else {
|
|
} else {
|
|
//如果呼叫列表只有一个呼叫了,说明删除这个之后就清空了,此时关闭铃声或音乐
|
|
//如果呼叫列表只有一个呼叫了,说明删除这个之后就清空了,此时关闭铃声或音乐
|
|
@@ -1481,7 +1493,18 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurse
|
|
bundle.putInt("call_state", 0)
|
|
bundle.putInt("call_state", 0)
|
|
bundle.putBoolean("visiting", false)
|
|
bundle.putBoolean("visiting", false)
|
|
//bundle.putString("targetId", targetId)
|
|
//bundle.putString("targetId", targetId)
|
|
- bundle.putString("call_name", interactionVO.toFrameFullName)
|
|
|
|
|
|
+ if (DeviceTypeEnum.DOCTOR_HOST.value() == interactionVO.toDeviceType
|
|
|
|
+ || DeviceTypeEnum.NURSE_HOST.value() == interactionVO.toDeviceType
|
|
|
|
+ || DeviceTypeEnum.OTHER_HOST.value() == interactionVO.toDeviceType) {
|
|
|
|
+ //医生机,护士主机,其他主机,总控主机等
|
|
|
|
+ bundle.putString("call_name", interactionVO.toDeviceName)
|
|
|
|
+ } else if (DeviceTypeEnum.NURSE_WATCH.value() == interactionVO.toDeviceType) {
|
|
|
|
+ //移动设备
|
|
|
|
+ bundle.putString("call_name", interactionVO.toMemberName)
|
|
|
|
+ } else {
|
|
|
|
+ //其他设备
|
|
|
|
+ bundle.putString("call_name", interactionVO.toFrameFullName)
|
|
|
|
+ }
|
|
fragment.arguments = bundle
|
|
fragment.arguments = bundle
|
|
addCallFragment(fragment)
|
|
addCallFragment(fragment)
|
|
} else {
|
|
} else {
|
|
@@ -1735,7 +1758,21 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurse
|
|
//Constants.CALL_STATE = Constants.CALL_CALLING
|
|
//Constants.CALL_STATE = Constants.CALL_CALLING
|
|
//DeviceChannel.calling = true
|
|
//DeviceChannel.calling = true
|
|
|
|
|
|
- acceptCall(item.fromFrameFullName)
|
|
|
|
|
|
+ var name = ""
|
|
|
|
+ if (DeviceTypeEnum.DOCTOR_HOST.value() == item.fromDeviceType
|
|
|
|
+ || DeviceTypeEnum.NURSE_HOST.value() == item.fromDeviceType
|
|
|
|
+ || DeviceTypeEnum.OTHER_HOST.value() == item.fromDeviceType) {
|
|
|
|
+ //医生机,护士主机,其他主机,总控主机等
|
|
|
|
+ name = item.fromDeviceName
|
|
|
|
+ } else if (DeviceTypeEnum.NURSE_WATCH.value() == item.fromDeviceType) {
|
|
|
|
+ //移动设备
|
|
|
|
+ name = item.fromMemberName
|
|
|
|
+ } else {
|
|
|
|
+ //其他
|
|
|
|
+ name = item.fromFrameFullName
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ acceptCall(name)
|
|
VoiceUtil.acceptAudioCall(Constants.ids, Constants.fromId, Constants.interactionId)
|
|
VoiceUtil.acceptAudioCall(Constants.ids, Constants.fromId, Constants.interactionId)
|
|
} else {
|
|
} else {
|
|
showMessage("通话服务还未建立连接,暂时无法通话")
|
|
showMessage("通话服务还未建立连接,暂时无法通话")
|