Merge pull request 'lv_chengmai' (#42) from lv_chengmai into main

Reviewed-on: #42

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

@@ -73,6 +73,20 @@ struct UserInfo {
   @State FaceOpenStatue: string = '0'; //是否开启人脸识别
   subscriber;
   @State faceCatchImg: string = ''
+  // 过程照片拍照
+  getPhoto = async (empty?: boolean) => {
+    const singlePlay = globalThis.singlePlay
+    //单机模式返回空照片
+    if (singlePlay) {
+      return ''
+    } else {
+      const {filePhoto} = this;
+      const photoBase64 = await filePhoto.getPhoto();
+      return photoBase64
+    }
+  }
+  private filePhoto: FilePhoto
+  private avPlayer
   private AccountTable = new AccountTable(() => {
   }, USER);
   private context = getContext(this) as common.UIAbilityContext;
@@ -345,6 +359,13 @@ struct UserInfo {
     }
     this.pageIndex++;
     this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
+    this.dataList.forEach(listData => {
+      for (let i in listData) {
+        listData[i] = decodeURI(listData[i])
+      }
+      listData.kszp = this.photo + listData.kszp
+      listData.ksmjzp = this.photo + listData.ksmjzp
+    })
   }
 
   prevClick() {
@@ -353,6 +374,13 @@ struct UserInfo {
     }
     this.pageIndex--;
     this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
+    this.dataList.forEach(listData => {
+      for (let i in listData) {
+        listData[i] = decodeURI(listData[i])
+      }
+      listData.kszp = this.photo + listData.kszp
+      listData.ksmjzp = this.photo + listData.ksmjzp
+    })
   }
 
   //获取下载考生
@@ -492,11 +520,7 @@ struct UserInfo {
       return
     }
     // }
-    this.AccountTable.query('0', (result) => {
+    await upDateTableByArray('USER', [this.currentUser])
-      if (result.length == 0) {
-        this.isExamStart = true
-        this.AccountTable.insertData(this.currentUser, (id) => {
-          this.AccountTable.query('0', (result) => {
     globalThis.statue = 4
     this.stepFlag = false
     router.pushUrl({
@@ -508,39 +532,7 @@ struct UserInfo {
       }
     }, router.RouterMode.Single);
     this.stopDeviceById()
-          })
-        })
-      } else {
-        this.AccountTable.updateData(this.currentUser, (id) => {
-          this.AccountTable.query('0', (result) => {
     this.stepFlag = false
-            router.pushUrl({
-              url:'pages/Judge',
-              params: {
-                examItems: examItems?.getExaminationItemRsp?.body?.ykxx ,
-                sczb:Number(this.isBoardPrePareSetPopupOpen),
-                kfdm:this.sczbkf
-              }
-            }, router.RouterMode.Single);
-            globalThis.statue = 4
-            this.stopDeviceById()
-          })
-        })
-      }
-    })
-    this.stepFlag = false
-  }
-  // 过程照片拍照
-  getPhoto = async (empty?: boolean) => {
-    const singlePlay = globalThis.singlePlay
-    //单机模式返回空照片
-    if (singlePlay) {
-      return ''
-    } else {
-      const {filePhoto} = this;
-      const photoBase64 = await filePhoto.getPhoto();
-      return photoBase64
-    }
   }
 
   // 检测车门、熄火信号
@@ -554,7 +546,8 @@ struct UserInfo {
         const msgArr = msg.split(',')
         const mkg = msgArr[14];
         const fdjzs = msgArr[25];
-        globalThis.udpClient.onMessage_1(()=>{});
+        globalThis.udpClient.onMessage_1(() => {
+        });
         //TODO
         console.info('surenjun mkg=>', mkg)
         console.info('surenjun fdjzs=>', fdjzs)
@@ -578,6 +571,7 @@ struct UserInfo {
       })
     })
   }
+
   // 开始考试
   async beginExam() {
     const carInfo = globalThis.carInfo;
@@ -772,10 +766,7 @@ struct UserInfo {
                   if (globalThis.singlePlay) {
                     const {examSubject} = globalThis.carInfo;
                     console.info('surenjun => sczbkf', JSON.stringify(this.sczbkf))
-                    this.AccountTable.query('0', (result) => {
+                    await upDateTableByArray('USER', [this.currentUser])
-                      if (result.length == 0) {
-                        this.AccountTable.insertData(this.currentUser, (id) => {
-                          this.AccountTable.query('0', (result) => {
                     router.pushUrl({
                       url: examSubject == 3 ? 'pages/Roads' : 'pages/Judge',
                       params: {
@@ -784,23 +775,6 @@ struct UserInfo {
                       }
                     }, router.RouterMode.Single);
                     this.stopDeviceById()
-                          })
-                        })
-                      } else {
-                        this.AccountTable.updateData(this.currentUser, (id) => {
-                          this.AccountTable.query('0', (result) => {
-                            router.pushUrl({
-                              url: examSubject == 3?'pages/Roads':'pages/Judge',
-                              params:{
-                                sczb:Number(this.isBoardPrePareSetPopupOpen),
-                                kfdm:this.sczbkf
-                              }
-                            }, router.RouterMode.Single);
-                            this.stopDeviceById()
-                          })
-                        })
-                      }
-                    })
                     return
                   }
                   if (this.FaceOpenStatue != '0') {