From 4fd20c9d922978287b726b5cdcdc9b1e8c257d53 Mon Sep 17 00:00:00 2001
From: lv <1344032923@qq.com>
Date: Tue, 29 Apr 2025 16:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=90=BD=E7=9B=98=E6=8B=8D=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entry/src/main/ets/utils/Video.ets | 52 ++++++++++++++----------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/entry/src/main/ets/utils/Video.ets b/entry/src/main/ets/utils/Video.ets
index e8284c9..0fde8c6 100644
--- a/entry/src/main/ets/utils/Video.ets
+++ b/entry/src/main/ets/utils/Video.ets
@@ -168,7 +168,7 @@ export async function takePhoto(
 
   if (flag === 0) {
     return new Promise<takePhotoParam>((resolve, reject) => {
-      rtsp_server.detectVideoSnapshotSize(video_uri, fileName, (err: BusinessError, snapResult: record.RtspResult) => {
+      rtsp_server.detectVideoSnapshotSize(video_uri, fileName, false,(err: BusinessError, snapResult: record.RtspResult) => {
         if (snapResult && snapResult.errorCode === 0) {
           const result: takePhotoParam = {
             fileSize: snapResult.fileSize,
@@ -197,35 +197,31 @@ export async function takePhoto(
       const time = GetCurrentTime();
       const date = time.split(' ')[0];
       const dirName = dir || date;
-
-      rtsp_server.getVideoSnapshot(
-        context,
-        video_uri,
-        fileName,
-        dirName,
-        true,
-        (err: BusinessError, snapResult: record.RtspResult) => {
-          if (snapResult && snapResult.errorCode === 0) {
-            resolve({
-              base64: snapResult.dataString,
-              name: snapResult.fileName,
-              fileSize: snapResult.fileSize,
-              errorCode: snapResult.errorCode,
-            });
-          } else {
-            promptAction.showToast({
-              message: `拍照失败`,
-              duration: 3000,
-            });
-            reject({
-              name: fileName,
-              base64: '',
-              fileSize: 0,
-              errorCode: err ? err.code : -1,
-            });
+      rtsp_server.detectVideoSnapshotSize(video_uri, fileName, true,(err: BusinessError, snapResult: record.RtspResult) => {
+        if (snapResult && snapResult.errorCode === 0) {
+          const result: takePhotoParam = {
+            fileSize: snapResult.fileSize,
+            errorCode: snapResult.errorCode,
+            base64: snapResult.dataString,
+          };
+          if (callback) {
+            callback(result);
           }
+          resolve(result);
+        } else {
+          promptAction.showToast({
+            message: `拍照失败`,
+            duration: 3000,
+          });
+          reject({
+            name: fileName,
+            base64: '',
+            fileSize: 0,
+            errorCode: err ? err.code : -1,
+          });
         }
-      );
+      });
+
     });
   }
 }