From 54ac0e89efb7c5d38dabfe091f2c1974636a9e2a Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 26 Dec 2025 17:08:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=8C=89=E9=92=AE=E6=8A=98=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/HikVisions.razor | 2 +- .../Components/Samples/HikVisions.razor.css | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor.css diff --git a/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor b/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor index 1599365108c..e5967780c90 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor @@ -75,7 +75,7 @@
-
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor.css b/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor.css new file mode 100644 index 00000000000..9f1a0d77a67 --- /dev/null +++ b/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor.css @@ -0,0 +1,10 @@ +.hik-controls { + width: 100%; + display: grid; + gap: .5rem; + grid-template-columns: repeat(auto-fit, minmax(80px, 1fr)); +} + + .hik-controls ::deep .btn { + white-space: nowrap; + } From c53299fa8bde13a228001c8f38534a665c691b40 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 27 Dec 2025 10:44:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=E5=88=86=E5=B1=8F?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Samples/HikVisions.razor | 6 ++++ .../Components/Samples/HikVisions.razor.cs | 34 ++++++++++++++----- .../Components/Samples/HikVisions.razor.css | 2 +- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor b/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor index e5967780c90..2f9eea93367 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor +++ b/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor @@ -106,6 +106,12 @@ + + + 分屏 (@context.Text) + +
} diff --git a/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor.cs index 8131497b2d6..ddb403d66b0 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor.cs @@ -26,14 +26,14 @@ public partial class HikVisions private string _userName = "admin"; private bool _inited; - private bool _loginStatus => _hikVision.IsLogin; - private bool _logoutStatus => !_hikVision.IsLogin; - private bool _startRealPlayStatus => _hikVision is not { IsLogin: true, IsRealPlaying: false }; - private bool _stopRealPlayStatus => _hikVision is not { IsLogin: true, IsRealPlaying: true }; - private bool _openSoundStatus => _hikVision is not { IsLogin: true, IsRealPlaying: true, IsOpenSound: false }; - private bool _closeSoundStatus => _hikVision is not { IsLogin: true, IsRealPlaying: true, IsOpenSound: true }; - private bool _startRecordStatus => _hikVision is not { IsLogin: true, IsRealPlaying: true, IsStartRecord: false }; - private bool _stopRecordStatus => _hikVision is not { IsLogin: true, IsRealPlaying: true, IsStartRecord: true }; + private bool _loginStatus => _hikVision.IsMultipleWindowType ? false : _hikVision.IsLogin; + private bool _logoutStatus => _hikVision.IsMultipleWindowType ? false : !_hikVision.IsLogin; + private bool _startRealPlayStatus => _hikVision.IsMultipleWindowType ? false : _hikVision is not { IsLogin: true, IsRealPlaying: false }; + private bool _stopRealPlayStatus => _hikVision.IsMultipleWindowType ? false : _hikVision is not { IsLogin: true, IsRealPlaying: true }; + private bool _openSoundStatus => _hikVision.IsMultipleWindowType ? false : _hikVision is not { IsLogin: true, IsRealPlaying: true, IsOpenSound: false }; + private bool _closeSoundStatus => _hikVision.IsMultipleWindowType ? false : _hikVision is not { IsLogin: true, IsRealPlaying: true, IsOpenSound: true }; + private bool _startRecordStatus => _hikVision.IsMultipleWindowType ? false : _hikVision is not { IsLogin: true, IsRealPlaying: true, IsStartRecord: false }; + private bool _stopRecordStatus => _hikVision.IsMultipleWindowType ? false : _hikVision is not { IsLogin: true, IsRealPlaying: true, IsStartRecord: true }; private List _analogChannels = []; private int _channelId = 1; @@ -45,7 +45,16 @@ public partial class HikVisions new SelectedItem("3", "第三码流"), new SelectedItem("4", "转码码流") ]; - + private readonly List _iWndTypes = + [ + new SelectedItem("1", "1*1"), + new SelectedItem("2", "2*2"), + new SelectedItem("3", "3*3"), + new SelectedItem("4", "4*4"), + new SelectedItem("1*2", "1*2"), + new SelectedItem("2*1", "2*1") + ]; + private string _iWndType = "1"; private async Task OnLogin() { await _hikVision.Login(_ip, _port, _userName, _password, HikVisionLoginType.Http); @@ -208,4 +217,11 @@ private Task OnStopRealPlayedAsync() StateHasChanged(); return Task.CompletedTask; } + + private async Task OnWndTypeChanged(SelectedItem item) + { + _iWndType = item.Value; + await _hikVision.ChangeWindowNum(_iWndType); + StateHasChanged(); + } } diff --git a/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor.css b/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor.css index 9f1a0d77a67..d18bec45724 100644 --- a/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor.css +++ b/src/BootstrapBlazor.Server/Components/Samples/HikVisions.razor.css @@ -2,7 +2,7 @@ width: 100%; display: grid; gap: .5rem; - grid-template-columns: repeat(auto-fit, minmax(80px, 1fr)); + grid-template-columns: repeat(auto-fit, minmax(90px, 1fr)); } .hik-controls ::deep .btn { From 283d62ca343d69b4b1b43609e3e2205e5a1caf5f Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Sat, 27 Dec 2025 10:44:21 +0800 Subject: [PATCH 3/3] chore: bump version 10.0.10 --- src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj index 6b467930f1a..dbef6622315 100644 --- a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj +++ b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj @@ -1,4 +1,4 @@ - + true @@ -42,7 +42,7 @@ - +