|
@@ -519,7 +519,7 @@ class CallingbedActivity : BaseActivity<CallingbedActivityPresenter, Callingbed2
|
|
|
TcpClient.getInstance().sendMsg(tcpModel.toJson())
|
|
|
showMessage("紧急呼叫已发出!")
|
|
|
SpeechUtil.getInstance().stopSpeak()
|
|
|
- SpeechUtil.getInstance().newSpeech("紧急呼叫已发出", true)
|
|
|
+ SpeechUtil.getInstance().speakSingleText("紧急呼叫已发出")
|
|
|
AppTool.Time.delay(3000, {
|
|
|
tv_btn_sos.isEnabled = true
|
|
|
})
|
|
@@ -1067,7 +1067,7 @@ class CallingbedActivity : BaseActivity<CallingbedActivityPresenter, Callingbed2
|
|
|
var speakStr = (interactionVO.actionEndMemberName
|
|
|
?: "") + "已响应" + interactionVO.data + "//请稍候"
|
|
|
SpeechUtil.getInstance().stopSpeak()
|
|
|
- SpeechUtil.getInstance().newSpeech(speakStr, false)
|
|
|
+ SpeechUtil.getInstance().speakSingleText(speakStr)
|
|
|
responsed.add(interactionVO.id)
|
|
|
}
|
|
|
Log.i(TAG,"id="+interactionVO.id+",windowid="+eventHandleWindow!!.interactionVO!!.id)
|
|
@@ -1084,14 +1084,14 @@ class CallingbedActivity : BaseActivity<CallingbedActivityPresenter, Callingbed2
|
|
|
if (!responsed.contains(interactionVO.id)) { //没播报过的才播报
|
|
|
var speakStr = (interactionVO.actionEndMemberName ?: "") + "已响应紧急呼叫//正在赶来"
|
|
|
SpeechUtil.getInstance().stopSpeak()
|
|
|
- SpeechUtil.getInstance().newSpeech(speakStr, true)
|
|
|
+ SpeechUtil.getInstance().speakSingleText(speakStr)
|
|
|
responsed.add(interactionVO.id)
|
|
|
SOSHelper.sosStop()
|
|
|
}
|
|
|
} else if (tcpModel.action == TcpAction.SOSAction.CALL) { //遥控器按键按下
|
|
|
|
|
|
SpeechUtil.getInstance().stopSpeak()
|
|
|
- SpeechUtil.getInstance().newSpeech("紧急呼叫已发出", true)
|
|
|
+ SpeechUtil.getInstance().speakSingleText("紧急呼叫已发出")
|
|
|
}
|
|
|
|
|
|
} else if (tcpModel.action == TcpAction.DataAction.REFRESH) {
|
|
@@ -1110,7 +1110,7 @@ class CallingbedActivity : BaseActivity<CallingbedActivityPresenter, Callingbed2
|
|
|
|
|
|
var speakStr = "已发送" + interactionVO.data + "事件//请耐心等待"
|
|
|
SpeechUtil.getInstance().stopSpeak()
|
|
|
- SpeechUtil.getInstance().newSpeech(speakStr, false)
|
|
|
+ SpeechUtil.getInstance().speakSingleText(speakStr)
|
|
|
|
|
|
} else if (tcpModel.action == TcpAction.IMAction.MSG) {
|
|
|
// if(Constant.SCREENSTATE.equals(Display.STATE_OFF)) {
|