Skip to content

Commit 9ec0c0b

Browse files
authored
feat(Socket): use Longbow.TcpSocket package (dotnetcore#6715)
* refactor: 更改 ReceivedCallback 回调方法 * chore: 更新类库 * doc: 更新文档 * doc: 更新包命名空间 * refactor: 更新服务注入方法 * chore: 更新依赖包 * chore: 增加多语言
1 parent f3325b5 commit 9ec0c0b

File tree

10 files changed

+21
-19
lines changed

10 files changed

+21
-19
lines changed

BootstrapBlazor.slnx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
<File Path="localization/de.json" />
1414
<File Path="localization/es.json" />
1515
<File Path="localization/pt.json" />
16+
<File Path="localization/ru-RU.json" />
1617
<File Path="localization/th-TH.json" />
18+
<File Path="localization/uk-UA.json" />
1719
<File Path="localization/zh-TW.json" />
1820
</Folder>
1921
<Folder Name="/scripts/" />

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,22 @@
6868
<PackageReference Include="BootstrapBlazor.RDKit" Version="9.0.2" />
6969
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.1" />
7070
<PackageReference Include="BootstrapBlazor.SmilesDrawer" Version="9.0.2" />
71-
<PackageReference Include="BootstrapBlazor.Socket" Version="9.0.14" />
7271
<PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.3" />
7372
<PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.3" />
7473
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.4" />
7574
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.7" />
7675
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
7776
<PackageReference Include="BootstrapBlazor.Tasks.Dashboard" Version="9.0.0" />
78-
<PackageReference Include="BootstrapBlazor.TcpSocket" Version="9.0.5" />
7977
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.1" />
8078
<PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />
8179
<PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.5" />
8280
<PackageReference Include="BootstrapBlazor.Vditor" Version="9.0.0" />
8381
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.3" />
8482
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.7" />
8583
<PackageReference Include="Longbow.Logging" Version="9.0.1" />
84+
<PackageReference Include="Longbow.Socket" Version="9.0.1" />
8685
<PackageReference Include="Longbow.Tasks" Version="9.0.2" />
86+
<PackageReference Include="Longbow.TcpSocket" Version="9.0.1" />
8787
</ItemGroup>
8888

8989
<ItemGroup>
@@ -97,10 +97,10 @@
9797
<Using Include="BootstrapBlazor.Server.Data" />
9898
<Using Include="BootstrapBlazor.Server.Extensions" />
9999
<Using Include="BootstrapBlazor.Server.Services" />
100-
<Using Include="BootstrapBlazor.Socket.DataAdapters" />
101-
<Using Include="BootstrapBlazor.Socket.DataConverters" />
102-
<Using Include="BootstrapBlazor.Socket.DataHandlers" />
103-
<Using Include="BootstrapBlazor.TcpSocket" />
100+
<Using Include="Longbow.Socket.DataAdapters" />
101+
<Using Include="Longbow.Socket.DataConverters" />
102+
<Using Include="Longbow.Socket.DataHandlers" />
103+
<Using Include="Longbow.TcpSocket" />
104104
<Using Include="Microsoft.AspNetCore.Components" />
105105
<Using Include="Microsoft.Extensions.Configuration" />
106106
<Using Include="Microsoft.Extensions.DependencyInjection" />

src/BootstrapBlazor.Server/Components/Samples/SocketFactories.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<h3>Tcp 套接字服务 <code>ITcpSocketFactory</code></h3>
55
<h4>组件库内置了 Socket 套接字通讯服务</h4>
66

7-
<PackageTips Name="BootstrapBlazor.TcpSocket" />
7+
<PackageTips Name="Longbow.TcpSocket" />
88

99
<p class="code-label">1. 服务注入</p>
1010

src/BootstrapBlazor.Server/Components/Samples/Sockets/Adapters.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<Pre>// 数据适配器内部使用固定长度数据处理器
4848
private readonly DataPackageAdapter _dataAdapter = new(new FixLengthDataPackageHandler(12));
4949

50-
_dataAdapter.ReceivedCallBack = async Data =>
50+
_dataAdapter.ReceivedCallback = async Data =>
5151
{
5252
// 此处接收到的数据 Data 为完整响应数据
5353
};</Pre>

src/BootstrapBlazor.Server/Components/Samples/Sockets/Adapters.razor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected override void OnInitialized()
4545
});
4646

4747
// 此处代码分开写是为了判断 _useDataAdapter 参数
48-
_client.ReceivedCallBack += OnReceivedAsync;
48+
_client.ReceivedCallback += OnReceivedAsync;
4949
_dataAdapter.ReceivedCallBack = UpdateReceiveLog;
5050

5151
// 实战中可以通过下面一句话设置数据适配器与回调方法
@@ -142,7 +142,7 @@ private void Dispose(bool disposing)
142142
{
143143
if (disposing)
144144
{
145-
_client.ReceivedCallBack -= OnReceivedAsync;
145+
_client.ReceivedCallback -= OnReceivedAsync;
146146

147147
// 释放连接令牌资源
148148
_connectTokenSource.Cancel();

src/BootstrapBlazor.Server/Components/Samples/Sockets/AutoReceives.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
<li>点击 <b>连接</b> 按钮后通过 <code>ITcpSocketFactory</code> 服务实例(<a href="/socket-factory" target="_blank">传送门</a>)创建的 <code>ITcpSocketClient</code> 对象连接到网站模拟 <code>TcpServer</code></li>
1515
<li>点击 <b>断开</b> 按钮调用 <code>CloseAsync</code> 方法断开 Socket 连接</li>
1616
</ul>
17-
<p>使用 <code>ReceivedCallBack</code> 委托获得接收到的数据,可通过 <code>+=</code> 方法支持多个客户端接收数据</p>
18-
<Pre>_client.ReceivedCallBack += OnReceivedAsync;</Pre>
17+
<p>使用 <code>ReceivedCallback</code> 委托获得接收到的数据,可通过 <code>+=</code> 方法支持多个客户端接收数据</p>
18+
<Pre>_client.ReceivedCallback += OnReceivedAsync;</Pre>
1919
<p>特别注意如果当前页面对 <code>ISocketClient</code> 实例不销毁时需要继承 <code>IDisposable</code> 或者 <code>IAsyncDisposable</code> 接口,在 <code>Dispose</code> 或者 <code>DisposeAsync</code> 中移除委托,以防止内存泄露</p>
2020
<Pre>private void Dispose(bool disposing)
2121
{
2222
if (disposing)
2323
{
2424
if (_client is { IsConnected: true })
2525
{
26-
_client.ReceivedCallBack -= OnReceivedAsync;
26+
_client.ReceivedCallback -= OnReceivedAsync;
2727
}
2828
}
2929
}</Pre>

src/BootstrapBlazor.Server/Components/Samples/Sockets/AutoReceives.razor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected override void OnInitialized()
3333
{
3434
options.LocalEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
3535
});
36-
_client.ReceivedCallBack += OnReceivedAsync;
36+
_client.ReceivedCallback += OnReceivedAsync;
3737
}
3838

3939
private async Task OnConnectAsync()
@@ -81,7 +81,7 @@ private void Dispose(bool disposing)
8181
{
8282
if (_client is { IsConnected: true })
8383
{
84-
_client.ReceivedCallBack -= OnReceivedAsync;
84+
_client.ReceivedCallback -= OnReceivedAsync;
8585
}
8686
}
8787
}

src/BootstrapBlazor.Server/Components/Samples/Sockets/AutoReconnects.razor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected override void OnInitialized()
3535
options.IsAutoReconnect = true;
3636
options.ReconnectInterval = 5000;
3737
});
38-
_client.ReceivedCallBack += OnReceivedAsync;
38+
_client.ReceivedCallback += OnReceivedAsync;
3939
_client.OnConnecting = async () =>
4040
{
4141
_items.Add(new ConsoleMessageItem { Message = $"{DateTime.Now} 正在连接到 {_serverEndPoint},请稍候..." });
@@ -93,7 +93,7 @@ private void Dispose(bool disposing)
9393
{
9494
if (_client is { IsConnected: true })
9595
{
96-
_client.ReceivedCallBack -= OnReceivedAsync;
96+
_client.ReceivedCallback -= OnReceivedAsync;
9797
}
9898
}
9999
}

src/BootstrapBlazor.Server/Components/Samples/Sockets/Notice.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
<p><code>ITcpSocketFactory</code> 服务仅在 <code>Server</code> 模式下可用</p>
33
</Tips>
44

5-
<PackageTips Name="BootstrapBlazor.TcpSocket" />
5+
<PackageTips Name="Longbow.TcpSocket" />

src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static IServiceCollection AddBootstrapBlazorServices(this IServiceCollect
9595
services.AddBootstrapBlazorJuHeIpLocatorService();
9696

9797
// 增加 ITcpSocketFactory 服务
98-
services.AddBootstrapBlazorTcpSocketFactory();
98+
services.AddTcpSocketFactory();
9999

100100
// 增加 PetaPoco ORM 数据服务操作类
101101
// 需要时打开下面代码

0 commit comments

Comments
 (0)