Index: ssts-web/src/main/webapp/homepage/sterilizerUnloadMessage.js =================================================================== diff -u -r29098 -r29102 --- ssts-web/src/main/webapp/homepage/sterilizerUnloadMessage.js (.../sterilizerUnloadMessage.js) (revision 29098) +++ ssts-web/src/main/webapp/homepage/sterilizerUnloadMessage.js (.../sterilizerUnloadMessage.js) (revision 29102) @@ -29,27 +29,18 @@ var xh; var time = 300; var timeout; -var synth = ''; -var synthMsg = ''; var ids = []; var resultHtml = ''; var timeArr = []; //语音提示 function handleSpeak(text) { - synthMsg.text = text; - synthMsg.lang = "zh-CN"; // 使用的语言:中文 - synthMsg.volume = 1; // 音量:1 - synthMsg.rate = 2; // 语速:1 - synthMsg.pitch = 1; // 音高:1 - synth.speak(synthMsg); // 播放 + speakMessage(text) } //关闭语音提示 function handleStop(e) { - synthMsg.text = e; - synthMsg.lang = "zh-CN"; - synth.cancel(synthMsg); + closeSpeakMessage() } //第一步:调用灭菌卸载提示的接口 @@ -67,12 +58,7 @@ if(msgBox){ msgBox.close(); } - if(synthMsg){ - handleStop(''); - } - clearTimeout(timeout); - time = 0; - var result = JSON.parse(xh.response); + var result = eval('('+xh.response+')'); var html = ''; resultHtml = ''; var j = 0; @@ -121,8 +107,6 @@ onShow: function(){ this.box.style.right = 0; this.box.style.bottom = 0; - synth = window.speechSynthesis; - synthMsg = new SpeechSynthesisUtterance(); loopMsg(resultHtml) } }); Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r29002 -r29102 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 29002) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 29102) @@ -2049,6 +2049,10 @@ speaker.speak(message); } +function closeSpeakMessage() { + speaker.cancel(); +} + // 在当前页信息 function showResultWithoutSpeakCurPage(message, title, pauseTime) { var tipMsg = '' + message + ''; Index: ssts-web/src/main/webapp/js/speaker.js =================================================================== diff -u -r28861 -r29102 --- ssts-web/src/main/webapp/js/speaker.js (.../speaker.js) (revision 28861) +++ ssts-web/src/main/webapp/js/speaker.js (.../speaker.js) (revision 29102) @@ -40,6 +40,9 @@ } } +var synth; +var googleSpeack; + /** * tts语音引擎 */ @@ -65,8 +68,8 @@ this.sapi.Speak(msg,1); } }else { - var synth = window.speechSynthesis; - var googleSpeack = new SpeechSynthesisUtterance(); + synth = window.speechSynthesis; + googleSpeack = new SpeechSynthesisUtterance(); //汉语 googleSpeack.lang = 'zh-CN'; googleSpeack.rate = 1; @@ -83,6 +86,19 @@ this.enabled = enable; this.init(); } + + //关闭语音提示 + this.cancel = function(){ + if(IEVersion()){ + if(this.sapi){ + this.sapi.Speak('',2); + } + }else { + googleSpeack.text = ''; + googleSpeack.lang = "zh-CN"; + synth.cancel(googleSpeack); + } + } } /** * 全局tts语音引擎对象