人脸拍照修改&&东八时区修改

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

@@ -95,6 +95,7 @@ export default async function tempRequest<T>(req: any): Promise<T> {
           }
         }).catch(Error => {
           console.info('test-error0' + url + ' error:resp: ' + JSON.stringify(Error.message))
+          httpRequest.destroy();
           Prompt.showToast({
             message: Error?.message,
             duration: 5000

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

@@ -44,8 +44,7 @@ export default struct FaceCompare {
   build() {
     Column() {
       Column() {
-        Text('照片比对')
+        Text('照片比对')// .lineHeight('16%')
-          // .lineHeight('16%')
           .height('16%')
           .fontWeight(FontWeight.Bold)
           .fontSize(24)
@@ -81,8 +80,7 @@ export default struct FaceCompare {
         .height('52%')
         .justifyContent(FlexAlign.SpaceBetween)
 
-        Text('正在等待拍照…')
+        Text('正在等待拍照…')// .lineHeight('16%')
-          // .lineHeight('16%')
           .height('16%')
           .fontWeight(FontWeight.Bold)
           .fontColor('#CC7E00')
@@ -184,21 +182,20 @@ export default struct FaceCompare {
 
   async faceComparFn() {
     console.log('mmmmm0', 2)
-    this.param.pztd=this.param.rlls
+    this.param.pztd = this.param.rlls
-    const data=await takePhoto(this.param, this.context, 'jt/', 1,)
+    const data = await takePhoto(this.param, this.context, 'jt/', 1,)
-    this.base64=this.imageBase64 + data.base64
+    this.base64 = this.imageBase64 + data.base64
-    console.log('mmmmt',this.base64)
     faceCompare({
       sfzh: this.sfzh,
-      firstImage: this.firstImage.substr(22),
+      secondImage: this.firstImage.substr(22),
-      secondImage: data.base64,
+      firstImage: data.base64,
       type: 2,
       verifyType: 1
     })
       .then(res => {
         console.log('mmmmm8', JSON.stringify(res))
         // @ts-ignore
-        if (res.imageCompareRsp.head.resultCode=='0') {
+        if (res.imageCompareRsp.head.resultCode == '0') {
           this.controller.stop()
           this.showFaceCompare = !this.showFaceCompare
           this.showFaceCompareFlag = !this.showFaceCompareFlag
@@ -217,7 +214,15 @@ export default struct FaceCompare {
           })
 
         }
+      }).catch((err) => {
+      console.log(err)
+      this.times++;
+      //3s后开始语音提示
+      this.vocObj.playAudio({
+        type: 1,
+        name: 'face_fail.mp3'
       })
+    })
     console.log('mmmmm8', 9)
 
 
@@ -226,7 +231,7 @@ export default struct FaceCompare {
   async heartMsg(context) {
     let tmpList = []
     const str = this.lsh
-    console.log('this.lshbitbit',this.lsh,globalThis.carInfo.carNo,globalThis.carInfo.examinationRoomId)
+    console.log('this.lshbitbit', this.lsh, globalThis.carInfo.carNo, globalThis.carInfo.examinationRoomId)
     for (let i = 0; i < str.length; i++) {
       tmpList.push(string2Bytes(str.charCodeAt(i), 1 * 8)[0])
     }
@@ -253,8 +258,8 @@ export default struct FaceCompare {
       }
     }, 1000)
     globalThis.udpClient2.setMsgCallBack((val) => {
-      console.log('valvalval',globalThis.statue,JSON.stringify(val))
+      console.log('valvalval', globalThis.statue, JSON.stringify(val))
-      if(globalThis.statue!=3){
+      if (globalThis.statue != 3) {
         return
       }
       if (val.id == '48') {

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

@@ -422,7 +422,9 @@ export default struct SignDisplayCom {
     const str2=this.signArr[93].substr(4.2)
     this.signArr[93]=str2+str1+str0
     this.GPSColum[10].value =  this.signArr[93]
-
+    const hours=Number(this.signArr[94].substr(0,2))+8
+    this.signArr[94]=(hours>9?hours:'0'+hours)+this.signArr[94].substr(2,this.signArr[94].length-2)
+    // this.signArr[53]=192.168.7.170'
     // this.signArr[53]=192.168.7.170'
     this.sjxhColum = JSON.parse(JSON.stringify((this.sjxhColum)))
     that.signArr = JSON.parse(JSON.stringify((this.signArr)))

subject-two.iml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/entry/src/main/ets/pages/judgeSDK/dataTest" isTestSource="false" packagePrefix="com.duolun.vehterminal.dl_frontend.port" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/node_modules" />
+      <excludeFolder url="file://$MODULE_DIR$/oh_modules" />
+      <excludeFolder url="file://$MODULE_DIR$/.arkui-x/android/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/.arkui-x/android/app/build" />
+      <excludeFolder url="file://$MODULE_DIR$/.arkui-x/android/library/build" />
+      <excludeFolder url="file://$MODULE_DIR$/.arkui-x/ios/build" />
+      <excludeFolder url="file://$MODULE_DIR$/.arkui-x/android/app/.cxx" />
+      <excludeFolder url="file://$MODULE_DIR$/.arkui-x/android/library/.cxx" />
+      <excludeFolder url="file://$MODULE_DIR$/entry/build" />
+      <excludeFolder url="file://$MODULE_DIR$/entry/node_modules" />
+      <excludeFolder url="file://$MODULE_DIR$/entry/.cxx" />
+      <excludeFolder url="file://$MODULE_DIR$/entry/.test" />
+      <excludeFolder url="file://$MODULE_DIR$/entry/.preview" />
+      <excludeFolder url="file://$MODULE_DIR$/entry/oh_modules" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library name="ArkTS-API 9" type="ArkUI">
+        <CLASSES />
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$USER_HOME$/AppData/Local/OpenHarmony/Sdk/9/ets/api" />
+          <root url="file://$USER_HOME$/AppData/Local/OpenHarmony/Sdk/9/ets/component" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+  </component>
+</module>