harmony_car/subject-two
harmony_car/subject-two
4
0
Fork 3
Code Issues Pull Requests Packages Projects 1 Releases 45 Wiki Activity

Merge pull request '日志&&問題修改' (#50) from lv_chengmai into main

Browse Source 
Reviewed-on: #50
This commit is contained in:
wangzhongjie 2024-08-08 19:29:06 +08:00
commit 60d8f3dec4
14 changed files with 75 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
entry/src/main/ets/common/service/indexService.ts
View File

@ -225,25 +225,30 @@ export async function takePhotoFn(context) {
// param[key] = false // param[key] = false
} }
for (let i = 0; i <= arr.length - 1; i++) { for (let i = 0; i <= arr.length - 1; i++) {
let key = arr[i] let key1 = arr[i]
if (param[key]) { if (param[key1]) {
param.pztd = param[`td${Number(i) + 1}`] param.pztd = param[`td${Number(i) + 1}`]
takePhoto(param, context, 'jt/', 0, (data) => { takePhoto(param, context, 'jt/', 0, (data) => {
consoele.log('getPhtogetPhto',data)
if (Number(data.fileSize) <= (Number(param.zdyz) * 1000)) { if (Number(data.fileSize) <= (Number(param.zdyz) * 1000)) {
map[key] = true console.log('getPhtot0000')
map[key1] = true
promptAction.showToast({ promptAction.showToast({
message: `视频遮挡`, message: `视频遮挡`,
duration: 3000 duration: 3000
}); });
globalThis.spzd[key] = true globalThis.spzd[key1] = true
} else { } else {
map[key] = false map[key1] = false
globalThis.spzd[key] = false globalThis.spzd[key1] = false
} }
console.log('getPhtot0000')
setTimeout(() => { setTimeout(() => {
takePhotoFn() takePhotoFn()
}, 3000) }, 3000)
}) })
} }
} }
globalThis.takePhotoNum++ globalThis.takePhotoNum++

4
entry/src/main/ets/common/service/terminalService.ts
View File

@ -9,11 +9,11 @@ import FileUtil from '../../common/utils/File'
//获取设备信息 //获取设备信息
export async function getDeviceInfo(context) { export async function getDeviceInfo(context) {
// globalThis.deviceNo = '153216400880'; //科目三设备 // globalThis.deviceNo = '153216400880'; //科目三设备
globalThis.deviceNo = '150667400235'; //科目三设备 // globalThis.deviceNo = '150667400235'; //科目三设备
// globalThis.deviceNo = '1649018001275'; //洛阳科目三设备
// globalThis.deviceNo = 'MAC-36E6575F'; //杭州科目二设备 489 // globalThis.deviceNo = 'MAC-36E6575F'; //杭州科目二设备 489
// globalThis.deviceNo = 'MAC-C57C8966'; //杭州科目二设备 // globalThis.deviceNo = 'MAC-C57C8966'; //杭州科目二设备
return
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
const fileUtil = new FileUtil(context) const fileUtil = new FileUtil(context)
const data = await fileUtil.readFile(GlobalConfig.comoonfileWriteAddress + '/config/deviceNo.txt'); const data = await fileUtil.readFile(GlobalConfig.comoonfileWriteAddress + '/config/deviceNo.txt');

7
entry/src/main/ets/common/service/videoService.ts
View File

@ -80,6 +80,7 @@ interface takePhotoParam {
name?:string, name?:string,
base64?:string, base64?:string,
fileSize?:number, fileSize?:number,
errorCode?:number
} }
/** /**
* *
@ -106,15 +107,15 @@ export async function takePhoto(param, context,dir,flag=1,callback?) {
if(flag==0){ if(flag==0){
rtsp_server.detectVideoSnapshotSize(video_uri,fileName,(err,snapResult)=>{ rtsp_server.detectVideoSnapshotSize(video_uri,fileName,(err,snapResult)=>{
console.log("baohaowen_detectLoop round end size1:"+snapResult.fileSize); console.log("baohaowen_detectLoop round end size1:"+snapResult.fileSize);
callback({fileSize:snapResult.fileSize }) callback({fileSize:snapResult.fileSize,errorCode:snapResult.errorCode })
}); });
} }
else{ else{
return new Promise<takePhotoParam>((resolve,reject)=>{ return new Promise<takePhotoParam>((resolve,reject)=>{
rtsp_server.getVideoSnapshot(context, video_uri, fileName,dir,true,(err,snapResult)=>{ rtsp_server.getVideoSnapshot(context, video_uri, fileName,dir,true,(err,snapResult)=>{
console.log('getPhtot') console.log('getPhtot',JSON.stringify(snapResult))
resolve({base64: snapResult.dataString,name:snapResult.fileName,fileSize:snapResult.fileSize }) resolve({base64: snapResult.dataString,name:snapResult.fileName,fileSize:snapResult.fileSize,errorCode:snapResult.errorCode })
}); });
}) })
console.log('getmyLog02') console.log('getmyLog02')

2
entry/src/main/ets/common/utils/GlobalUdp.ts
View File

@ -43,6 +43,7 @@ export async function getUDP(errorFlag?) {
globalThis.udpClient = udpClient globalThis.udpClient = udpClient
globalThis.udpClient.onMessage_1(()=>{ globalThis.udpClient.onMessage_1(()=>{
console.log('getUDPonMessage_1msgmsgByGloalUdp')
}) })
globalThis.udpClient.onError_Callback(()=>{ globalThis.udpClient.onError_Callback(()=>{
@ -171,6 +172,7 @@ export async function setJudgeUdp() {
await udpClientbyCenter.bindUdp() await udpClientbyCenter.bindUdp()
await udpClientbyCenter.onMessage_1((val) => { await udpClientbyCenter.onMessage_1((val) => {
console.log('valval', val) console.log('valval', val)
}) })
// globalThis.judgeUdpClient = udpClientbyCenter; // globalThis.judgeUdpClient = udpClientbyCenter;
return { return {

34
entry/src/main/ets/common/utils/UdpClientByCenter.ts
View File

@ -73,11 +73,11 @@ export default class UdpClientByCenter {
promise.then(() => { promise.then(() => {
// globalThis.closeHeartSocket=false // globalThis.closeHeartSocket=false
this.isWorking = true this.isWorking = true
console.log(`${TAG} udp bind success`); console.log(`${TAG} getUDPudp rebind success`);
}).catch(err => { }).catch(err => {
//globalThis.closeHeartSocket=true //globalThis.closeHeartSocket=true
this.isWorking = false this.isWorking = false
console.log(`${TAG} udp bind failed:${JSON.stringify(err)}`); console.log(`${TAG} getUDPudp rebind failed:${JSON.stringify(err)}`);
}); });
} }
@ -87,10 +87,10 @@ export default class UdpClientByCenter {
}); });
promise.then(() => { promise.then(() => {
this.isWorking = true this.isWorking = true
console.log(`${TAG} udp bind success`); console.log(`${TAG} getUDPudp bind success`);
}).catch(err => { }).catch(err => {
this.isWorking = false this.isWorking = false
console.log(`${TAG} udp bind failed:${JSON.stringify(err)}`); console.log(`${TAG} getUDPudp bind failed:${JSON.stringify(err)}`);
}); });
} }
@ -147,9 +147,9 @@ export default class UdpClientByCenter {
} }
sendHeadMsg(msgData) { sendHeadMsg(msgData) {
console.log('sendHeadMsg enter') console.log('getUDPsendHeadMsg enter')
this.sendMsg(msgData, null) this.sendMsg(msgData, null)
console.log('sendHeadMsg exit') console.log('getUDPsendHeadMsg exit')
} }
sendMsg(msg, sendCallback?) { sendMsg(msg, sendCallback?) {
@ -172,12 +172,12 @@ export default class UdpClientByCenter {
if (sendCallback) { if (sendCallback) {
sendCallback() sendCallback()
} }
console.log(`${TAG}udpCLient udp send success:oppositeIp${this.oppositeIp},oppositeIpPort:${this.oppositeIpPort},localIp:${this.localIp},localIpPort,${this.localIpPort}`); console.log(`${TAG}getUDPudpCLient udp send success:oppositeIp${this.oppositeIp},oppositeIpPort:${this.oppositeIpPort},localIp:${this.localIp},localIpPort,${this.localIpPort}`);
}).catch(err => { }).catch(err => {
console.log(`${TAG}udpCLient udp send fail:oppositeIp${this.oppositeIp},oppositeIpPort:${this.oppositeIpPort},localIp:${this.localIp},localIpPort,${this.localIpPort}`); console.log(`${TAG}getUDPudpCLient udp send fail:oppositeIp${this.oppositeIp},oppositeIpPort:${this.oppositeIpPort},localIp:${this.localIp},localIpPort,${this.localIpPort}`);
}); });
} }
console.log('getState success:' + JSON.stringify(data)); console.log('getUDPgetState success:' + JSON.stringify(data));
}) })
} }
@ -194,7 +194,7 @@ export default class UdpClientByCenter {
onError_Callback(callback?) { onError_Callback(callback?) {
this.udp.on('error', async err => { this.udp.on('error', async err => {
this.isWorking = false; this.isWorking = false;
console.log('UdpClientByCenter onError err:' + JSON.stringify(err)); console.log('getUDPUdpClientByCenter onError err:' + JSON.stringify(err));
callback && callback() callback && callback()
}); });
} }
@ -202,7 +202,7 @@ export default class UdpClientByCenter {
onError_resend(callback?) { onError_resend(callback?) {
this.udp.on('error', async err => { this.udp.on('error', async err => {
this.isWorking = false; this.isWorking = false;
console.log(TAG, 'udpError', JSON.stringify(err)) console.log(TAG, 'getUDPudpError', JSON.stringify(err))
await this.bindUdp() await this.bindUdp()
await this.sendMsg('111', null) await this.sendMsg('111', null)
await this.onMessage_1(callback) await this.onMessage_1(callback)
@ -243,16 +243,16 @@ export default class UdpClientByCenter {
} }
closeUdp(callback?) { closeUdp(callback?) {
console.log('UdpClientByCenter enter closeUdp ip:' + this.localIp + ' port:' + this.localIpPort); console.log('getUDPUdpClientByCenter enter closeUdp ip:' + this.localIp + ' port:' + this.localIpPort);
this.udp.close(err => { this.udp.close(err => {
if (err) { if (err) {
console.log('UdpClientByCenter closeUdp failed ip:' + this.localIp + ' port:' + this.localIpPort + ' err:' + JSON.stringify(err)); console.log('getUDPUdpClientByCenter closeUdp failed ip:' + this.localIp + ' port:' + this.localIpPort + ' err:' + JSON.stringify(err));
} else { } else {
this.isWorking = false this.isWorking = false
if (callback != null) { if (callback != null) {
callback() callback()
} }
console.log('UdpClientByCenter closeUdp succeed ip:' + this.localIp + ' port:' + this.localIpPort); console.log('getUDPUdpClientByCenter closeUdp succeed ip:' + this.localIp + ' port:' + this.localIpPort);
} }
}) })
} }
@ -264,9 +264,9 @@ export default class UdpClientByCenter {
} }
closeMessage_1(){ closeMessage_1(){
console.info('surenjun', '关闭udp message监听事件') console.info('surenjun', 'getUDP关闭udp message监听事件')
this.udp.off('message',this.message_1Fn); this.udp.off('message',this.message_1Fn);
console.info('surenjun', '关闭udp message监听事件 成功') console.info('surenjun', 'getUDP关闭udp message监听事件 成功')
} }
message_1Fn = (value)=>{ message_1Fn = (value)=>{
@ -291,7 +291,7 @@ export default class UdpClientByCenter {
} }
console.log(`${TAG} udp222 on message array buffer:${str}`); console.log(`${TAG} udp222 on message array buffer:${str}`);
strachArr[28] = globalThis.chuankoMsg || '0' strachArr[28] = globalThis.chuankoMsg || strachArr[28]
// this.stashFn(str) // this.stashFn(str)
const newArr = JSON.parse(JSON.stringify(strachArr)) const newArr = JSON.parse(JSON.stringify(strachArr))
// this.stashFn=()=>{} // this.stashFn=()=>{}

4
entry/src/main/ets/entryability/EntryAbility.ts
View File

@ -28,8 +28,8 @@ export default class EntryAbility extends UIAbility {
globalThis.examinerInfo = {} globalThis.examinerInfo = {}
globalThis.deviceNo = ''; globalThis.deviceNo = '';
globalThis.hasAuth = false globalThis.hasAuth = false
globalThis.version = '2024.11.22.14' globalThis.version = '2022.08.13.01'
globalThis.judgeVersion = '2024.11.22.14' globalThis.judgeVersion = '2022.12.05.1'
globalThis.videoVersion= '1.0' globalThis.videoVersion= '1.0'
// globalThis.version = '2023.12.13.01' // globalThis.version = '2023.12.13.01'
// globalThis.judgeVersion = '2023.09.30.1' // globalThis.judgeVersion = '2023.09.30.1'

11
entry/src/main/ets/pages/CarCheck.ets
View File

@ -103,6 +103,9 @@ export default struct Index {
router.pushUrl({ router.pushUrl({
url: 'pages/SignDisplay', url: 'pages/SignDisplay',
}, router.RouterMode.Single); }, router.RouterMode.Single);
this.stachValue = JSON.parse(JSON.stringify(StackValueData))
this.warnFlag = JSON.parse(JSON.stringify(WarnFlagData))
this.passArray = JSON.parse(JSON.stringify(PassData))
// clearInterval(this.interval) // clearInterval(this.interval)
} }
@ -157,6 +160,9 @@ export default struct Index {
this.warnFlag = WarnFlagData this.warnFlag = WarnFlagData
this.passArray = PassData this.passArray = PassData
this.checkListCopy = JSON.parse(JSON.stringify(this.checkList)) this.checkListCopy = JSON.parse(JSON.stringify(this.checkList))
this.stachValue = JSON.parse(JSON.stringify(StackValueData))
this.warnFlag = JSON.parse(JSON.stringify(WarnFlagData))
this.passArray = JSON.parse(JSON.stringify(PassData))
this.index = this.checkListCopy[0].key this.index = this.checkListCopy[0].key
this.vocObj.playAudio({ this.vocObj.playAudio({
type: 1, type: 1,
@ -167,6 +173,8 @@ export default struct Index {
getPLCInfo() { getPLCInfo() {
const that = this const that = this
globalThis.udpClient.onMessage_1 && globalThis.udpClient.onMessage_1((msg) => { globalThis.udpClient.onMessage_1 && globalThis.udpClient.onMessage_1((msg) => {
console.log('getUDPonMessage_1byCarCheck2')
if (!this.breakFlag) { if (!this.breakFlag) {
return return
} }
@ -309,6 +317,9 @@ export default struct Index {
outClick() { outClick() {
this.vocObj && this.vocObj.releasePlayer() this.vocObj && this.vocObj.releasePlayer()
this.breakFlag = false this.breakFlag = false
this.stachValue = JSON.parse(JSON.stringify(StackValueData))
this.warnFlag = JSON.parse(JSON.stringify(WarnFlagData))
this.passArray = JSON.parse(JSON.stringify(PassData))
// clearInterval(this.interval) // clearInterval(this.interval)
} }

4
entry/src/main/ets/pages/Index.ets
View File

@ -11,7 +11,7 @@ import FileUtil from '../common/utils/File';
import { getUDP, getUDP2 } from '../common/utils/GlobalUdp'; import { getUDP, getUDP2 } from '../common/utils/GlobalUdp';
import { initJudgeUdp } from '../common/utils/UdpJudge'; import { initJudgeUdp } from '../common/utils/UdpJudge';
import { getTCP } from '../common/utils/GlobalTcp'; import { getTCP } from '../common/utils/GlobalTcp';
import { getliushuiNum, setliushuiNum } from '../common/service/indexService'; import { getliushuiNum, setliushuiNum,takePhotoFn } from '../common/service/indexService';
import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl'; import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl';
import worker, { MessageEvents } from '@ohos.worker'; import worker, { MessageEvents } from '@ohos.worker';
import promptAction from '@ohos.promptAction' import promptAction from '@ohos.promptAction'
@ -285,7 +285,6 @@ struct Index {
this.heartMsg() this.heartMsg()
} }
}, 1000) }, 1000)
// takePhotoFn(this.context)
// //
getTCP() getTCP()
@ -337,6 +336,7 @@ struct Index {
async initParams() { async initParams() {
this.loading = false this.loading = false
takePhotoFn(this.context)
this.deviceId=await getDeviceInfo(this.context) || '' this.deviceId=await getDeviceInfo(this.context) || ''
await getCarInfo() await getCarInfo()
await setCurrentTime(); await setCurrentTime();

15
entry/src/main/ets/pages/Judge.ets
View File

@ -49,15 +49,22 @@ struct Index {
this.time = await getCurrentTime(); this.time = await getCurrentTime();
this.examTime += 1; this.examTime += 1;
}, 1000); }, 1000);
console.log('SURENJUN_JUDGE',10)
//初始化数据库表 //初始化数据库表
await this.initDb() await this.initDb()
//断点续考 //断点续考
console.log('SURENJUN_JUDGE',11)
await this.goDdxkItems() await this.goDdxkItems()
//初始化评判 //初始化评判
console.log('SURENJUN_JUDGE',6)
const judge = await this.initJudge(); const judge = await this.initJudge();
console.log('SURENJUN_JUDGE',7)
this.judge = judge this.judge = judge
} }
@ -69,7 +76,6 @@ struct Index {
const {isTrajectoryOpen,trajectoryPath} = judgeConfig const {isTrajectoryOpen,trajectoryPath} = judgeConfig
await this.initStudent(); await this.initStudent();
await this.initCar(); await this.initCar();
//是否开启轨迹回放模式 //是否开启轨迹回放模式
if (isTrajectoryOpen) { if (isTrajectoryOpen) {
this.initTrajectoryParam(trajectoryPath) this.initTrajectoryParam(trajectoryPath)
@ -79,12 +85,16 @@ struct Index {
await this.initSysset(); await this.initSysset();
this.singlePlay = globalThis.singlePlay this.singlePlay = globalThis.singlePlay
} }
await this.initCDSBInfo() await this.initCDSBInfo()
// 科目三新增读取表数据 // 科目三新增读取表数据
if (examSubject == 3) { if (examSubject == 3) {
await this.initMapPoint() await this.initMapPoint()
await this.initMapPointItem() await this.initMapPointItem()
//定时上传考试里程 //定时上传考试里程
// let mileageTimer = setInterval(()=>{ // let mileageTimer = setInterval(()=>{
// this.uploadMileage() // this.uploadMileage()
@ -331,7 +341,10 @@ struct Index {
// 评判相关初始化 // 评判相关初始化
async initJudge() { async initJudge() {
console.log('SURENJUN_JUDGE',0)
const judge = new Judge(this); const judge = new Judge(this);
console.log('SURENJUN_JUDGE',30)
await judge.onJudgeFn(async (judgeData) => { await judge.onJudgeFn(async (judgeData) => {
const {xmmcStr,carztStr,kfArr} = judgeData; const {xmmcStr,carztStr,kfArr} = judgeData;
this.xmmcStr = xmmcStr; this.xmmcStr = xmmcStr;

2
entry/src/main/ets/pages/TerminalInfos.ets
View File

@ -19,7 +19,7 @@ struct Index {
// @State inputTextList2: string[] = ['192.168.7.124','20022'] // @State inputTextList2: string[] = ['192.168.7.124','20022']
// @State inputTextList1: string[] = ['172.37.55.191','18782','192.168.7.1','8082','255.255.255.0','192.168.7.170','114.114.114.114','192.168.7.124','20022','172.37.55.59','20122'] // @State inputTextList1: string[] = ['172.37.55.191','18782','192.168.7.1','8082','255.255.255.0','192.168.7.170','114.114.114.114','192.168.7.124','20022','172.37.55.59','20122']
@State inputTextList1: string[] = ['172.37.55.191','18782','172.37.55.191','8082','255.255.255.0','192.168.7.1','114.114.114.114','192.168.7.124','20022','192.168.7.170','20122'] @State inputTextList1: string[] = ['192.168.1.144','18782','192.168.1.144','8082','255.255.255.0','192.168.7.1','114.114.114.114','192.168.7.124','20022','192.168.7.170','20122']
// @State inputTextList2: string[] = [] // @State inputTextList2: string[] = []
// 112.80.35.83 11052 // 112.80.35.83 11052
// @State inputTextList1: string[] = ['192.168.36.2','8084','192.168.36.200','20122','255.255.255.0','192.168.36.1','','','114.114.114.114','192.168.36.139','8000'] // @State inputTextList1: string[] = ['192.168.36.2','8084','192.168.36.200','20122','255.255.255.0','192.168.36.1','','','114.114.114.114','192.168.36.139','8000']

2
entry/src/main/ets/pages/UserInfo.ets
View File

@ -311,7 +311,7 @@ struct UserInfo {
that.ksxtbh = ksxtbhArr?.[0]?.v_value || '222' that.ksxtbh = ksxtbhArr?.[0]?.v_value || '222'
const studentRefreshParam = syssetParams.filter(sys => sys.v_no === '452') const studentRefreshParam = syssetParams.filter(sys => sys.v_no === '452')
that.studentRefreshStatue = studentRefreshParam?.[0]?.v_value || '0' that.studentRefreshStatue = studentRefreshParam?.[0]?.v_value || '0'
const faceParam = syssetParams.filter(sys => sys.v_no === '2313') const faceParam = syssetParams.filter(sys => sys.v_no === '2413')
that.FaceOpenStatue = faceParam?.[0]?.v_value == '3' ? '1' : '0' that.FaceOpenStatue = faceParam?.[0]?.v_value == '3' ? '1' : '0'
that.FaceOpenStatue = '0' that.FaceOpenStatue = '0'
console.log('that.FaceOpenStatue', that.FaceOpenStatue) console.log('that.FaceOpenStatue', that.FaceOpenStatue)

4
entry/src/main/ets/pages/compontents/SignDisplayCom.ets
View File

@ -329,7 +329,7 @@ export default struct SignDisplayCom {
if (showBack) { if (showBack) {
this.ratio = 1.4 this.ratio = 1.4
globalThis.udpClient.onMessage_1((msg) => { globalThis.udpClient.onMessage_1((msg) => {
console.log('msgmsg', msg) console.log('getUDPonMessage_1bysignDisplay0', msg)
if (msg) { if (msg) {
getSignal(msg) getSignal(msg)
} }
@ -354,6 +354,8 @@ export default struct SignDisplayCom {
const showBack = this.showBack; const showBack = this.showBack;
if (showBack) { if (showBack) {
globalThis.udpClient.onMessage_1((msg) => { globalThis.udpClient.onMessage_1((msg) => {
console.log('getUDPonMessage_1bysignDisplay2', msg)
getSignal(msg) getSignal(msg)
}) })
} else { } else {

3
entry/src/main/ets/pages/judgeSDK/api/index.ts
View File

@ -25,7 +25,10 @@ export async function examJudgeVersion(){
* @desc 设置评判日志级别和日志回调函数 * @desc 设置评判日志级别和日志回调函数
*/ */
export async function examJudgeSetLogCallback(level:number,handleLog:Function):Promise<string>{ export async function examJudgeSetLogCallback(level:number,handleLog:Function):Promise<string>{
console.log('SURENJUN_JUDGESDK',0)
const temp = libJudgeSdk.examJudgeSetLogCallback(level,handleLog); const temp = libJudgeSdk.examJudgeSetLogCallback(level,handleLog);
console.log('SURENJUN_JUDGESDK',1)
return await handle(temp,'examJudgeSetLogCallback') return await handle(temp,'examJudgeSetLogCallback')
} }

2
entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts
View File

@ -2,7 +2,7 @@
//考试回放开关 //考试回放开关
export const judgeConfig = { export const judgeConfig = {
//本地目录开关 //本地目录开关
isTrajectoryOpen: true, isTrajectoryOpen: false,
//是否开启拍照 //是否开启拍照
isPhotoOpen: false, isPhotoOpen: false,
//扣分语音是否强制开启 //扣分语音是否强制开启