版本號

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,44 +157,47 @@ export async function getDoubleCeneterTable(param) {
 //单中心存表
 export async function getSingleCenterTable(param) {
   return new Promise((reslove, reject) => {
-    upDataZhongxinginitialization(param).then((result) => {
+    try{
-      console.log('teststetfinsh01')
+      upDataZhongxinginitialization(param).then((result) => {
+        console.log('teststetfinsh01',result)
 
-      if (result) {
+        if (result) {
-        reslove(true)
+          reslove(true)
-      } else {
+        } else {
-        // promptAction.showToast({
+          // promptAction.showToast({
-        //   title: '提示',
+          //   title: '提示',
-        //   message: '联网更新失败，请检查网络后重新更新',
+          //   message: '联网更新失败，请检查网络后重新更新',
-        //   buttons: [
+          //   buttons: [
-        //     {
+          //     {
-        //       text: '确认',
+          //       text: '确认',
-        //       color: '#000000',
+          //       color: '#000000',
-        //     },
+          //     },
-        //     {
+          //     {
-        //       text: '取消',
+          //       text: '取消',
-        //       color: '#000000',
+          //       color: '#000000',
-        //     }
+          //     }
-        //   ],
+          //   ],
-        // })
+          // })
-        //   .then(data => {
+          //   .then(data => {
-        //     reslove(false)
+          //     reslove(false)
-        //   })
+          //   })
-        //   .catch(err => {
+          //   .catch(err => {
-        //     reslove(false)
+          //     reslove(false)
-        //   })
+          //   })
-        console.log('联网更新失败，请检查网络后重新更新')
+          console.log('联网更新失败，请检查网络后重新更新')
-        // promptAction.showToast({
+          // promptAction.showToast({
-        //   message: `联网更新表数据失败，请重新更新`,
+          //   message: `联网更新表数据失败，请重新更新`,
-        //   duration: 3000
+          //   duration: 3000
-        // });
+          // });
+          reslove(false)
+        }
+      }).catch((error) => {
         reslove(false)
-      }
+        console.log(error)
-    }).catch((error) => {
+      })
+    }catch (e){
       reslove(false)
-      console.log(error)
+    }
-    })
-
   })
 
 }

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

@@ -360,42 +360,47 @@ export async function upDataZhongxinginitialization(param) {
       resolve(flag)
       return
     }
-    const str = {
+    try{
-      "carId": param.carId, // 表名
+      const str = {
-      "examinationRoomId": param.examinationRoomId, //考试平台kdid
+        "carId": param.carId, // 表名
-      videoVersion: '1.0',
+        "examinationRoomId": param.examinationRoomId, //考试平台kdid
-      judgeVersion: param.judgeVersion,
+        videoVersion: '1.0',
-      shellVersion: param.shellVersion,
+        judgeVersion: param.judgeVersion,
-      host: param.host
+        shellVersion: param.shellVersion,
-    }
+        host: param.host
-    console.log('daihai2', JSON.stringify(str))
-
-    initialization(str).then(async (res) => {
-      console.log('daihai3', JSON.stringify(res))
-      if (!res) {
-        resolve(false)
-        return
       }
-      let flag
+      console.log('daihai2', JSON.stringify(str))
-      console.log('resposestart')
 
-      for (let key in res.initializationRsp.body) {
+      initialization(str).then(async (res) => {
-        if (!centerToMap[key]) {
+        console.log('daihai3', JSON.stringify(res))
-          continue
+        if (!res||res.initializationRsp.head.resultCode==1) {
-        }
+          console.log('daihai34', JSON.stringify(res))
-        const data = await setSyncCenterSqlData(key, res, param)
-        if (!data) {
           resolve(false)
+          return
         }
-      }
+        let flag
-      resolve(true)
+        console.log('resposestart')
+
+        for (let key in res.initializationRsp.body) {
+          if (!centerToMap[key]) {
+            continue
+          }
+          const data = await setSyncCenterSqlData(key, res, param)
+          if (!data) {
+            resolve(false)
+          }
+        }
+        resolve(true)
 
 
-      console.log('resposestart')
+        console.log('resposestart')
 
-    }).catch((Error) => {
+      }).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));
+      console.log("baohaowen_detectLoop round end size1:"+snapResult.fileSize);
-      //errorCode=0为正常
       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'
-            AppStorage.SetOrCreate('errorMsg', 1);
+            if(!host){
-            globalThis.title=decodeURIComponent(resObj.resultMessage)
+                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,30 +93,39 @@ export default struct Index {
                   this.errorDialog.open()
                   this.limit=true
                   console.log('carInfo', JSON.stringify(globalThis.carInfo))
-                  examinerLoginService(param).then(res => {
+                  try{
-                    console.log('res?.examinerLoginRsp?.head?.resultCode',res?.examinerLoginRsp?.head?.resultCode,JSON.stringify(res))
+                    examinerLoginService(param).then(res => {
-                    this.errorDialog.close()
+                      console.log('res?.examinerLoginRsp?.head?.resultCode',res?.examinerLoginRsp?.head?.resultCode,JSON.stringify(res))
+                      this.errorDialog.close()
 
-                    this.limit=false
+                      this.limit=false
-                    if(res?.examinerLoginRsp?.head?.resultCode=='1'){
+                      if(res?.examinerLoginRsp?.head?.resultCode=='1'){
-                      // this.type='1'
+                        // this.type='1'
-                      // this.title=decodeURIComponent(res.examinerLoginRsp.head.resultMessage)
+                        // this.title=decodeURIComponent(res.examinerLoginRsp.head.resultMessage)
-                      // console.log('this.titlt',this.title)
+                        // console.log('this.titlt',this.title)
-                      // this.errorDialog.open()
+                        // this.errorDialog.open()
-                      return
+                        return
-                    }
-                    router.pushUrl({
-                      url: 'pages/UserInfo',
-                      params:{
-                        type:1
                       }
-                    }, router.RouterMode.Single);
+                      router.pushUrl({
+                        url: 'pages/UserInfo',
+                        params:{
+                          type:1
+                        }
+                      }, router.RouterMode.Single);
+
+                      console.log('res11', JSON.stringify(res))
+                      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
+                  }
 
-                    console.log('res11', JSON.stringify(res))
-                    globalThis.username = this.inputTextArr[0]
-                  }).catch(err=>{
-                    console.log('jiangsong12',JSON.stringify(err))
-                  })
                 })
               } 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){
+        this.projectsObj[no2*1] = currentProject
-          if(kStringArr.includes(txt2)){
+        this.projectsCenterObj[txt2] = currentProject
-            this.projectsObj[no2*1] = currentProject
+        this.projects.push(currentProject);
-            this.projectsCenterObj[txt2] = currentProject
+        if(isInExam && !kStringArr.includes(txt2)){
-            this.projects.push(currentProject);
+          this.projectsObj[no2*1].type = '3'
-          }
+
-        }else {
+          // this.ddxkKsxmArr.push(txt2)
-          this.projectsObj[no2*1] = currentProject
-          this.projectsCenterObj[txt2] = currentProject
-          this.projects.push(currentProject);
         }
 
       }
@@ -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,9 +117,10 @@ struct UserInfo {
     alignment: DialogAlignment.Center,
   },
   )
+
   async onPageShow() {
-    this.updateTimeLimit=false
+    this.updateTimeLimit = false
-    this.ksksLimit=false
+    this.ksksLimit = false
     console.log('响应头地址响应头地址')
     const mediaTest = new FilePhoto(this.context);
     this.filePhoto = new FilePhoto(this.context);
@@ -130,42 +130,42 @@ struct UserInfo {
     this.initData()
     //身份证读卡器初始化
     // this.openDeviceByIDCard()
-    const routerParam=router.getParams()||{type :0};
+    const routerParam = router.getParams() || { type: 0 };
-    console.log('routerParam',JSON.stringify(routerParam))
+    console.log('routerParam', JSON.stringify(routerParam))
-    if(!globalThis.singlePlay){
+    if (!globalThis.singlePlay) {
       // @ts-ignore
-      if(routerParam.type!=1){
+      if (routerParam.type != 1) {
         // @ts-ignore
-        this.list =await getSyncData('USERLIST')
+        this.list = await getSyncData('USERLIST')
         // @ts-ignore
-        const data=await getSyncData('USER')
+        const data = await getSyncData('USER')
-        const user=data[0]
+        const user = data[0]
-        if(user&&Number(user.kssycs)){
+        if (user && Number(user.kssycs)) {
-          this.list.forEach(res=>{
+          this.list.forEach(res => {
-            if(res.sfzmhm==user.sfzmhm){
+            if (res.sfzmhm == user.sfzmhm) {
-              res.kssycs=user.kssycs
+              res.kssycs = user.kssycs
               this.getCurrentStudent(res.sfzmhm)
             }
           })
 
-        }else if(user&&(user.kssycs=='0'||user.kssycs=='')){
+        } else if (user && (user.kssycs == '0' || user.kssycs == '')) {
           console.log('datadatadatadata')
-          this.list=this.list.filter(res=>{
+          this.list = this.list.filter(res => {
-            return res.sfzmhm!=user.sfzmhm
+            return res.sfzmhm != user.sfzmhm
           })
-          this.pageIndex=0
+          this.pageIndex = 0
           this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
-          if(this.dataList.length){
+          if (this.dataList.length) {
-            this.currentUser=this.dataList[0]
+            this.currentUser = this.dataList[0]
-          }else{
+          } else {
-            this.currentUser=EmptyCandidateObject
+            this.currentUser = EmptyCandidateObject
           }
         }
-        this.list.forEach((res,index)=>{
+        this.list.forEach((res, index) => {
-          res.id=index.toString()
+          res.id = index.toString()
         })
-        await upDateTableByArray('USERLIST', this.list||[])
+        await upDateTableByArray('USERLIST', this.list || [])
-      }else{
+      } else {
         this.getExaminationStudentInfoFn()
       }
     }
@@ -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,
@@ -243,7 +243,7 @@ struct UserInfo {
     if (!flag) {
       globalThis.lsh = '0000000000000'
       await upDateTableByArray('USER', [])
-      this.currentUser=this.list[0]
+      this.currentUser = this.list[0]
       // promptAction.showToast({
       //   message: '未匹配到对应下载学员',
       //   duration: 3000
@@ -401,7 +401,7 @@ struct UserInfo {
             that.openDeviceByIDCard()
           }
         }
-        if(that.list.length){
+        if (that.list.length) {
           return
         }
         //0不自动更新 1自动更新（不限次数） 2没有考生更新2次
@@ -460,71 +460,78 @@ struct UserInfo {
       return
     }
     await upDateTableByArray('USER', [])
-    this.type='2'
+    this.type = '2'
     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>`
-    getExaminationStudentInfo(param).then(async (res) => {
+    try {
-      this.errorDialog.close()
+      getExaminationStudentInfo(param).then(async (res) => {
-      setTimeout(() => {
+        this.errorDialog.close()
-        this.updateTimeLimit = false
+        setTimeout(() => {
-      }, 3000)
+          this.updateTimeLimit = false
-      if (!res||res?.getExaminationStudentInfoRsp?.head?.resultCode=='1') {
+        }, 3000)
-        return
+        if (!res || res?.getExaminationStudentInfoRsp?.head?.resultCode == '1') {
-      }
+          return
-      let dataList = []
+        }
-      this.list = []
+        let dataList = []
+        this.list = []
 
-      for (let key in res.getExaminationStudentInfoRsp.body) {
+        for (let key in res.getExaminationStudentInfoRsp.body) {
-        const a = res.getExaminationStudentInfoRsp.body[key]
+          const a = res.getExaminationStudentInfoRsp.body[key]
-        if (a instanceof Array) {
+          if (a instanceof Array) {
-          dataList = a
+            dataList = a
+          } else {
+            dataList = [a]
+          }
+        }
+        if (dataList.length) {
+          this.numCount = 0
+        }
+
+        this.list = JSON.parse(JSON.stringify(dataList))
+        this.list.forEach((listData, index) => {
+          listData.id = index.toString()
+          for (let i in listData) {
+            listData[i] = decodeURI(listData[i])
+          }
+          listData.kszp = this.photo + listData.kszp
+          listData.ksmjzp = this.photo + listData.ksmjzp
+        })
+        await upDateTableByArray('USERLIST', this.list || [])
+        dataList = this.list.length > 4 ? this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4) : this.list;
+
+        this.dataList = dataList
+        if (this.dataList.length) {
+          this.currentUser = this.dataList[0]
         } else {
-          dataList = [a]
+          this.currentUser = EmptyCandidateObject
         }
-      }
-      if (dataList.length) {
-        this.numCount = 0
-      }
 
-      this.list = JSON.parse(JSON.stringify(dataList))
+        this.lsh = this.currentUser.lsh
-      this.list.forEach((listData,index) => {
+        globalThis.lsh = this.lsh
-        listData.id=index.toString()
+        globalThis.ksyh = this.currentUser.ksy1sfzmhm || this.currentUser.ksy2sfzmhm
-        for (let i in listData) {
+        console.log('this.currentUse3' + JSON.stringify(this.currentUser))
-          listData[i] = decodeURI(listData[i])
+        this.pageIndex = 0
-        }
+        getSyncData('USER').then(data => {
-        listData.kszp = this.photo + listData.kszp
+          if (data?.[0]) {
-        listData.ksmjzp = this.photo + listData.ksmjzp
+            this.getCurrentStudent(data[0].sfzmhm)
+          }
+        })
+      }).catch((error) => {
+        this.updateTimeLimit = false
+        this.errorDialog.close()
+        console.log('error12error' + error)
       })
-      await upDateTableByArray('USERLIST', this.list||[])
+    } catch (error) {
-      dataList = this.list.length > 4 ? this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4) : this.list;
-
-      this.dataList = dataList
-      if (this.dataList.length) {
-        this.currentUser = this.dataList[0]
-      } else {
-        this.currentUser = EmptyCandidateObject
-      }
-
-      this.lsh = this.currentUser.lsh
-      globalThis.lsh = this.lsh
-      globalThis.ksyh = this.currentUser.ksy1sfzmhm || this.currentUser.ksy2sfzmhm
-      console.log('this.currentUse3' + JSON.stringify(this.currentUser))
-      this.pageIndex = 0
-      getSyncData('USER').then(data => {
-        if (data?.[0]) {
-          this.getCurrentStudent(data[0].sfzmhm)
-        }
-      })
-    }).catch((error) => {
       this.updateTimeLimit = false
-      console.log('error12error' + error)
+      this.errorDialog.close()
-    })
+      console.log('error14error' + error)
+    }
   }
 
   qkFn() {
     this.faceCompareSucess = 0
-    this.ksksLimit=false
+    this.ksksLimit = false
     if (globalThis.singlePlay) {
       this.qkFlag = false
       return
@@ -612,7 +619,7 @@ struct UserInfo {
         })
         return
       }
-      this.currentUser.id='0'
+      this.currentUser.id = '0'
       await upDateTableByArray('USER', [this.currentUser])
       this.stepFlag = false
       this.isLoadingPopupVisible = false
@@ -623,10 +630,10 @@ struct UserInfo {
           sczb: Number(this.isBoardPrePareSetPopupOpen),
           kfdm: this.sczbkf,
           //真实监管项目
-          kString:keystr || ''
+          kString: keystr || ''
         }
       }, router.RouterMode.Single);
-      this.updateTimeLimit=false
+      this.updateTimeLimit = false
       this.stopDeviceById()
       this.stepFlag = false
     })
@@ -818,7 +825,7 @@ struct UserInfo {
             .backgroundImageSize({ width: '100%', height: '100%' })
             .onClick(() => {
               globalThis.lsh = item.lsh;
-              if (this.isExamStart&&!globalThis.singlePlay) {
+              if (this.isExamStart && !globalThis.singlePlay) {
                 return
               }
               this.currentUser = item
@@ -893,10 +900,10 @@ struct UserInfo {
           Image($r('app.media.qk_btn'))
             .commStyle()
             .onClick(() => {
-              if(this.ksksLimit){
+              if (this.ksksLimit) {
                 return
               }
-              this.ksksLimit=true
+              this.ksksLimit = true
               this.qkFlag = true
             })
 
@@ -906,7 +913,7 @@ struct UserInfo {
               try {
                 await this.checkSignal()
                 this.isExamStart = true
-                this.currentUser.id='0'
+                this.currentUser.id = '0'
                 await upDateTableByArray('USER', [this.currentUser])
                 globalThis.statue = 4
                 this.isBoardPrePareSetPopupShow = true;
@@ -921,7 +928,7 @@ struct UserInfo {
             Image($r('app.media.ksks_btn'))
               .commStyle()
               .onClick(async () => {
-                if(this.ksksLimit){
+                if (this.ksksLimit) {
                   return
                 }
                 console.log('routerParamrouterParam')
@@ -932,11 +939,11 @@ struct UserInfo {
                   if (!this.currentUser.xm) {
                     return
                   }
-                  this.ksksLimit=true
+                  this.ksksLimit = true
 
                   if (globalThis.singlePlay) {
                     const {examSubject} = globalThis.carInfo;
-                    this.currentUser.id='0'
+                    this.currentUser.id = '0'
                     await upDateTableByArray('USER', [this.currentUser])
                     router.pushUrl({
                       url: examSubject == 3 ? 'pages/Roads' : 'pages/Judge',
@@ -945,7 +952,7 @@ struct UserInfo {
                         kfdm: this.sczbkf,
                       }
                     }, router.RouterMode.Single);
-                    this.ksksLimit=false
+                    this.ksksLimit = false
 
                     this.stopDeviceById()
                     return
@@ -986,7 +993,7 @@ struct UserInfo {
             }
             .commStyle()
             .onClick(() => {
-              this.ksksLimit=false
+              this.ksksLimit = false
               this.qkFlag = false
             })
 
@@ -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');
+    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,15 +30,20 @@ workerPort.onmessage = (e: MessageEvents): void => {
   console.log('baoyihu,onmessage',JSON.stringify(param))
   if(param.mode=='1'){
     //单中心
-    getSingleCenterTable(param).then((ret) => {
+    try{
-      console.log('teststetfinsh1')
+      getSingleCenterTable(param).then((ret) => {
-      if (ret) {
+        console.log('teststetfinsh1',ret)
-        workerPort.postMessage({ isComplete: true });
+        if (ret) {
-      }else{
+          workerPort.postMessage({ isComplete: true });
-        workerPort.postMessage({ isComplete: false });
+        }else{
+          workerPort.postMessage({ isComplete: false });
+
+        }
+      })
+    }catch(error){
+      workerPort.postMessage({ isComplete: false });
+    }
 
-      }
-    })
   }else if(param.mode=='3'){
     //双中心
     getDoubleCeneterTable(param).then((ret)=>{