feat(HikVision): add OnGetChannelsAsync parameter

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>10.0.0-beta02</Version>
+    <Version>10.0.0-beta03</Version>
   </PropertyGroup>
 
   <PropertyGroup>

src/components/BootstrapBlazor.HikVision/Components/HikVisionAnalogChannelInfo.cs

@@ -0,0 +1,31 @@
+// Copyright (c) BootstrapBlazor & Argo Zhang ([email protected]). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+namespace BootstrapBlazor.Components;
+
+/// <summary>
+/// 模拟通道信息
+/// </summary>
+public class HikVisionAnalogChannelInfo()
+{
+    /// <summary>
+    /// 获得 通道 Id
+    /// </summary>
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 获得 通道号
+    /// </summary>
+    public int InputPort { get; set; }
+
+    /// <summary>
+    /// 获得 通道名称
+    /// </summary>
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// 获得 通道制式
+    /// </summary>
+    public string? VideoFormat { get; set; }
+}

src/components/BootstrapBlazor.HikVision/Components/HikVisionChannel.cs

@@ -0,0 +1,26 @@
+// Copyright (c) BootstrapBlazor & Argo Zhang ([email protected]). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+namespace BootstrapBlazor.Components;
+
+/// <summary>
+/// 海康威视网络摄像机通道信息
+/// </summary>
+public class HikVisionChannel
+{
+    /// <summary>
+    /// 获得/设置 模拟通道信息集合
+    /// </summary>
+    public List<HikVisionAnalogChannelInfo> AnalogChannels { get; set; } = [];
+
+    /// <summary>
+    /// 获得/设置 数字通道信息集合
+    /// </summary>
+    public List<HikVisionDigitalChannelInfo> DigitalChannels { get; set; } = [];
+
+    /// <summary>
+    /// 获得/设置 数字通道信息集合
+    /// </summary>
+    public List<HikVisionZeroChannelInfo> ZeroChannels { get; set; } = [];
+}

src/components/BootstrapBlazor.HikVision/Components/HikVisionDigitalChannelInfo.cs

@@ -0,0 +1,31 @@
+// Copyright (c) BootstrapBlazor & Argo Zhang ([email protected]). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+namespace BootstrapBlazor.Components;
+
+/// <summary>
+/// 模拟通道信息
+/// </summary>
+public class HikVisionDigitalChannelInfo()
+{
+    /// <summary>
+    /// 获得 通道 Id
+    /// </summary>
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 获得 通道号
+    /// </summary>
+    public int InputPort { get; set; }
+
+    /// <summary>
+    /// 获得 通道名称
+    /// </summary>
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// 获得 通道制式
+    /// </summary>
+    public string? VideoFormat { get; set; }
+}

src/components/BootstrapBlazor.HikVision/LoginType.cs → src/components/BootstrapBlazor.HikVision/Components/HikVisionLoginType.cs

@@ -7,7 +7,7 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// 登录方式
 /// </summary>
-public enum LoginType
+public enum HikVisionLoginType
 {
     /// <summary>
     /// http 方式

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

@@ -7,7 +7,7 @@
 namespace BootstrapBlazor.Components;
 
 /// <summary>
-/// 海康威视网络摄像机组件 (Websdk Plugin 插件版本)
+/// 海康威视网络摄像机组件 (WebSdk Plugin 插件版本)
 /// </summary>
 [JSModuleAutoLoader("./_content/BootstrapBlazor.HikVision/Components/HikVisionWebPlugin.razor.js", JSObjectReference = true)]
 public partial class HikVisionWebPlugin
@@ -37,10 +37,10 @@ public partial class HikVisionWebPlugin
     public string? Password { get; set; }
 
     /// <summary>
-    /// 获得/设置 网络摄像机 登录类型 默认值 <see cref="LoginType.Http"/>
+    /// 获得/设置 网络摄像机 登录类型 默认值 <see cref="HikVisionLoginType.Http"/>
     /// </summary>
     [Parameter]
-    public LoginType LoginType { get; set; }
+    public HikVisionLoginType LoginType { get; set; }
 
     /// <summary>
     /// 获得/设置 视频图像窗口宽度 默认值 500px
@@ -64,13 +64,19 @@ public partial class HikVisionWebPlugin
     /// 获得/设置 登录成功后回调方法
     /// </summary>
     [Parameter]
-    public Func<Task>? OnLoginedAsync { get; set; }
+    public Func<Task>? OnLoginAsync { get; set; }
+
+    /// <summary>
+    /// 获得/设置 停止预览后回调方法
+    /// </summary>
+    [Parameter]
+    public Func<HikVisionChannel, Task>? OnGetChannelsAsync { get; set; }
 
     /// <summary>
     /// 获得/设置 注销成功后回调方法
     /// </summary>
     [Parameter]
-    public Func<Task>? OnLogoutedAsync { get; set; }
+    public Func<Task>? OnLogoutAsync { get; set; }
 
     /// <summary>
     /// 获得/设置 开始预览后回调方法
@@ -95,14 +101,14 @@ public partial class HikVisionWebPlugin
         .Build();
 
     /// <summary>
-    /// 获得 Websdk 插件是否初始化成功
+    /// 获得 Web sdk 插件是否初始化成功
     /// </summary>
     public bool Inited { get; private set; }
 
     /// <summary>
     /// 获得 是否已登录
     /// </summary>
-    public bool IsLogined { get; private set; }
+    public bool IsLogin { get; private set; }
 
     /// <summary>
     /// 获得 是否正在实时预览
@@ -129,22 +135,22 @@ protected override void OnParametersSet()
     /// <param name="password"></param>
     /// <param name="loginType"></param>
     /// <returns></returns>
-    public async Task<bool> Login(string ip, int port, string userName, string password, LoginType loginType = LoginType.Http)
+    public async Task<bool> Login(string ip, int port, string userName, string password, HikVisionLoginType loginType = HikVisionLoginType.Http)
     {
         ThrowIfNotInited();
-        IsLogined = await InvokeAsync<bool?>("login", Id, ip, port, userName, password, (int)loginType) ?? false;
-        if (IsLogined)
+        IsLogin = await InvokeAsync<bool?>("login", Id, ip, port, userName, password, (int)loginType) ?? false;
+        if (IsLogin)
         {
-            await TriggerLogined();
+            await TriggerLogin();
         }
-        return IsLogined;
+        return IsLogin;
     }
 
-    private async Task TriggerLogined()
+    private async Task TriggerLogin()
     {
-        if (OnLoginedAsync != null)
+        if (OnLoginAsync != null)
         {
-            await OnLoginedAsync();
+            await OnLoginAsync();
         }
     }
 
@@ -154,30 +160,40 @@ private async Task TriggerLogined()
     /// <returns></returns>
     public async Task Logout()
     {
-        if (IsLogined)
+        if (IsLogin)
         {
             await InvokeVoidAsync("logout", Id);
         }
         IsRealPlaying = false;
-        IsLogined = false;
-        await TriggerLogouted();
+        IsLogin = false;
+        await TriggerLogout();
     }
 
-    private async Task TriggerLogouted()
+    private async Task TriggerLogout()
     {
-        if (OnLogoutedAsync != null)
+        if (OnLogoutAsync != null)
         {
-            await OnLogoutedAsync();
+            await OnLogoutAsync();
         }
     }
 
+    /// <summary>
+    /// 获得通道列表方法
+    /// </summary>
+    /// <returns></returns>
+    public async Task GetChannelList()
+    {
+        ThrowIfNotInited();
+        await InvokeVoidAsync("getChannelList", Id);
+    }
+
     /// <summary>
     /// 开始实时预览方法
     /// </summary>
     /// <returns></returns>
     public async Task StartRealPlay(int streamType, int channelId)
     {
-        if (IsLogined && !IsRealPlaying)
+        if (IsLogin && !IsRealPlaying)
         {
             IsRealPlaying = await InvokeAsync<bool?>("startRealPlay", Id, streamType, channelId) ?? false;
             if (IsRealPlaying)
@@ -239,4 +255,18 @@ public async Task TriggerInited(bool inited)
             await OnInitedAsync(inited);
         }
     }
+
+    /// <summary>
+    /// 触发 <see cref="OnGetChannelsAsync"/> 回调方法由 JavaScript 调用
+    /// </summary>
+    /// <param name="channel"></param>
+    /// <returns></returns>
+    [JSInvokable]
+    public async Task TriggerGetChannelList(HikVisionChannel channel)
+    {
+        if (OnGetChannelsAsync != null)
+        {
+            await OnGetChannelsAsync(channel);
+        }
+    }
 }

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

@@ -1,4 +1,5 @@
-import { init as initVision, login, logout, startRealPlay, stopRealPlay, dispose as disposeVision } from '../hikvision.js';
+import { init as initVision, login as loginVision, logout, startRealPlay, stopRealPlay, dispose as disposeVision } from '../hikvision.js';
+import Data from '../../BootstrapBlazor/modules/data.js';
 import EventHandler from '../../BootstrapBlazor/modules/event-handler.js';
 
 export async function init(id, invoke) {
@@ -7,11 +8,29 @@ export async function init(id, invoke) {
         return;
     }
 
+    Data.set(id, {
+        invoke
+    });
+
     const inited = await initVision(id);
     await invoke.invokeMethodAsync('TriggerInited', inited);
 }
 
-export { login, logout, startRealPlay, stopRealPlay }
+export async function login(id, ip, port, userName, password, loginType) {
+    const vision = Data.get(id);
+    await loginVision(id, ip, port, userName, password, loginType);
+    const { logined, invoke } = vision;
+    if (logined) {
+        await invoke.invokeMethodAsync('TriggerGetChannelList', {
+            analogChannels: vision.analogChannels,
+            digitalChannels: vision.digitalChannels,
+            zeroChannels: vision.zeroChannels
+        });
+    }
+    return logined;
+}
+
+export { logout, startRealPlay, stopRealPlay }
 
 export function dispose(id) {
     disposeVision(id);

src/components/BootstrapBlazor.HikVision/Components/HikVisionZeroChannelInfo.cs

@@ -0,0 +1,26 @@
+// Copyright (c) BootstrapBlazor & Argo Zhang ([email protected]). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+namespace BootstrapBlazor.Components;
+
+/// <summary>
+/// 模拟通道信息
+/// </summary>
+public class HikVisionZeroChannelInfo()
+{
+    /// <summary>
+    /// 获得 通道 Id
+    /// </summary>
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 获得 通道号
+    /// </summary>
+    public int InputPort { get; set; }
+
+    /// <summary>
+    /// 获得 是否使能
+    /// </summary>
+    public bool Enabled { get; set; }
+}

src/components/BootstrapBlazor.HikVision/Services/DefaultHicVision.cs

@@ -10,7 +10,7 @@ sealed class DefaultHicVision(IJSRuntime jsRuntime) : IHikVision
     private bool _initialized;
     private bool _logined;
 
-    public async Task<bool> Login(string ip, int port, string userName, string password, LoginType loginType = LoginType.Http)
+    public async Task<bool> Login(string ip, int port, string userName, string password, HikVisionLoginType loginType = HikVisionLoginType.Http)
     {
         await LoadAsync();
 

src/components/BootstrapBlazor.HikVision/Services/IHikVision.cs

@@ -12,13 +12,13 @@ public interface IHikVision : IAsyncDisposable
     /// <summary>
     /// 登录方法
     /// </summary>
-    /// <param name="loginType">登录方式 <see cref="LoginType"/> 实例</param>
+    /// <param name="loginType">登录方式 <see cref="HikVisionLoginType"/> 实例</param>
     /// <param name="ip">设备 Ip 地址</param>
     /// <param name="port">设备端口</param>
     /// <param name="userName">用户名</param>
     /// <param name="password">密码</param>
     /// <returns></returns>
-    Task<bool> Login(string ip, int port, string userName, string password, LoginType loginType = LoginType.Http);
+    Task<bool> Login(string ip, int port, string userName, string password, HikVisionLoginType loginType = HikVisionLoginType.Http);
 
     /// <summary>
     /// 登出方法