Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<PackageReference Include="BootstrapBlazor.OctIcon" Version="9.0.4" />
<PackageReference Include="BootstrapBlazor.OfficeViewer" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.OpcDa" Version="9.0.2" />
<PackageReference Include="BootstrapBlazor.OpcDa" Version="9.0.3" />
<PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.PdfViewer" Version="9.0.6" />
<PackageReference Include="BootstrapBlazor.Player" Version="9.0.1" />
Expand Down
4 changes: 2 additions & 2 deletions src/BootstrapBlazor.Server/Components/Samples/OpcDa.razor
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@
<div class="col-12 col-sm-6">
<BootstrapInputGroup>
<BootstrapInputGroupLabel DisplayText="转速"></BootstrapInputGroupLabel>
<BootstrapInputGroupLabel DisplayText="@Tag3"></BootstrapInputGroupLabel>
<BootstrapInputGroupLabel DisplayText="@Tag1"></BootstrapInputGroupLabel>
<Display @bind-Value="@_tagValue3"></Display>
</BootstrapInputGroup>
</div>
<div class="col-12 col-sm-6">
<BootstrapInputGroup>
<BootstrapInputGroupLabel DisplayText="流速"></BootstrapInputGroupLabel>
<BootstrapInputGroupLabel DisplayText="@Tag4"></BootstrapInputGroupLabel>
<BootstrapInputGroupLabel DisplayText="@Tag2"></BootstrapInputGroupLabel>
<Display @bind-Value="@_tagValue4"></Display>
</BootstrapInputGroup>
</div>
Expand Down
40 changes: 25 additions & 15 deletions src/BootstrapBlazor.Server/Components/Samples/OpcDa.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone

using BootstrapBlazor.OpcDa;
using System.Globalization;

namespace BootstrapBlazor.Server.Components.Samples;

Expand All @@ -17,12 +16,10 @@ public partial class OpcDa : ComponentBase
[NotNull]
private IOpcDaServer? OpcDaServer { get; set; }

private string? _serverName = "opcda://localhost/Kepware.KEPServerEX.V6/Mock";
private string? _serverName = "opcda://localhost/Kepware.KEPServerEX.V6";

private const string Tag1 = "Channel1.Device1.Tag1";
private const string Tag2 = "Channel1.Device1.Tag2";
private const string Tag3 = "Channel1.Device1.Tag3";
private const string Tag4 = "Channel1.Device1.Tag4";

private string? _tagValue1;
private string? _tagValue2;
Expand All @@ -49,19 +46,25 @@ private void OnDisConnect()

private void OnRead()
{
var values = OpcDaServer.Read(Tag1, Tag2);
_tagValue1 = values.ElementAt(0).Value?.ToString();

var v = (int)values.ElementAt(1).Value! / 100d;
_tagValue2 = v.ToString(CultureInfo.InvariantCulture);
var items = OpcDaServer.Read(Tag1, Tag2);
var value1 = items.FirstOrDefault(i => i.Name == Tag1).Value;
if (value1 != null)
{
_tagValue1 = value1.ToString();
}
var value2 = items.FirstOrDefault(i => i.Name == Tag2).Value;
if (value2 != null)
{
_tagValue2 = value2.ToString();
}
}

private void OnCreateSubscription()
{
_subscribed = true;
_subscription = OpcDaServer.CreateSubscription("Subscription1", 1000, true);
_subscription.DataChanged += UpdateValues;
_subscription.AddItems([Tag3, Tag4]);
_subscription.AddItems([Tag1, Tag2]);
}

private void OnCancelSubscription()
Expand All @@ -76,9 +79,16 @@ private void OnCancelSubscription()

private void UpdateValues(List<OpcReadItem> items)
{
_tagValue3 = items[0].Value?.ToString();
var v = (int)items[1].Value! / 100d;
_tagValue4 = v.ToString(CultureInfo.InvariantCulture);
var value1 = items.Find(i => i.Name == Tag1).Value;
if (value1 != null)
{
_tagValue3 = value1.ToString();
}
var value2 = items.Find(i => i.Name == Tag2).Value;
if (value2 != null)
{
_tagValue4 = value2.ToString();
}

InvokeAsync(StateHasChanged);
}
Expand All @@ -88,12 +98,12 @@ private void UpdateValues(List<OpcReadItem> items)
private void OnBrowse()
{
var elements = OpcDaServer.Browse("", new OpcBrowseFilters(), out _);
_roots = elements.Select(element => new TreeViewItem<OpcBrowseElement>(element)
_roots = [.. elements.Select(element => new TreeViewItem<OpcBrowseElement>(element)
{
Text = element.Name,
HasChildren = element.HasChildren,
Icon = "fa-solid fa-fw fa-cubes"
}).ToList();
})];
}

private Task<IEnumerable<TreeViewItem<OpcBrowseElement>>> OnExpandNodeAsync(TreeViewItem<OpcBrowseElement> element)
Expand Down
Loading