拍照不落盘base64补全
This commit is contained in:
		
							parent
							
								
									03d28117cc
								
							
						
					
					
						commit
						23f8e37a3a
					
				| @ -223,34 +223,61 @@ export async function takePhoto(param, context, dir, flag = 1, callback?) { | ||||
|   // @ts-ignore
 | ||||
|   // var snapResult = rtsp_server.getVideoSnapshot(context, video_uri, '', dir);
 | ||||
|   if (flag == 0) { | ||||
|     rtsp_server.detectVideoSnapshotSize(video_uri, fileName, (err, snapResult) => { | ||||
|       console.log("baohaowen_detectLoop round end size1:" + snapResult.fileSize); | ||||
|       callback({ fileSize: snapResult.fileSize, errorCode: snapResult.errorCode }) | ||||
|     // return new
 | ||||
|     return new Promise<takePhotoParam>(async (resolve, reject) => { | ||||
|       rtsp_server.detectVideoSnapshotSize(video_uri, fileName, false, (err, snapResult) => { | ||||
|         console.log("baohaowen_detectLoop round end size1:" + snapResult.fileSize, snapResult.dataString); | ||||
|         callback && callback({ | ||||
|           fileSize: snapResult.fileSize, | ||||
|           errorCode: snapResult.errorCode, | ||||
|           base64: snapResult.dataString | ||||
|         }) | ||||
|         resolve({ fileSize: snapResult.fileSize, errorCode: snapResult.errorCode, base64: snapResult.dataString }) | ||||
|       }); | ||||
|     }) | ||||
| 
 | ||||
|   } else { | ||||
|     return new Promise<takePhotoParam>(async (resolve, reject) => { | ||||
|       const time = await getCurrentTime() | ||||
|       const date = time.split(' ')[0] | ||||
|       let dirName = dir ? dir : date | ||||
|       rtsp_server.getVideoSnapshot(context, video_uri, fileName, dirName, true, async (err, snapResult) => { | ||||
|       rtsp_server.detectVideoSnapshotSize(video_uri, fileName, true, (err, snapResult) => { | ||||
|         if (snapResult.result && snapResult.errorCode == 0) { | ||||
|           resolve({ | ||||
|             base64: snapResult.dataString, | ||||
|             name: snapResult.fileName, | ||||
|           console.log("baohaowen_detectLoop round end size1:" + snapResult.fileSize, snapResult.dataString); | ||||
|           callback && callback({ | ||||
|             fileSize: snapResult.fileSize, | ||||
|             errorCode: snapResult.errorCode, | ||||
|             path: snapResult.filePath | ||||
|             base64: snapResult.dataString | ||||
|           }) | ||||
|           resolve({ fileSize: snapResult.fileSize, errorCode: snapResult.errorCode, base64: snapResult.dataString }) | ||||
|         } else { | ||||
|           promptAction.showToast({ | ||||
|             message: `拍照失败`, | ||||
|             duration: 3000 | ||||
|           }); | ||||
|           reject(false) | ||||
|           // reject()
 | ||||
|         } | ||||
| 
 | ||||
|       }); | ||||
|       // rtsp_server.getVideoSnapshot(context, video_uri, fileName, dirName, true, async (err, snapResult) => {
 | ||||
|       //   if (snapResult.result && snapResult.errorCode == 0) {
 | ||||
|       //     resolve({
 | ||||
|       //       base64: snapResult.dataString,
 | ||||
|       //       name: snapResult.fileName,
 | ||||
|       //       fileSize: snapResult.fileSize,
 | ||||
|       //       errorCode: snapResult.errorCode,
 | ||||
|       //       path: snapResult.filePath
 | ||||
|       //     })
 | ||||
|       //   } else {
 | ||||
|       //     promptAction.showToast({
 | ||||
|       //       message: `拍照失败`,
 | ||||
|       //       duration: 3000
 | ||||
|       //     });
 | ||||
|       //     reject(false)
 | ||||
|       //     // reject()
 | ||||
|       //   }
 | ||||
|       //
 | ||||
|       // });
 | ||||
|     }) | ||||
|   } | ||||
| } | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user