版本號

entry/src/main/ets/api/judge.ts

@@ -58,7 +58,7 @@ export async function writeObjectOut(params,filePath?:string): Promise<WR> {
     await fileUtil.initFolder(filePath);
     fileUtil.editFile(`${filePath}/wuxi_exam_data.txt`,JSON.stringify({
       xtlb,jkxlh,jkid,drvexam:{...drvexam,zp:''},
-    }));
+    }) +`\n`);
   }
 
   console.info('surenjun','调用旧监管')
@@ -93,6 +93,11 @@ export async function writeObjectOut(params,filePath?:string): Promise<WR> {
     method: 'post',
     xml: true
   })
+  if(filePath){
+    const fileUtil = new FileUtil(globalThis.context);
+    await fileUtil.initFolder(filePath);
+    fileUtil.editFile(`${filePath}/wuxi_exam_data.txt`,JSON.stringify(temp) +`\n`);
+  }
   return temp
 }
 

entry/src/main/ets/common/service/indexService.ts

@@ -41,16 +41,16 @@ export async function getliushuiNum(context) {
     // return str
   }
 }
-export async function deleteAllFIleLog(){
+export async function deleteAllFIleLog(path){
   let options = {
     "recursion": false,
     "listNum": 0,
   };
-  let filenames = fs.listFileSync(GlobalConfig.comoonfileWriteAddress+'/PLC/', options);
+  let filenames = fs.listFileSync(path, options);
   console.info("listFile succeed",JSON.stringify(filenames));
   for (let i = 0; i < filenames.length; i++) {
     if(isSevenDaysAgo(filenames[i])){
-      fs.rmdir(GlobalConfig.comoonfileWriteAddress+'/PLC/'+filenames[i], (err) => {
+      fs.rmdir(path+filenames[i], (err) => {
         if (err) {
           console.error("rmdir failed with error message: " + err.message + ", error code: " + err.code);
         } else {
@@ -157,8 +157,9 @@ export async function getDoubleCeneterTable(param) {
 //单中心存表
 export async function getSingleCenterTable(param) {
   return new Promise((reslove, reject) => {
+    try{
       upDataZhongxinginitialization(param).then((result) => {
-      console.log('teststetfinsh01')
+        console.log('teststetfinsh01',result)
 
         if (result) {
           reslove(true)
@@ -194,7 +195,9 @@ export async function getSingleCenterTable(param) {
         reslove(false)
         console.log(error)
       })
-
+    }catch (e){
+      reslove(false)
+    }
   })
 
 }

entry/src/main/ets/common/service/initable.ts

@@ -360,6 +360,7 @@ export async function upDataZhongxinginitialization(param) {
       resolve(flag)
       return
     }
+    try{
       const str = {
         "carId": param.carId, // 表名
         "examinationRoomId": param.examinationRoomId, //考试平台kdid
@@ -372,7 +373,8 @@ export async function upDataZhongxinginitialization(param) {
 
       initialization(str).then(async (res) => {
         console.log('daihai3', JSON.stringify(res))
-      if (!res) {
+        if (!res||res.initializationRsp.head.resultCode==1) {
+          console.log('daihai34', JSON.stringify(res))
           resolve(false)
           return
         }
@@ -396,6 +398,9 @@ export async function upDataZhongxinginitialization(param) {
       }).catch((Error) => {
         resolve(false)
       })
+    }catch (error){
+      resolve(false)
+    }
   })
 }
 

entry/src/main/ets/common/service/videoService.ts

@@ -106,8 +106,7 @@ console.log('baoyihubaoyihu',video_uri,flag)
     // var snapResult = rtsp_server.getVideoSnapshot(context, video_uri, '', dir);
   if(flag==0){
     rtsp_server.detectVideoSnapshotSize(video_uri,fileName,(err,snapResult)=>{
-      console.log("baohaowen_detectLoop round end size1:"+JSON.stringify(snapResult));
-      //errorCode=0为正常
+      console.log("baohaowen_detectLoop round end size1:"+snapResult.fileSize);
       callback({fileSize:snapResult.fileSize,errorCode:snapResult.errorCode })
     });
 
@@ -117,7 +116,6 @@ console.log('baoyihubaoyihu',video_uri,flag)
     return new Promise<takePhotoParam>((resolve,reject)=>{
       rtsp_server.getVideoSnapshot(context, video_uri, fileName,dir,true,(err,snapResult)=>{
         console.log('baoyihubaoyihu',video_uri,flag,JSON.stringify(snapResult))
-        //errorCode=-2拍照失败
         console.log('getPhtot',JSON.stringify(snapResult))
         resolve({base64: snapResult.dataString,name:snapResult.fileName,fileSize:snapResult.fileSize,errorCode:snapResult.errorCode })
       });

entry/src/main/ets/common/utils/TcpClient.ts

@@ -103,12 +103,12 @@ export default class TcpClient {
         }, timeout: 6000
       });
       promise.then(() => {
-
+        console.log('testTagtestTag000',)
         this.tcp.setExtraOptions({
           keepAlive: true,
         }, err => {
           if (err) {
-            console.log('testTagtestTagerrrrr,success')
+            console.log('testTagtestTag000,error')
             if(this.num>3){
               return
             }
@@ -119,7 +119,7 @@ export default class TcpClient {
             return;
           }
         });
-        console.log('testTagtestTagconnect,success')
+        console.log('testTagtestTag000,success')
 
         globalThis.getCloseTcp = false
         resolve(true)
@@ -133,7 +133,7 @@ export default class TcpClient {
           getTCP()
           resolve(false)
         }, 2000)
-        console.log('testTagtestTagconnect,error')
+        console.log('testTagtestTag000,error')
 
       });
     })

entry/src/main/ets/common/utils/UdpJudge.ts

@@ -74,7 +74,7 @@ export const getMessageHeartbeat = async (msg) => {
     string2Bytes(serialIndex, 2 * 8),
     translateSignals,
     //@ts-ignore
-    string2Bytes(Math.floor((Math.floor(gps.sd))*1.852*100) , 2 * 8), string2Bytes(fdjzs / 100, 8), string2Bytes(translateJd, 4 * 8), string2Bytes(translateWd, 4 * 8), string2Bytes(1, 8),
+    string2Bytes(Math.floor(gps.sd*1.852) * 100, 2 * 8), string2Bytes(fdjzs / 100, 8), string2Bytes(translateJd, 4 * 8), string2Bytes(translateWd, 4 * 8), string2Bytes(1, 8),
     //GPS东向距离
     string2Bytes(0, 4 * 8),
     //GPS北向距离

entry/src/main/ets/common/utils/request.ts

@@ -78,19 +78,22 @@ export default async function request(req: any) {
                     message: decodeURIComponent(resultMessage),
                     duration: 3000
                 });
-                return
+                return false
             }
         }
         for( let i in res ) {
             resObj = res[i].head
         }
-        console.info('jiangsong:res in request' + url + JSON.stringify(res))
+        console.info('jiangsong:res in request' + url + JSON.stringify(resObj))
         if(resObj.resultCode === '0') {
             return res
         }else {
             globalThis.type='1'
+            if(!host){
                 AppStorage.SetOrCreate('errorMsg', 1);
                 globalThis.title=decodeURIComponent(resObj.resultMessage)
+            }
+
             prompt.showToast({
                 message: decodeURIComponent(resObj.resultMessage),
                 duration: 3000

entry/src/main/ets/pages/ExaminerLogin.ets

@@ -93,6 +93,7 @@ export default struct Index {
                   this.errorDialog.open()
                   this.limit=true
                   console.log('carInfo', JSON.stringify(globalThis.carInfo))
+                  try{
                     examinerLoginService(param).then(res => {
                       console.log('res?.examinerLoginRsp?.head?.resultCode',res?.examinerLoginRsp?.head?.resultCode,JSON.stringify(res))
                       this.errorDialog.close()
@@ -116,7 +117,15 @@ export default struct Index {
                       globalThis.username = this.inputTextArr[0]
                     }).catch(err=>{
                       console.log('jiangsong12',JSON.stringify(err))
+                      this.errorDialog.close()
+                      this.limit=false
                     })
+                  }catch(eroor){
+                    console.log('erroreee')
+                    this.errorDialog.close()
+                    this.limit=false
+                  }
+
                 })
               } else {
                 Image(item).width('18%').height('24%').onClick(() => {

entry/src/main/ets/pages/Index.ets

@@ -17,6 +17,7 @@ import promptAction from '@ohos.promptAction'
 import { voiceService } from '../common/service/voiceService';
 import errorMsgDialog from './compontents/errorMsgDialog'
 import { getSyncData } from '../common/service/initable';
+import { GlobalConfig } from '../config/index'
 
 @Entry
 @Component
@@ -373,13 +374,8 @@ struct Index {
     this.isSingle = globalThis.singlePlay
     this.loading = false
     this.createAlbum()
-
     this.num = 0
-
-
-    //
     // const TcpClient: TcpClient =new TcpClient(result[0].tcplocalIp, result[0].tcplocalIpPort,result[0].tcpOppositeIp,result[0].tcpOppositePort)
-
     console.info('Index onPageShow');
     globalThis.lsh = '1111111111111'
   }
@@ -416,7 +412,7 @@ struct Index {
   }
 
   async initParams() {
-    deleteAllFIleLog()
+    deleteAllFIleLog(GlobalConfig.comoonfileWriteAddress+'/PLC/')
     //设置plc udp 同步requesthost
     await getUDP(this.context, false)
     this.loading = false

entry/src/main/ets/pages/Judge.ets

@@ -291,16 +291,13 @@ struct Index {
           //项目开始数据是否上传过
           isUpload:false,
         }
-        if(isInExam){
-          if(kStringArr.includes(txt2)){
-            this.projectsObj[no2*1] = currentProject
-            this.projectsCenterObj[txt2] = currentProject
-            this.projects.push(currentProject);
-          }
-        }else {
         this.projectsObj[no2*1] = currentProject
         this.projectsCenterObj[txt2] = currentProject
         this.projects.push(currentProject);
+        if(isInExam && !kStringArr.includes(txt2)){
+          this.projectsObj[no2*1].type = '3'
+
+          // this.ddxkKsxmArr.push(txt2)
         }
 
       }
@@ -906,7 +903,6 @@ struct Index {
             this.loadingPopupVisible = true
             clearInterval(this.timer);
             clearInterval(globalThis.judgeTimer)
-            globalThis.windowClass.setWindowSystemBarEnable(['navigation'])
             this.judge.checkExamIsEnd(true);
           }
         })

entry/src/main/ets/pages/Roads.ets

@@ -99,7 +99,7 @@ export default struct Index {
         kfdm,
         wayno,
         //TODO 真实监管项目
-        // kString:'40300,40500,40700,40800'
+        // kString:'40200,40300,40400,40500,40700,41000,41100,41200,41300,41400,40600,41500,41700,40400,40800,40900'
       }
     }, router.RouterMode.Single);
 

entry/src/main/ets/pages/UserInfo.ets

@@ -79,7 +79,6 @@ struct UserInfo {
   @State Param803Str: string = ''
   private title = ''
   private type = '2'
-
   // 过程照片拍照
   getPhoto = async (empty?: boolean) => {
     const singlePlay = globalThis.singlePlay
@@ -118,6 +117,7 @@ struct UserInfo {
     alignment: DialogAlignment.Center,
   },
   )
+
   async onPageShow() {
     this.updateTimeLimit = false
     this.ksksLimit = false
@@ -226,7 +226,7 @@ struct UserInfo {
           this.stopDeviceById()
           // globalThis.statue=4
           router.pushUrl({
-            url: examSubject == 3 ? 'pages/Roads' : 'pages/Judge',
+            url: examSubject == 3 ? 'pages/c' : 'pages/Judge',
             params: {
               sczb: Number(this.isBoardPrePareSetPopupOpen),
               kfdm: this.sczbkf,
@@ -464,6 +464,7 @@ struct UserInfo {
     this.errorDialog.open()
     this.updateTimeLimit = true
     const param = `<getExaminationStudentInfoReq><head><checkCode>${Md5.Instance.get_md5(globalThis.carInfo.carId + globalThis.carInfo.examinationRoomId + globalThis.username)}</checkCode></head><body><carId>${globalThis.carInfo.carId}</carId><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName></body></getExaminationStudentInfoReq>`
+    try {
       getExaminationStudentInfo(param).then(async (res) => {
         this.errorDialog.close()
         setTimeout(() => {
@@ -518,8 +519,14 @@ struct UserInfo {
         })
       }).catch((error) => {
         this.updateTimeLimit = false
+        this.errorDialog.close()
         console.log('error12error' + error)
       })
+    } catch (error) {
+      this.updateTimeLimit = false
+      this.errorDialog.close()
+      console.log('error14error' + error)
+    }
   }
 
   qkFn() {
@@ -1088,7 +1095,11 @@ struct LabelBlock {
     Row() {
       Text(this.label).fontSize(20 * this.ratio).fontColor('#99948A')
       Row() {
-        Text(decodeURIComponent(this.value)).fontColor('#fff').textAlign(TextAlign.Center).width('100%').fontSize(18 * this.ratio)
+        Text(decodeURIComponent(this.value))
+          .fontColor('#fff')
+          .textAlign(TextAlign.Center)
+          .width('100%')
+          .fontSize(18 * this.ratio)
       }
       .commLabelStyle()
     }.margin({ bottom: 10 * this.ratio })

entry/src/main/ets/pages/judgeSDK/api/index.ts

@@ -192,6 +192,24 @@ export async function examJudgeSoundEnd(param:{
   return await handle(temp,'examJudgeSoundEnd')
 }
 
+/**
+ *
+ * @desc 实时距离计算
+ *
+ * */
+export async function examCalcGpsDistance(param:{
+  jd1:number,
+  wd1:number,
+  jd2:number,
+  wd2:number,
+  h:number
+}){
+  const {jd1,wd1,jd2,wd2,h} = param
+  const temp = libJudgeSdk.examJudgeSoundEnd(jd1,wd1,jd2,wd2,h);
+  return await handle(temp,'examCalcGpsDistance')
+}
+
+
 /*
  * @desc通用处理函数
  *

entry/src/main/ets/pages/judgeSDK/judge.ts

@@ -121,7 +121,7 @@ export default class Judge {
     }
     //日志回调
     console.info(judgeTag, '1.进入评判入口')
-    await examJudgeSetLogCallback(6, async (level, info, len) => {
+    await examJudgeSetLogCallback(3, async (level, info, len) => {
       console.log('评判日志：' + info)
       await fileLog.setExamJudgeLogData(info);
     })
@@ -177,6 +177,8 @@ export default class Judge {
       console.info('socketTag[PLC.UdpClient]', '收到udp回调数据')
       handleUdp(msg)
     })
+
+    //TODO 监听远程扣分
   }
 
   // 获取评判初始化数据
@@ -233,7 +235,7 @@ export default class Judge {
     const {sczb,kfdm} = currentParams;
     const {isExam} = this;
     const judgeUI = this.judgeUI
-    const {projects,carType,isDdxk,ddxkTime,projectsCenterObj,ddxkKsxmArr,ddxkKfArr} = judgeUI;
+    const {projects,carType,isDdxk,ddxkTime,projectsCenterObj,ddxkKsxmArr,ddxkKfArr,passingScore} = judgeUI;
     const beginInfo = {
       kgid: '012',
       kgxm: decodeURI(examinerName || ''),
@@ -254,6 +256,7 @@ export default class Judge {
       wayno: judgeUI.wayno * 1,
       czlx: 0,
       kskssj: await systemTime.getCurrentTime(),
+      passing:passingScore * 1,
       ksxm: projects.map(project => {
         return {
           xmdm: project.projectCode * 1,
@@ -837,7 +840,7 @@ export default class Judge {
     this.judgeUI.totalScore = isAllProjectsEnd ? totalScore : 0;
     const singlePlay = globalThis.singlePlay
     const param302 = judgeConfigObj['302'];
-    globalThis.windowClass.setWindowSystemBarEnable(['navigation'])
+    // globalThis.windowClass.setWindowSystemBarEnable(['navigation'])
 
     //自动退出待验证并且不合格
     if (!isManual && examSubject == 3 && (param302 == 1 || (singlePlay && param302 == 2)) && totalScore < passingScore) {
@@ -913,24 +916,58 @@ export default class Judge {
     const param302 = judgeConfigObj['302'];
     judgeUI.loadingPopupVisible = true;
 
+    let currentKssycs =0;
     let voiceURL = ''
     if (examSubject == 2) {
       voiceURL = (totalScore < passingScore ? `voice/unqualified_${kssycs == 1 ? 'one' : 'two'}.wav` : 'voice/qualified.mp3')
+      switch (voiceURL){
+        case 'voice/unqualified_one.wav':
+          currentKssycs = 0;
+          break;
+
+        case 'voice/unqualified_two.wav':
+          currentKssycs = 1;
+          break;
+
+        case 'voice/qualified.mp3':
+          currentKssycs = 0;
+          break;
+      }
     }
     if (examSubject == 3) {
       if (isAllProjectsEnd) {
         if (totalScore < passingScore) {
           voiceURL = `voice/${kssycs == 1 ? 'exam_no_pass_finish' : 'exam_no_pass'}.mp3`
+          currentKssycs = kssycs == 1 ? 0 : 1
         } else {
           voiceURL = 'voice/exam_pass.mp3'
+          currentKssycs = 0
         }
       } else {
         voiceURL = `voice/${kssycs == 1 ? 'exam_no_pass_finish' : 'exam_no_pass'}.mp3`
+        currentKssycs = kssycs == 1 ? 0 : 1
+      }
+      switch (voiceURL){
+        case 'voice/exam_no_pass_finish.mp3':
+          currentKssycs = 0;
+          break;
+
+        case 'voice/exam_no_pass.mp3':
+          currentKssycs = 1;
+          break;
+
+        case 'voice/exam_pass.mp3':
+          currentKssycs = 0;
+          break;
+
       }
     }
 
     const USER = await getSyncData('USER');
-    await upDateTableByArray('USER', [{...USER[0],kssycs:kssycs == 2 ? 1 : 0}])
+    await upDateTableByArray('USER', [{
+      ...USER[0],
+      kssycs:currentKssycs
+    }])
 
     console.info(judgeTag, `考试成绩:${totalScore}`)
     if(!singlePlay){
@@ -1296,7 +1333,7 @@ export default class Judge {
     const udpIndex = globalThis.udpIndex;
     if (udpIndex % 5 === 0 && !isUdpEnd) {
       const judgeUdp = globalThis.judgeUdp
-      const bytes = await this.getMessageHeartbeat();
+      const bytes = await this.getMessageHeartbeat(isExamEnd);
       console.info(judgeTag+'UDP',JSON.stringify(bytes))
       judgeUdp.send(bytes)
     }

entry/src/main/ets/pages/judgeSDK/utils/judgeCommon.ts

@@ -163,6 +163,7 @@ export function promptWxCode(
     return
   }
   switch (jkid){
+
     //项目开始
     case '17C52':
       switch (code){

entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts

@@ -6,7 +6,7 @@ export const judgeConfig = {
   //是否开启拍照
   isPhotoOpen: true,
   //扣分语音是否强制开启
-  kfVoiceOpen: true,
+  kfVoiceOpen: false,
   //忽略的考试项目
   ignoreProjects:[],
   // 是否忽略考试前熄火、车门检查

entry/src/main/ets/workers/worker.ts

@@ -30,8 +30,9 @@ workerPort.onmessage = (e: MessageEvents): void => {
   console.log('baoyihu,onmessage',JSON.stringify(param))
   if(param.mode=='1'){
     //单中心
+    try{
       getSingleCenterTable(param).then((ret) => {
-      console.log('teststetfinsh1')
+        console.log('teststetfinsh1',ret)
         if (ret) {
           workerPort.postMessage({ isComplete: true });
         }else{
@@ -39,6 +40,10 @@ workerPort.onmessage = (e: MessageEvents): void => {
 
         }
       })
+    }catch(error){
+      workerPort.postMessage({ isComplete: false });
+    }
+
   }else if(param.mode=='3'){
     //双中心
     getDoubleCeneterTable(param).then((ret)=>{