修复了部分问题

.gitignore

@@ -8,5 +8,6 @@
 /.clangd
 /.clang-format
 /.clang-tidy
+/entry/src/main/cpp
 /entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts
 /build-profile.json5

build-profile.json5

@@ -5,9 +5,9 @@
         "name": "default",
         "material": {
           "certpath": "C:\\Users\\93218\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.cer",
-          "storePassword": "0000001B7CC00976B4DC275EF809F1208139DC3D299795B987E25735A90BA25E0281359B779149F37F25CB",
+          "storePassword": "0000001A1DDAA4ACBCE726491F94C3AF56A2540582DD64F1D58054FCE4F27EB1EA3AB9254BF5C318282B",
           "keyAlias": "debugKey",
-          "keyPassword": "0000001B4799B0C20722DE7A448875A3F176D6CB8285B0C00ACBAD55E6B458EC8710E4794E5EE87B49582A",
+          "keyPassword": "0000001AD378A9170F3E15A274CD444FCF00FAF0839F218288C28EC15366295413D9CB4926E710B7AEE8",
           "profile": "C:\\Users\\93218\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.p7b",
           "signAlg": "SHA256withECDSA",
           "storeFile": "C:\\Users\\93218\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.p12"

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

@@ -2,6 +2,8 @@ import { examinationStuAbsent, getExaminationItem, getExaminationStudentInfo } f
 import router from '@ohos.router';
 import TopLogo from './compontents/TopLogo';
 import Md5 from '../common/utils/md5';
+import AccountTable from '../common/database/tables/AccountTable';
+import USER from '../common/constants/USER';
 import { dateFormat, getCurrentHourTime, getCurrentTime, string2Bytes } from '../common/utils/tools';
 import FaceCompare from './compontents/FaceCompare';
 // import { initJudgeUdp } from '../common/utils/UdpJudge'
@@ -65,7 +67,6 @@ struct UserInfo {
   //是否已经开始考试
   @State isExamStart: boolean = false;
   @State effectDate: string = '';
-  @State errorNum: number = 0;
   @State interval: any = null;
   @State studentRefreshStatue: string = '0';
   @State photo: string = 'data:image/bmp;base64,';
@@ -166,6 +167,8 @@ struct UserInfo {
   )
   private filePhoto: FilePhoto
   private avPlayer
+  private AccountTable = new AccountTable(() => {
+  }, USER);
   private context = getContext(this) as common.UIAbilityContext;
   private labelBlocks = [
     { label: '考生姓名', key: 'xm' },
@@ -201,6 +204,7 @@ struct UserInfo {
     if (!globalThis.singlePlay) {
       // @ts-ignore
       if (routerParam.type != 1) {
+        console.info('surenjun', 'Judge返回到UserInfo界面')
         // @ts-ignore
         this.list = await getSyncData('USERLIST')
         // @ts-ignore
@@ -209,23 +213,11 @@ struct UserInfo {
         console.log('useruser1,', JSON.stringify(data))
 
         const user = data[0]
-        if (user && Number(user.kssycs)) {
+        if (!Number(user.kssycs)) {
-          let flag = false
-          this.list.forEach(res => {
-            if (res.sfzmhm == user.sfzmhm) {
-              flag = true
-              res.kssycs = user.kssycs
-              this.getCurrentStudent(res.sfzmhm)
-            }
-          })
-          if (!flag) {
-            this.currentUser = (this.list.length ? this.list[0] : EmptyCandidateObject)
-          }
-        } else if (user && (user.kssycs == '0' || user.kssycs == '')) {
-          console.log('datadatadatadata')
           this.list = this.list.filter(res => {
             return res.sfzmhm != user.sfzmhm
           })
+        }
         this.pageIndex = 0
         this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
         if (this.dataList.length) {
@@ -236,12 +228,47 @@ struct UserInfo {
           }, 200)
         } else {
           this.currentUser = EmptyCandidateObject
-          }
+          globalThis.lsh = '1111111111111'
         }
         this.list.forEach((res, index) => {
           res.id = index.toString()
         })
         await upDateTableByArray('USERLIST', this.list || [])
+
+        // if(this.)
+        // if (user && Number(user.kssycs)) {
+        //
+        //   let flag = false
+        //   this.list.forEach(res => {
+        //     if (res.sfzmhm == user.sfzmhm) {
+        //       flag = true
+        //       res.kssycs = user.kssycs
+        //       this.getCurrentStudent(res.sfzmhm)
+        //     }
+        //   })
+        //   if (!flag) {
+        //     this.currentUser = (this.list.length ? this.list[0] : EmptyCandidateObject)
+        //     globalThis.lsh = this.list.length?this.currentUser.lsh:'1111111111111'
+        //   }
+        // } else if (user && (user.kssycs == '0' || user.kssycs == '')) {
+        //   console.log('datadatadatadata')
+        //   this.list = this.list.filter(res => {
+        //     return res.sfzmhm != user.sfzmhm
+        //   })
+        //   this.pageIndex = 0
+        //   this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
+        //   if (this.dataList.length) {
+        //     setTimeout(() => {
+        //       this.currentUser = this.dataList[0]
+        //       this.currentUser.ksy2 = globalThis.kgxm
+        //       globalThis.lsh = this.currentUser.lsh
+        //     }, 200)
+        //   } else {
+        //     this.currentUser = EmptyCandidateObject
+        //     globalThis.lsh = '1111111111111'
+        //   }
+        // }
+
       } else {
         await this.getExaminationStudentInfoFn()
       }
@@ -336,7 +363,6 @@ struct UserInfo {
       setTimeout(() => {
         this.currentUser = this.list[0]
         this.currentUser.ksy2 = globalThis.kgxm
-
         globalThis.lsh = this.currentUser.lsh
       }, 200)
 
@@ -585,7 +611,14 @@ struct UserInfo {
         // this.getExaminationItemFn()
       }
     })
-
+    // const db = new AccountTable(() => {
+    // }, MA_SYSSET);
+    // db.getRdbStore(() => {
+    //   db.query('0', (syssetParams) => {
+    //
+    //
+    //   })
+    // })
   }
 
   //人脸比对窗口关闭
@@ -627,26 +660,21 @@ struct UserInfo {
     this.ksksLimit = false
     // this.isBoardPrePareSetPopupOpen=true
     this.isFirstBoardPrePareSetPopupBtnShow = false
-    console.log('isFirstBoardPrePareSetPopupBtnShow', this.isFirstBoardPrePareSetPopupBtnShow,
+    console.log('isFirstBoardPrePareSetPopupBtnShow', this.isFirstBoardPrePareSetPopupBtnShow, this.isBoardPrePareSetPopupOpen)
-      this.isBoardPrePareSetPopupOpen)
     this.startExam = false
     // await upDateTableByArray('USER', [])
     // await upDateTableByArray('USERLIST', [])
-    // await DB.clearTable('USER')
-    // await DB.clearTable('USERLIST')
 
-    // this.type = '2'
+    this.type = '2'
-    // this.errorDialog.open()
+    this.errorDialog.open()
     this.updateTimeLimit = true
-    const param = `<getExaminationStudentInfoReq><head><checkCode>${Md5.Instance.get_md5(globalThis.carInfo.carId +
+    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><sfzmhm></sfzmhm></body></getExaminationStudentInfoReq>`
-    globalThis.carInfo.examinationRoomId +
+    try {
-    globalThis.username)}</checkCode></head><body><carId>${globalThis.carInfo.carId}</carId><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName><sfzmhm></sfzmhm></body></getExaminationStudentInfoReq>`
       getExaminationStudentInfo(param).then(async (res) => {
-      this.errorNum=0
         console.log("temp log ", JSON.stringify(res))
         await DB.clearTable('USER')
         await DB.clearTable('USERLIST')
-      // this.errorDialog.close()
+        this.errorDialog.close()
         setTimeout(() => {
           this.updateTimeLimit = false
         }, 3000)
@@ -710,26 +738,48 @@ struct UserInfo {
           return res.kssycs == '1'
         })
         if (this.dataList.length) {
-        if (user.length) {
+          // if (user.length) {
-          setTimeout(() => {
+          //   setTimeout(() => {
-            this.currentUser = user[0]
+          //     this.currentUser = user[0]
-            this.currentUser.ksy2 = globalThis.kgxm
+          //     this.currentUser.ksy2 = globalThis.kgxm
-            globalThis.lsh = this.currentUser.lsh
+          //     globalThis.lsh = this.currentUser.lsh
-            globalThis.ksyh = this.currentUser.ksy1sfzmhm
+          //     globalThis.ksyh = this.currentUser.ksy1sfzmhm
-          }, 200)
+          //   }, 200)
-        } else {
+          // } else {
           setTimeout(() => {
             this.currentUser = this.dataList[0]
             this.currentUser.ksy2 = globalThis.kgxm
             globalThis.ksyh = this.currentUser.ksy1sfzmhm
             globalThis.lsh = this.currentUser.lsh
           }, 200)
-        }
+          // }
         } else {
           this.currentUser = EmptyCandidateObject
+          globalThis.lsh = '1111111111111'
         }
 
 
+        // const flag=dataList.filter((res)=>{
+        //    return res.sfzmhm==this.currentUser.sfzmhm
+        // }).length?true:false
+        // if(!this.currentUser.sfzmhm||this.currentUser.kssycs=='0'||!flag){
+        //   if (this.dataList.length) {
+        //     setTimeout(()=>{
+        //       this.currentUser = this.dataList[0]
+        //       this.currentUser.ksy2= globalThis.kgxm
+        //       globalThis.lsh=this.currentUser.lsh
+        //     },200)
+        //     console.log('this.currentUser1',JSON.stringify(this.currentUser))
+        //   } else {
+        //     this.currentUser = EmptyCandidateObject
+        //   }
+        // }
+
+
+        // this.lsh = this.currentUser.lsh
+        // globalThis.lsh = this.lsh
+        // globalThis.ksyh = this.currentUser.ksy1sfzmhm
+
         //364	绕车一周评判时机(1-开始考试后判 2-开始考试前判)
         if (this.systemParam.Param364 == '2') {
           this.isBoardPrePareSetPopupOpen = true;
@@ -742,21 +792,21 @@ struct UserInfo {
         }
 
         this.pageIndex = 0
-      // getSyncData('USER').then(data => {
+        getSyncData('USER').then(data => {
-      //   if (data?.[0]) {
+          if (data?.[0]) {
-      //     this.getCurrentStudent(data[0].sfzmhm)
+            this.getCurrentStudent(data[0].sfzmhm)
-      //   }
+          }
-      // })
+        })
       }).catch((error) => {
         this.updateTimeLimit = false
-      // this.errorDialog.close()
+        this.errorDialog.close()
-      this.errorNum++
-      if (this.errorNum < 3) {
-        this.getExaminationStudentInfoFn()
-      }
         console.log('error12error' + error)
       })
-
+    } catch (error) {
+      this.updateTimeLimit = false
+      this.errorDialog.close()
+      console.log('error14error' + error)
+    }
   }
 
   qkFn() {
@@ -770,8 +820,7 @@ struct UserInfo {
       return
     }
     console.log('JsonJson', JSON.stringify(this.currentUser))
-    const param =
+    const param = `<?xml version="1.0" encoding="UTF-8" ?><examinationStuAbsentReq><body><carId>${globalThis.carInfo.carId}</carId><cardNo>${this.currentUser.sfzmhm}</cardNo><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName><lsh>${this.lsh}</lsh></body></examinationStuAbsentReq>`
-      `<?xml version="1.0" encoding="UTF-8" ?><examinationStuAbsentReq><body><carId>${globalThis.carInfo.carId}</carId><cardNo>${this.currentUser.sfzmhm}</cardNo><examinationRoomId>${globalThis.carInfo.examinationRoomId}</examinationRoomId><examinerName>${globalThis.username}</examinerName><lsh>${this.lsh}</lsh></body></examinationStuAbsentReq>`
     console.log('carNo1111', param)
 
     examinationStuAbsent(param).then(res => {
@@ -1095,13 +1144,11 @@ struct UserInfo {
             }
             .width(165 * this.ratio)
             .height(85 * this.ratio)
-            .backgroundImage(item.sfzmhm != this.currentUser.sfzmhm ? $r('app.media.userbox2') :
+            .backgroundImage(item.sfzmhm != this.currentUser.sfzmhm ? $r('app.media.userbox2') : $r('app.media.userboxbg'))
-            $r('app.media.userboxbg'))
             .backgroundImageSize({ width: '100%', height: '100%' })
             .onClick(() => {
               console.log('this.startExam', this.startExam, this.systemParam.Param364, this.isExamStart)
-              if ((this.isExamStart && !globalThis.singlePlay && this.systemParam.Param341) ||
+              if (this.startExam && this.systemParam.Param364 == '2') {
-                (this.startExam && this.systemParam.Param364 == '2')) {
                 return
               }
               this.currentUser = EmptyCandidateObject
@@ -1175,6 +1222,9 @@ struct UserInfo {
           //   .commStyle()
           imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.yydj_btn') })
             .margin({ bottom: 12 * this.ratio })
+            .onClick(() => {
+              globalThis.judgeUdp.askVoice()
+            })
 
           // Image($r('app.media.gx_btn'))
           //   .commStyle()
@@ -1196,17 +1246,14 @@ struct UserInfo {
             .onClick(() => {
               // this.avPlayer.playAudio(['button_media.wav'])
               //  已开始考试不能缺考   已考过一次学员不能缺考                                                 车上不能缺考
-              if (this.ksksLimit || (this.systemParam.Param352Str == '1' && this.currentUser.kssycs == '1') ||
+              if (this.ksksLimit || (this.systemParam.Param352Str == '1' && this.currentUser.kssycs == '1') || this.systemParam.Param770Str == '1') {
-                this.systemParam.Param770Str == '1') {
                 return
               }
               this.ksksLimit = true
               this.qkFlag = true
             })
 
-          if (this.isBoardPrePareSetPopupOpen &&
+          if (this.isBoardPrePareSetPopupOpen && (this.isSecondBoardPrePareSetPopupOpen && this.currentUser.kssycs == '2') && !this.isFirstBoardPrePareSetPopupBtnShow) {
-            (this.isSecondBoardPrePareSetPopupOpen && this.currentUser.kssycs == '2') &&
-            !this.isFirstBoardPrePareSetPopupBtnShow) {
             //上车准备
             // Image($r('app.media.sczb_btn')).commStyle()
             imageBtn({ btnWidth: 220 * this.ratio, btnHeight: 69 * this.ratio, imgSrc: $r('app.media.sczb_btn') })