feat: 完善通道信息

Author: ArgoZhang

…apBlazor.HikVision/Components/Channel.cs …HikVision/Components/HikVisionChannel.cssrc/components/BootstrapBlazor.HikVision/Components/Channel.cs renamed to src/components/BootstrapBlazor.HikVision/Components/HikVisionChannel.cs src/components/BootstrapBlazor.HikVision/Components/Channel.cs renamed to src/components/BootstrapBlazor.HikVision/Components/HikVisionChannel.cs

@@ -13,4 +13,14 @@ public class HikVisionChannel
     /// 获得/设置 模拟通道信息集合
     /// </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/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
@@ -64,7 +64,7 @@ public partial class HikVisionWebPlugin
     /// 获得/设置 登录成功后回调方法
     /// </summary>
     [Parameter]
-    public Func<Task>? OnLoginedAsync { get; set; }
+    public Func<Task>? OnLoginAsync { get; set; }
 
     /// <summary>
     /// 获得/设置 停止预览后回调方法
@@ -76,7 +76,7 @@ public partial class HikVisionWebPlugin
     /// 获得/设置 注销成功后回调方法
     /// </summary>
     [Parameter]
-    public Func<Task>? OnLogoutedAsync { get; set; }
+    public Func<Task>? OnLogoutAsync { get; set; }
 
     /// <summary>
     /// 获得/设置 开始预览后回调方法
@@ -101,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>
     /// 获得 是否正在实时预览
@@ -138,19 +138,19 @@ protected override void OnParametersSet()
     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();
         }
     }
 
@@ -160,20 +160,20 @@ 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();
         }
     }
 
@@ -193,7 +193,7 @@ public async Task GetChannelList()
     /// <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)

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

@@ -22,7 +22,9 @@ export async function login(id, ip, port, userName, password, loginType) {
     const { logined, invoke } = vision;
     if (logined) {
         await invoke.invokeMethodAsync('TriggerGetChannelList', {
-            analogChannels: vision.analogChannels
+            analogChannels: vision.analogChannels,
+            digitalChannels: vision.digitalChannels,
+            zeroChannels: vision.zeroChannels
         });
     }
     return logined;

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

@@ -0,0 +1,26 @@
+// Copyright (c) BootstrapBlazor & Argo Zhang (argo@live.ca). 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/wwwroot/hikvision.js

@@ -112,7 +112,6 @@ const getChannelList = vision => {
     WebVideoCtrl.I_GetAnalogChannelInfo(szDeviceIdentify, {
         success: function (xmlDoc) {
             const channels = [...getTagNameValues(xmlDoc, "VideoInputChannel")];
-            console.log(xmlDoc);
             vision.analogChannels = channels.map(channel => {
                 return {
                     id: parseInt(getTagNameFirstValue(channel, "id")),
@@ -151,8 +150,9 @@ const getChannelList = vision => {
             const channels = [...getTagNameValues(xmlDoc, "ZeroVideoChannel")];
             vision.zeroChannels = channels.map(channel => {
                 return {
-                    id: getTagNameFirstValue(channel, "id"),
-                    name: getTagNameFirstValue(channel, "name")
+                    id: parseInt(getTagNameFirstValue(channel, "id")),
+                    inputPort: parseInt(getTagNameFirstValue(channel, "inputPort")),
+                    enabled: getTagNameFirstValue(channel, "enabled") === 'true',
                 };
             });
             zero_completed = true;