0){ - var g = { - type: 'tousses_recycle', - typeInfo: JSON.stringify({ - tousses: tousses - }) + var g = { + type: 'tousses_recycle', + typeInfo: JSON.stringify({ + tousses: tousses + }) + } + updateGrammer(g); + startRecognize(); + } } - updateGrammer(g); - startRecognize(); - } + }); + DWREngine.setAsync(true); } function getRowByName(name){ @@ -4053,14 +4090,23 @@ }); return row; } +var processSpeechResult_recycle_addTousse = null; function processSpeechResult_recycle(r){ if(r.grammerName == 'tousses_recycle'){ - var row = getRowByName(r.Text); - if(row == -1){ - return; + if(!checkSelectDepartBeforeAddTousse()){ + return false; } - putTousseInTheBasket(row); - refreshSplitBasketView(); - refreshAllBasketTotalNum(); + if(processSpeechResult_recycle_addTousse){ + processSpeechResult_recycle_addTousse(r.Text); + }else{ + openSelectTousse(r.Text); + } +// var row = getRowByName(r.Text); +// if(row == -1){ +// return; +// } +// putTousseInTheBasket(row); +// refreshSplitBasketView(); +// refreshAllBasketTotalNum(); } } \ No newline at end of file Index: ssts-web/src/main/webapp/speech/speechRecognition.js =================================================================== diff -u -r23692 -r23738 --- ssts-web/src/main/webapp/speech/speechRecognition.js (.../speechRecognition.js) (revision 23692) +++ ssts-web/src/main/webapp/speech/speechRecognition.js (.../speechRecognition.js) (revision 23738) @@ -2,7 +2,8 @@ inited: false, errorCode: 0, errorMsg: '', - perPageCallback:[] + perPageCallback:[], + nameToCallbackMap:[] } function processSpeechResult(r){ @@ -45,6 +46,48 @@ } } +//// +function registerNamedCallback(name,f){ + var nameToCallbackMap = speechRecognition.nameToCallbackMap; + for(var i=0;i