Index: ssts-web/src/main/webapp/js/speaker.js =================================================================== diff -u -r15625 -r15640 --- ssts-web/src/main/webapp/js/speaker.js (.../speaker.js) (revision 15625) +++ ssts-web/src/main/webapp/js/speaker.js (.../speaker.js) (revision 15640) @@ -156,6 +156,24 @@ return ret; } /** + * 返回描述性字符串,如果只有一种物品,返回物品名称,如果有多种物品,返回种类数量和所有物品的总数量 + * 如果只有一种物品,并且物品数量为0,只返回物品名称 + * 如果没有物品,返回null + */ + this.toSimpleString = function(){ + var ret = null; + var ttamt = this.totalAmount(); + + if(this.count() == 1){ + ret = this.at(0).tousseName; + }else if(this.count() > 1){ + ret = '有' + this.count() + '种物品'; + ret = ret + ',共' + ttamt + '个'; + } + return ret; + } + + /** * 获取所有物品的总数量 */ this.totalAmount = function(){ @@ -244,33 +262,18 @@ this.speakContent = function(){ var content = this.getSpeakContent(); speaker.speak(content); - /*var goods = new Array(); - for(var i = 0; i < this.baskets.length;++i){ - var basket = this.baskets[i]; - for(int i = 0; i < goods.length;++i){ - - } - content += ",有"; - content += basket.goods.length; - content += "种物品,共"; - var total = 0; - for(var j = 0; j < basket.goods.length; ++j){ - total += basket.goods[j].amout; - } - content += total; - content += "个"; - - }*/ } /** * 获取所有物品的汇总信息,由类内部调用 */ this._getAllGoodsSummary = function(){ + var tousseArray = new TousseArray(); for(var i = 0; i < this.baskets.length;++i){ tousseArray.addTousseArray(this.baskets[i].goods); } - return tousseArray.toString(); + return '精简提示' == messagePromptType ? tousseArray.toSimpleString() : tousseArray.toString(); //(cjr) + } }