feat(HikVision): add CapturePicture method

src/components/BootstrapBlazor.HikVision/BootstrapBlazor.HikVision.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>10.0.7</Version>
+    <Version>10.0.9</Version>
   </PropertyGroup>
 
   <PropertyGroup>

src/components/BootstrapBlazor.HikVision/Components/HikVisionWebPlugin.razor.cs

@@ -115,6 +115,16 @@ public partial class HikVisionWebPlugin
     /// </summary>
     public bool IsRealPlaying { get; private set; }
 
+    /// <summary>
+    /// 获得 是否已经打开声音
+    /// </summary>
+    public bool IsOpenSound { get; private set; }
+
+    /// <summary>
+    /// 获得 是否开始录像
+    /// </summary>
+    public bool IsStartRecord { get; private set; }
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -164,6 +174,7 @@ public async Task Logout()
         {
             await InvokeVoidAsync("logout", Id);
         }
+        IsStartRecord = false;
         IsRealPlaying = false;
         IsLogin = false;
         await TriggerLogout();
@@ -221,6 +232,7 @@ public async Task StopRealPlay()
         {
             await InvokeVoidAsync("stopRealPlay", Id);
             IsRealPlaying = false;
+            IsStartRecord = false;
             await TriggerStopRealPlay();
         }
     }
@@ -281,6 +293,7 @@ public async Task<bool> OpenSound()
         {
             var code = await InvokeAsync<int>("openSound", Id);
             ret = code == 100;
+            IsOpenSound = true;
         }
         return ret;
     }
@@ -296,6 +309,7 @@ public async Task<bool> CloseSound()
         {
             var code = await InvokeAsync<int>("closeSound", Id);
             ret = code == 100;
+            IsOpenSound = false;
         }
         return ret;
     }
@@ -320,54 +334,30 @@ public async Task<bool> SetVolume(int value)
     /// 抓图方法并且下载方法
     /// </summary>
     /// <returns></returns>
-    public async Task CapturePictureAndDownload()
+    public async Task<bool> CapturePictureAndDownload(string? fileName = null, CancellationToken token = default)
     {
+        var ret = false;
         if (IsLogin && IsRealPlaying)
         {
-            await InvokeVoidAsync("capturePictureAndDownload", Id);
+            ret = await InvokeAsync<bool>("capturePictureAndDownload", token, Id, fileName);
         }
+        return ret;
     }
 
-    private TaskCompletionSource<IJSStreamReference?>? _captureTaskCompletionSource = null;
-
     /// <summary>
     /// 抓图方法返回 <see cref="IJSStreamReference"/> 实例
     /// </summary>
     /// <returns></returns>
-    public async Task<IJSStreamReference?> CapturePicture(CancellationToken token = default)
+    public async Task<bool> CapturePicture(string? fileName = null, CancellationToken token = default)
     {
-        IJSStreamReference? ret = null;
+        var ret = false;
         if (IsLogin && IsRealPlaying)
         {
-            _captureTaskCompletionSource = new();
-
-            try
-            {
-                await InvokeVoidAsync("capturePicture", token, Id);
-                ret = await _captureTaskCompletionSource.Task;
-            }
-            catch (Exception ex)
-            {
-                _captureTaskCompletionSource.SetException(ex);
-            }
+            ret = await InvokeAsync<bool>("capturePicture", token, Id, fileName);
         }
         return ret;
     }
 
-    /// <summary>
-    /// 抓图返回文件流方法 由 Javascript 调用
-    /// </summary>
-    /// <param name="stream"></param>
-    /// <returns></returns>
-    [JSInvokable]
-    public async Task TriggerReceivePictureStream(IJSStreamReference stream)
-    {
-        if (_captureTaskCompletionSource != null)
-        {
-            _captureTaskCompletionSource.SetResult(stream);
-        }
-    }
-
     /// <summary>
     /// 开始录像方法
     /// </summary>
@@ -378,6 +368,7 @@ public async Task<bool> StartRecord()
         if (IsLogin && IsRealPlaying)
         {
             ret = await InvokeAsync<bool>("startRecord", Id);
+            IsStartRecord = ret;
         }
         return ret;
     }
@@ -392,6 +383,10 @@ public async Task<bool> StopRecord()
         if (IsLogin && IsRealPlaying)
         {
             ret = await InvokeAsync<bool>("stopRecord", Id);
+            if (ret)
+            {
+                IsStartRecord = false;
+            }
         }
         return ret;
     }

src/components/BootstrapBlazor.HikVision/wwwroot/hikvision.js

@@ -409,24 +409,24 @@ export async function setVolume(id, value) {
     return code;
 }
 
-export async function capturePicture(id) {
+export function capturePicture(id, szFileName) {
     const vision = Data.get(id);
     const { realPlaying } = vision;
 
     if (realPlaying !== true) {
-        return "";
+        return false;
     }
 
     try {
-        const base64 = await WebVideoCtrl.I_CapturePicData();
-        if (base64) {
-            const bytes = base64ToArray(base64);
-            return DotNet.createJSStreamReference(bytes.buffer);
+        if (!szFileName) {
+            szFileName = `capture_${new Date().getTime()}`;
         }
+        WebVideoCtrl.I_CapturePic(szFileName);
+        return true;
     }
     catch (ex) {
         console.log(ex);
-        return null;
+        return false;
     }
 }
 
@@ -443,28 +443,34 @@ const base64ToArray = base64String => {
     return bytes;
 }
 
-export async function capturePictureAndDownload(id) {
+export async function capturePictureAndDownload(id, szFileName) {
     const vision = Data.get(id);
     const { realPlaying } = vision;
 
     if (realPlaying !== true) {
-        return;
+        return false;
     }
 
+    let ret = false;
     try {
         const base64 = await WebVideoCtrl.I_CapturePicData();
         if (base64) {
+            if (!szFileName) {
+                szFileName = `capture_${new Date().getTime()}.jpg`
+            }
             const anchorElement = document.createElement('a');
             anchorElement.href = `data:image/jpg;base64,${base64}`;
-            anchorElement.download = `capture_${new Date().getTime()}.jpg`;
+            anchorElement.download = szFileName;
             document.body.appendChild(anchorElement);
             anchorElement.click();
             document.body.removeChild(anchorElement);
+            ret = true;
         }
     }
     catch (ex) {
         console.log(ex);
     }
+    return ret;
 }
 
 export async function startRecord(id) {