Merge remote-tracking branch 'origin/dev' into dev

build-profile.json5

@@ -4,13 +4,13 @@
       {
         "name": "default",
         "material": {
-          "certpath": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.cer",
+          "certpath": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.cer",
-          "storePassword": "0000001BE4BBADDF656A884E7A7BB5FD51F64FBB61DD24A944FEA969482DD693210ED5FF3D29F13642E3A3",
+          "storePassword": "0000001BA3F5B544CB3F01A0085BA69DF10373C170A983B9DEBCCEEFF83C818BD9798696788FC466A6AEC2",
           "keyAlias": "debugKey",
-          "keyPassword": "0000001BDEFFDC280B45617E7FC447CB21F2D133540301F543454643D3F5E9F6E5ED2A583A7FA92B260433",
+          "keyPassword": "0000001BE763C58C9CD4B93E5D566C87DD1F5A2D2BF96F6C2DE5BF82499477DD12E10F45E8E1A882AFCAB4",
-          "profile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p7b",
+          "profile": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.p7b",
           "signAlg": "SHA256withECDSA",
-          "storeFile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject-two_com.oh.dts.p12"
+          "storeFile": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.p12"
         }
       }
     ],

entry/oh-package-lock.json5

@@ -1,5 +1,5 @@
 {
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
   "specifiers": {
     "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6"
@@ -7,9 +7,7 @@
   "packages": {
     "@ohos/hypium@1.0.6": {
       "resolved": "https://ohpm.openharmony.cn/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz",
-      "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==",
+      "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ=="
-      "registryType": "ohpm",
-      "shasum": "3f5fed65372633233264b3447705b0831dfe7ea1"
     }
   }
 }

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

@@ -246,6 +246,9 @@ export default class UdpClientByCenter {
       for (let i = 0; i < dataView?.byteLength; ++i) {
         arr[i] = dataView?.getUint8(i)
       }
+      if(!arr.length){
+        return
+      }
       let idNum = '0x' + fillZero(arr[1].toString(16), 2) + fillZero(arr[0].toString(16), 2);
       let id = Math.floor(+idNum / 1000)
 

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

@@ -90,6 +90,7 @@ struct UserInfo {
     'Param364': '0', //考前上车准备
     'Param398': '0', //考前上车准备
     'Param835': '0', //考前上车准备
+    'Param850': '0', //考前上车准备
   }
   @State startExam: boolean = false
   // 过程照片拍照
@@ -540,6 +541,10 @@ struct UserInfo {
         if (sys.v_no === '835') {
           that.systemParam.Param835 = sys.v_value;
         }
+        //盲考
+        if (sys.v_no === '850') {
+          that.systemParam.Param850 = sys.v_value;
+        }
         // 开始考试前必须解开安全带或关车门
         if (sys.v_no === '803') {
           that.systemParam.Param803Str = sys.v_value + '';
@@ -1138,12 +1143,12 @@ struct UserInfo {
                 CommText({
                   ratio: this.ratio,
                   color: item.sfzmhm != this.currentUser.sfzmhm ? '#FFFFFF' : '#000000',
-                  text: item.lsh
+                  text: this.systemParam.Param850&&Number(this.systemParam.Param850)>0?"*****":item.lsh
                 })
                 CommText({
                   ratio: this.ratio,
                   color: item.sfzmhm != this.currentUser.sfzmhm ? '#FFFFFF' : '#000000',
-                  text: decodeURIComponent(item.xm)
+                  text: this.systemParam.Param850&&Number(this.systemParam.Param850)>0?"*****":decodeURIComponent(item.xm)
                 })
               }
             }
@@ -1212,7 +1217,42 @@ struct UserInfo {
 
           Column() {
             ForEach(this.labelBlocks, (item) => {
+              if(this.systemParam.Param850=='1'){
+                LabelBlock({ label: item.label, ratio: this.ratio, value:'*****'})
+              }
+              else if(this.systemParam.Param850=='2'){
+                if(item.key=='xm'){
+                  LabelBlock({ label: item.label, ratio: this.ratio, value: this.currentUser.xh })
+                }else if(item.key=='ksxl'){
                   LabelBlock({ label: item.label, ratio: this.ratio, value: this.currentUser[item.key] })
+                }else{
+                  LabelBlock({ label: item.label, ratio: this.ratio, value: '*****' })
+                }
+              }else if(this.systemParam.Param850=='4'){
+                if(item.key=='ksxl'){
+                  LabelBlock({ label: item.label, ratio: this.ratio, value: '*****' })
+                }else{
+                  LabelBlock({ label: item.label, ratio: this.ratio, value: this.currentUser[item.key] })
+                }
+              }else if(this.systemParam.Param850=='5'){
+                if(item.key=='xm'){
+                  LabelBlock({ label: item.label, ratio: this.ratio, value: this.currentUser.xh })
+                }else{
+                  LabelBlock({ label: item.label, ratio: this.ratio, value: '*****' })
+                }
+              }else if(this.systemParam.Param850=='6'){
+                if(item.key=='ksxl'){
+                  LabelBlock({ label: item.label, ratio: this.ratio, value: this.currentUser.ksxl })
+                }else if(item.key=='sfzmhm'){
+                  LabelBlock({ label: item.label, ratio: this.ratio, value: this.currentUser.sfzmhm.slice(-6) })
+                }else{
+                  LabelBlock({ label: item.label, ratio: this.ratio, value: '*****' })
+                }
+              }
+              else{
+                LabelBlock({ label: item.label, ratio: this.ratio, value: this.currentUser[item.key] })
+
+              }
             })
           }
         }
@@ -1278,8 +1318,8 @@ struct UserInfo {
                 if (this.systemParam.Param612Str == '1') {
                   return
                 }
-                if(Number(this.systemParam.Param835)<=Number(this.currentUser.yycs)){
+                if(this.systemParam.Param835&&this.currentUser.yycs&&Number(this.systemParam.Param835)<=Number(this.currentUser.yycs)){
-                  this.type='3'
+                  this.type='4'
                   this.title='当前考生预约考试次数为'+this.currentUser.yycs
                   this.errorDialog.open()
                   return
@@ -1441,4 +1481,5 @@ type systemParam = {
   'Param364': string, //考前上车准备
   'Param398': string, //考前上车准备
   'Param835': string, //考前上车准备
+  'Param850': string, //考前上车准备
 }

entry/src/main/ets/pages/compontents/errorMsgDialog.ets

@@ -99,9 +99,37 @@ export default struct errorMsgDialog {
 
         .padding({ bottom: 20 })
       }
+      if (this.type == '4') {
+        Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
+          Text('  确   定  ')
+            .fontSize(24 * globalThis.ratio * this.dialogRatio * 0.6)
+            .fontColor('#fff')
+            .width(60 * globalThis.ratio * this.dialogRatio)
         }
-.
+        .commStyle()
-backgroundColor('#E6E3DF')
+        .onClick(() => {
+          const errorCode = AppStorage.Get('errorCode');
+          const errorCodeFlage = AppStorage.Get('errorCodeFlage');
+          console.log('errorCode', errorCode, errorCodeFlage)
+          if (errorCode == 0 && errorCodeFlage) {
+            router.replaceUrl({
+              url: 'pages/Index',
+            }, router.RouterMode.Single);
+            router.clear();
+
+          }
+          console.log('errorCode', errorCode, errorCodeFlage)
+
+          if (this.controller != undefined) {
+            this.confirm()
+            this.controller.close()
+          }
+        }
+
+        )
+      }
+    }
+    .backgroundColor('#E6E3DF')
     .borderRadius(19 * globalThis.ratio)
     .constraintSize({ minWidth: 520 })
   }