Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
		
						commit
						379f4c8778
					
				| @ -4,13 +4,13 @@ | |||||||
|       { |       { | ||||||
|         "name": "default", |         "name": "default", | ||||||
|         "material": { |         "material": { | ||||||
|           "certpath": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject_two_git_com.oh.dts.cer", |           "certpath": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two2_com.oh.dts.cer", | ||||||
|           "storePassword": "0000001B6A24D25D8FE60B28F302A471AE62F85272A82295ABB715D5DAA874E56338B643E7ED6CCF706BEC", |           "storePassword": "0000001BE1869C350CC47385898E8BD73BD9A455D1886BA385CD349B7C5ADE3BCFB7A29422CB379DD38D60", | ||||||
|           "keyAlias": "debugKey", |           "keyAlias": "debugKey", | ||||||
|           "keyPassword": "0000001B6C2C6D7BE6CBC29BC9D356DDBF0C5D88D3BA97E0994DD5C78409CAA52639698A9374E235B64DAA", |           "keyPassword": "0000001B9F28F62DC3596874829120C11C241553B9134766FDA5315E81776F4AB7C392D24F996EDE2E3E5A", | ||||||
|           "profile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject_two_git_com.oh.dts.p7b", |           "profile": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two2_com.oh.dts.p7b", | ||||||
|           "signAlg": "SHA256withECDSA", |           "signAlg": "SHA256withECDSA", | ||||||
|           "storeFile": "/Users/surenjun/.ohos/config/openharmony/auto_ohos_default_subject_two_git_com.oh.dts.p12" |           "storeFile": "C:\\Users\\13440\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two2_com.oh.dts.p12" | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     ], |     ], | ||||||
|  | |||||||
| @ -218,7 +218,8 @@ export async function takePhoto(param, context, dir, flag = 1, callback?) { | |||||||
|   // @ts-ignore
 |   // @ts-ignore
 | ||||||
|   // var snapResult = rtsp_server.getVideoSnapshot(context, video_uri, '', dir);
 |   // var snapResult = rtsp_server.getVideoSnapshot(context, video_uri, '', dir);
 | ||||||
|   if (flag == 0) { |   if (flag == 0) { | ||||||
|     rtsp_server.detectVideoSnapshotSize(video_uri, fileName, (err, snapResult) => { |     // @ts-ignore
 | ||||||
|  |     rtsp_server.detectVideoSnapshotSize(video_uri, fileName, false,(err, snapResult) => { | ||||||
|       console.log("baohaowen_detectLoop round end size1:" + snapResult.fileSize); |       console.log("baohaowen_detectLoop round end size1:" + snapResult.fileSize); | ||||||
|       callback({ fileSize: snapResult.fileSize, errorCode: snapResult.errorCode }) |       callback({ fileSize: snapResult.fileSize, errorCode: snapResult.errorCode }) | ||||||
|     }); |     }); | ||||||
|  | |||||||
| @ -380,7 +380,7 @@ export default class UdpClientByCenter { | |||||||
|       } |       } | ||||||
|       // console.info('surenjun2','set message_1Fn=>' + newArr.toString())
 |       // console.info('surenjun2','set message_1Fn=>' + newArr.toString())
 | ||||||
|       callback && callback(newArr.toString()) |       callback && callback(newArr.toString()) | ||||||
|       console.info('surenjun 左方向灯=>', newArr.toString()) |       // console.info('surenjun 左方向灯=>', newArr.toString())
 | ||||||
|       this.currentValue = newArr.toString(); |       this.currentValue = newArr.toString(); | ||||||
|     } else { |     } else { | ||||||
|       callback && callback('') |       callback && callback('') | ||||||
|  | |||||||
| @ -187,8 +187,8 @@ export default struct FaceCompare { | |||||||
|     this.base64 = this.imageBase64 + data.base64 |     this.base64 = this.imageBase64 + data.base64 | ||||||
|     faceCompare({ |     faceCompare({ | ||||||
|       sfzh: this.sfzh, |       sfzh: this.sfzh, | ||||||
|       secondImage: this.firstImage.substr(22), |       secondImage:data.base64, | ||||||
|       firstImage: data.base64, |       firstImage: this.firstImage.substr(22), | ||||||
|       type: 2, |       type: 2, | ||||||
|       verifyType: 1 |       verifyType: 1 | ||||||
|     }) |     }) | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user