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

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

@@ -133,11 +133,8 @@ export default struct Index {
 
                 })
               } else {
-                Image(item).width('18%').height('24%').onClick(() => {
-                  this.vocObj.playAudio({
-                    type: 1,
-                    name: 'media_button.wav'
-                  })
+                imageBtn({btnWidth:'18%',btnHeight:'24%',imgSrc:item})
+                  .onClick(() => {
                   this.url = ''
                   if (index < 9) {
                     this.inputTextArr[this.currentInputIndex] += (index + 1).toString()

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

@@ -1046,7 +1046,7 @@ struct UserInfo {
             this.prevClick()
           })
         Image($r('app.media.dk_next')).width(90 * this.ratio).height(70 * this.ratio).onClick(() => {
-          this.avPlayer.playAudio(['button_media.wav'])
+          // this.avPlayer.playAudio(['button_media.wav'])
           this.nextClick()
         })
       }.margin({ top: 40 * this.ratio, bottom: 10 * this.ratio })
@@ -1160,7 +1160,7 @@ struct UserInfo {
             }
             .commStyle()
             .onClick(() => {
-              this.avPlayer.playAudio(['button_media.wav'])
+              // this.avPlayer.playAudio(['button_media.wav'])
               this.ksksLimit = false
               this.qkFlag = false
             })
@@ -1170,7 +1170,7 @@ struct UserInfo {
             }
             .commStyle()
             .onClick(() => {
-              this.avPlayer.playAudio(['button_media.wav'])
+              // this.avPlayer.playAudio(['button_media.wav'])
               this.qkFn()
             })
           }.position({ y: 265 * this.ratio, x: 115 * this.ratio })

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

@@ -420,6 +420,8 @@ export default struct SignDisplayCom {
     const str1=this.signArr[93].substr(2,2)
     const str2=this.signArr[93].substr(4.2)
     this.signArr[93]=str2+str1+str0
+    this.GPSColum[10].value =  this.signArr[93]
+
     // this.signArr[53]=192.168.7.170'
     this.sjxhColum = JSON.parse(JSON.stringify((this.sjxhColum)))
     that.signArr = JSON.parse(JSON.stringify((this.signArr)))

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

@@ -35,10 +35,10 @@ export default struct TopLogo {
         }
         imageBtn({btnWidth:'16.7%',btnHeight:'12.2%',imgSrc:$r('app.media.topB_back')})
           .onClick(() => {
-            this.vocObj.playAudio({
-              type: 1,
-              name: 'button_media.wav'
-            })
+            // this.vocObj.playAudio({
+            //   type: 1,
+            //   name: 'button_media.wav'
+            // })
             this.outFlag = true
             router.back()
           })