拍照不落盘base64补全

This commit is contained in:
lv 2025-04-29 13:01:38 +08:00
parent 03d28117cc
commit 23f8e37a3a

View File

@ -123,7 +123,7 @@ async function getfilehandleCode(td, param, dir, path, index) {
export async function getUserAlbumItemByDisplayName(displayName: string, day?, export async function getUserAlbumItemByDisplayName(displayName: string, day?,
type?): Promise<photoAccessHelper.Album> { type?): Promise<photoAccessHelper.Album> {
let fetchResult = null let fetchResult = null
let album: photoAccessHelper.Album = null let album: photoAccessHelper.Album = null
try { try {
@ -223,34 +223,61 @@ 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) => { // return new
console.log("baohaowen_detectLoop round end size1:" + snapResult.fileSize); return new Promise<takePhotoParam>(async (resolve, reject) => {
callback({ fileSize: snapResult.fileSize, errorCode: snapResult.errorCode }) 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 { } else {
return new Promise<takePhotoParam>(async (resolve, reject) => { return new Promise<takePhotoParam>(async (resolve, reject) => {
const time = await getCurrentTime() const time = await getCurrentTime()
const date = time.split(' ')[0] const date = time.split(' ')[0]
let dirName = dir ? dir : date 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) { if (snapResult.result && snapResult.errorCode == 0) {
resolve({ console.log("baohaowen_detectLoop round end size1:" + snapResult.fileSize, snapResult.dataString);
base64: snapResult.dataString, callback && callback({
name: snapResult.fileName,
fileSize: snapResult.fileSize, fileSize: snapResult.fileSize,
errorCode: snapResult.errorCode, errorCode: snapResult.errorCode,
path: snapResult.filePath base64: snapResult.dataString
}) })
resolve({ fileSize: snapResult.fileSize, errorCode: snapResult.errorCode, base64: snapResult.dataString })
} else { } else {
promptAction.showToast({ promptAction.showToast({
message: `拍照失败`, message: `拍照失败`,
duration: 3000 duration: 3000
}); });
reject(false) 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()
// }
//
// });
}) })
} }
} }
@ -268,7 +295,7 @@ export async function deleteAllFileByPiC(dirName, type = 1) {
} }
export async function deleteAllVideos(context, type: photoAccessHelper.AlbumType, export async function deleteAllVideos(context, type: photoAccessHelper.AlbumType,
subType: photoAccessHelper.AlbumSubtype): Promise<void> { subType: photoAccessHelper.AlbumSubtype): Promise<void> {
let fetchResult: photoAccessHelper.FetchResult<photoAccessHelper.Album> = null; let fetchResult: photoAccessHelper.FetchResult<photoAccessHelper.Album> = null;
try { try {
const userFileMgr = photoAccessHelper.getPhotoAccessHelper(context); const userFileMgr = photoAccessHelper.getPhotoAccessHelper(context);