dathlin/ClientServerProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

从网络组件更新，准备修改在线用户模型，v1.6.7

Browse Source
This commit is contained in:
dathlin
2017-10-09 14:13:45 +08:00
parent a162e65a07
commit 8252e4d356
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ClientsLibrary/UserClient.cs
View File

@@ -36,7 +36,7 @@ namespace ClientsLibrary
/// <summary> /// <summary>
/// 本软件的当前版本，用来验证更新的关键依据 /// 本软件的当前版本，用来验证更新的关键依据
/// </summary> /// </summary>
public static SystemVersion CurrentVersion { get; } = new SystemVersion("1.0.0.171008"); public static SystemVersion CurrentVersion { get; } = new SystemVersion("1.0.0.171009");
/// <summary> /// <summary>

2
CommonLibrary/ProtocolSupport/CommonProtocol.cs
View File

@@ -45,7 +45,7 @@ namespace CommonLibrary
* *
**************************************************************************/ **************************************************************************/
SoftBasic.FrameworkVersion = new SystemVersion("1.6.6"); SoftBasic.FrameworkVersion = new SystemVersion("1.6.7");
} }

BIN
Public/HslCommunication.dll
View File

Binary file not shown.

7
Public/HslCommunication.xml
View File

@@ -1327,7 +1327,7 @@
</member> </member>
<member name="M:HslCommunication.BasicFramework.SystemVersion.ToString"> <member name="M:HslCommunication.BasicFramework.SystemVersion.ToString">
<summary> <summary>
获取版本号的字符串形式 获取版本号的字符串形式，如果内部版本号为0，则显示时不携带
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
@@ -2887,6 +2887,11 @@
心跳验证的时间点 心跳验证的时间点
</summary> </summary>
</member> </member>
<member name="P:HslCommunication.Enthernet.AsyncStateOne.ClientType">
<summary>
客户端的类型
</summary>
</member>
<member name="F:HslCommunication.Enthernet.AsyncStateOne.UdpEndPoint"> <member name="F:HslCommunication.Enthernet.AsyncStateOne.UdpEndPoint">
<summary> <summary>
UDP通信中的远程端 UDP通信中的远程端

2
软件系统客户端Wpf/MainWindow.xaml.cs
View File

@@ -413,7 +413,7 @@ namespace 软件系统客户端Wpf
net_socket_client.EndPointServer = new System.Net.IPEndPoint( net_socket_client.EndPointServer = new System.Net.IPEndPoint(
System.Net.IPAddress.Parse(UserClient.ServerIp), System.Net.IPAddress.Parse(UserClient.ServerIp),
CommonProtocol.Port_Main_Net); CommonProtocol.Port_Main_Net);
net_socket_client.ClientAlias = $"{UserClient.UserAccount.UserName} ({UserClient.UserAccount.Factory})";//标记客户端在线的名称 net_socket_client.ClientAlias = UserClient.UserAccount.UserName; // 传入账户名
net_socket_client.ClientStart(); net_socket_client.ClientStart();
} }
catch (Exception ex) catch (Exception ex)

4
软件系统客户端模版/FormMainWindow.cs
View File

@@ -355,12 +355,12 @@ namespace 软件系统客户端模版
{ {
try try
{ {
net_socket_client.KeyToken = CommonProtocol.KeyToken;// 新增的身份令牌 net_socket_client.KeyToken = CommonProtocol.KeyToken; // 新增的身份令牌
net_socket_client.LogNet = UserClient.LogNet; net_socket_client.LogNet = UserClient.LogNet;
net_socket_client.EndPointServer = new System.Net.IPEndPoint( net_socket_client.EndPointServer = new System.Net.IPEndPoint(
System.Net.IPAddress.Parse(UserClient.ServerIp), System.Net.IPAddress.Parse(UserClient.ServerIp),
CommonProtocol.Port_Main_Net); CommonProtocol.Port_Main_Net);
net_socket_client.ClientAlias = $"{UserClient.UserAccount.UserName} ({UserClient.UserAccount.Factory})";//标记客户端在线的名称 net_socket_client.ClientAlias = UserClient.UserAccount.UserName; // 传入账户名
net_socket_client.ClientStart(); net_socket_client.ClientStart();
} }
catch (Exception ex) catch (Exception ex)