diff --git a/entry/src/main/ets.zip b/entry/src/main/ets.zip new file mode 100644 index 00000000..779eb675 Binary files /dev/null and b/entry/src/main/ets.zip differ diff --git a/entry/src/main/ets/common/database.zip b/entry/src/main/ets/common/database.zip new file mode 100644 index 00000000..8fd575a8 Binary files /dev/null and b/entry/src/main/ets/common/database.zip differ diff --git a/entry/src/main/ets/pages/compontents/FaceCompare.ets b/entry/src/main/ets/pages/compontents/FaceCompare.ets index 522fea5f..74835c59 100644 --- a/entry/src/main/ets/pages/compontents/FaceCompare.ets +++ b/entry/src/main/ets/pages/compontents/FaceCompare.ets @@ -44,8 +44,7 @@ export default struct FaceCompare { build() { Column() { Column() { - Text('照片比对') - // .lineHeight('16%') + Text('照片比对')// .lineHeight('16%') .height('16%') .fontWeight(FontWeight.Bold) .fontSize(24) @@ -81,8 +80,7 @@ export default struct FaceCompare { .height('52%') .justifyContent(FlexAlign.SpaceBetween) - Text('正在等待拍照…') - // .lineHeight('16%') + Text('正在等待拍照…')// .lineHeight('16%') .height('16%') .fontWeight(FontWeight.Bold) .fontColor('#CC7E00') @@ -184,9 +182,9 @@ export default struct FaceCompare { async faceComparFn() { console.log('mmmmm0', 2) - this.param.pztd=this.param.rlls - const data=await takePhoto(this.param, this.context, 'jt/', 1,) - this.base64=this.imageBase64 + data.base64 + this.param.pztd = this.param.rlls + const data = await takePhoto(this.param, this.context, 'jt/', 1,) + this.base64 = this.imageBase64 + data.base64 faceCompare({ sfzh: this.sfzh, secondImage: this.firstImage.substr(22), @@ -197,7 +195,7 @@ export default struct FaceCompare { .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 @@ -216,7 +214,7 @@ export default struct FaceCompare { }) } - }).catch((err)=>{ + }).catch((err) => { console.log(err) this.times++; //3s后开始语音提示 @@ -233,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]) } @@ -260,8 +258,8 @@ export default struct FaceCompare { } }, 1000) globalThis.udpClient2.setMsgCallBack((val) => { - console.log('valvalval',globalThis.statue,JSON.stringify(val)) - if(globalThis.statue!=3){ + console.log('valvalval', globalThis.statue, JSON.stringify(val)) + if (globalThis.statue != 3) { return } if (val.id == '48') { diff --git a/entry/src/main/ets/pages/compontents/SignDisplayCom.ets b/entry/src/main/ets/pages/compontents/SignDisplayCom.ets index 60dbe634..6a6a7a7b 100644 --- a/entry/src/main/ets/pages/compontents/SignDisplayCom.ets +++ b/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))) diff --git a/subject-two.iml b/subject-two.iml new file mode 100644 index 00000000..68f82594 --- /dev/null +++ b/subject-two.iml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file