feat:合并master
This commit is contained in:
		
							parent
							
								
									8bfa67b9e3
								
							
						
					
					
						commit
						45cf28fac8
					
				| @ -18,16 +18,22 @@ import { judgeConfig } from './utils/judge-config' | ||||
| 
 | ||||
| import {writeObjectOut,uploadExamProgressData} from '../../api/judge' | ||||
| import {deepClone,getCurrentTime,stringToASC,string2Bytes,fillZero,Array2Byte,convertGpsCoord2} from '../../common/utils/tools' | ||||
| import {getTranslateSignals,getCarStatus,getCarStatusType,getCenterProjectStatus,plcStrToJson,plcStrToWXJson,promptWxCode,getKmProjectVoice,senorToWXDataStr}  from './utils//judge-common' | ||||
| import {examJudgeSetLogCallback,examJudgeBeginExam,examJudgeInit,examJudgeRealExam,examJudgeSetRealExamCallback,examJudgeSetPerformCallback,examJudgeEndExam,examJudgeArtificialMark,examJudgeArtificialItem | ||||
| ,examJudgeMapSetScaling,examJudgeMapSetParam} from './api/index' | ||||
| import {getTranslateSignals,getCarStatus,getCarStatusType,getCenterProjectStatus,plcStrToJson,plcStrToWXJson,promptWxCode,getKmProjectVoice,senorToWXDataStr}  from './utils/judge-common' | ||||
| import { | ||||
|   examJudgeSetLogCallback, | ||||
|   examJudgeBeginExam, | ||||
|   examJudgeInit, | ||||
|   examJudgeRealExam, | ||||
|   examJudgeSetRealExamCallback, | ||||
|   examJudgeSetPerformCallback, | ||||
|   examJudgeEndExam, | ||||
|   examJudgeArtificialMark, | ||||
|   examJudgeArtificialItem, | ||||
|   examJudgeMapSetScaling, | ||||
|   examJudgeMapSetParam | ||||
| } from './api/index' | ||||
| import UsbService from '../../common/service/usbService' | ||||
| 
 | ||||
| import {getTranslateSignals,getCarStatus,getCarStatusType,getCenterProjectStatus,plcStrToJson,plcStrToWXJson,promptWxCode,getKmProjectVoice}  from './utils//judge-common' | ||||
| import {examJudgeSetLogCallback,examJudgeBeginExam,examJudgeInit,examJudgeRealExam,examJudgeSetRealExamCallback,examJudgeSetPerformCallback,examJudgeEndExam,examJudgeArtificialMark,examJudgeArtificialItem} from './api/index' | ||||
| 
 | ||||
| import prompt from '@ohos.prompt'; | ||||
| import usbManager from '@ohos.usbManager'; | ||||
| 
 | ||||
| const judgeTag = 'SURENJUN_JUDGE' | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user