Merge branch 'dev' of http://88.22.24.105:3000/harmony_car/subject-two into dev
This commit is contained in:
		
						commit
						5119c46963
					
				| @ -312,6 +312,7 @@ export default class UdpClientByCenter { | |||||||
|     if (terType == 2) { |     if (terType == 2) { | ||||||
|       //三型机
 |       //三型机
 | ||||||
|       this.onMessage_1Callback = callback; |       this.onMessage_1Callback = callback; | ||||||
|  |       this.udp && this.udp.off('message', this.message_1Fn); | ||||||
|       this.udp && this.udp.on('message', this.message_1Fn); |       this.udp && this.udp.on('message', this.message_1Fn); | ||||||
|     } else { |     } else { | ||||||
|       this.retClass.receiveMsg(callback) |       this.retClass.receiveMsg(callback) | ||||||
|  | |||||||
| @ -1215,10 +1215,13 @@ export default class Judge { | |||||||
|     } else { |     } else { | ||||||
|       //收到综合评判语音时,显示综合评判弹窗
 |       //收到综合评判语音时,显示综合评判弹窗
 | ||||||
|       if(code[0] == 'zhpp'){ |       if(code[0] == 'zhpp'){ | ||||||
|  |         const param512 = (this.judgeUI.judgeConfigObj['512'] || '').split(','); | ||||||
|         this.judgeUI.isDeductedPopShow = false |         this.judgeUI.isDeductedPopShow = false | ||||||
|         clearTimeout(this.deductedPopShowTimer) |         clearTimeout(this.deductedPopShowTimer) | ||||||
|         this.judgeUI.isDeductedPopShow = true |         if(param512[7] != 0){ | ||||||
|         this.judgeUI.defaultTabIndex = 1 |           this.judgeUI.isDeductedPopShow = true | ||||||
|  |           this.judgeUI.defaultTabIndex = 1 | ||||||
|  |         } | ||||||
|         this.isEndTip = true |         this.isEndTip = true | ||||||
|       } |       } | ||||||
|       avPlayer.playAudio([`voice/${code[0]}.mp3`]) |       avPlayer.playAudio([`voice/${code[0]}.mp3`]) | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user