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

网络组件更新，用户暗号重新设计，个人信息界面文件上传支持拖拽

Browse Source
This commit is contained in:
dathlin
2017-09-19 22:16:44 +08:00
parent de13c87afe
commit cad8cd3de4
17 changed files with 335 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
软件系统客户端Wpf/LoginWindow.xaml.cs
View File

@@ -46,19 +46,21 @@ namespace 软件系统客户端Wpf
private void Window_Loaded(object sender, RoutedEventArgs e)
{
WindowToolTip.Opacity = 0;
TextBlockSoftName.Text = CommonLibrary.Resource.StringResouce.SoftName;
TextBlockSoftName.Text = SoftResources.StringResouce.SoftName;
TextBlockSoftVersion.Text = UserClient.CurrentVersion.ToString();
TextBlockSoftCopyright.Text = $"本软件著作权归{CommonLibrary.Resource.StringResouce.SoftCopyRight}所有";
TextBlockSoftCopyright.Text = $"本软件著作权归{CommonLibrary.SoftResources.StringResouce.SoftCopyRight}所有";
// 上次登录为7天以前则清除账户密码
if ((DateTime.Now - UserClient.JsonSettings.LoginTime).TotalDays < 7)
if ((DateTime.Now - UserClient.JsonSettings.LoginTime).TotalDays < UserClient.JsonSettings.PasswordOverdueDays)
{
//加载数据
NameTextBox.Text = UserClient.JsonSettings.LoginName ?? "";
PasswordBox.Password = UserClient.JsonSettings.Password ?? "";
Remember.IsChecked = UserClient.JsonSettings.Password != "";
}
//初始化输入焦点
if (UserClient.JsonSettings.Password != "") LoginButton.Focus();
else if (UserClient.JsonSettings.LoginName != "") PasswordBox.Focus();

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

@@ -157,7 +157,7 @@ namespace 软件系统客户端Wpf
Account_address.Text = UserClient.UserAccount.LastLoginIpAddress;
//状态栏设置
TextBlock_CopyRight.Text = $"本软件著作权归{Resource.StringResouce.SoftCopyRight}所有";
TextBlock_CopyRight.Text = $"本软件著作权归{SoftResources.StringResouce.SoftCopyRight}所有";
//绑定事件，仅执行一次，不能放到show方法里
net_socket_client.MessageAlerts += Net_socket_client_MessageAlerts;
@@ -322,8 +322,8 @@ namespace 软件系统客户端Wpf
private void MenuItem关于本软件_Click(object sender, RoutedEventArgs e)
{
using (FormAbout fa = new FormAbout(Resource.StringResouce.SoftName,
UserClient.CurrentVersion, 2017, Resource.StringResouce.SoftCopyRight))
using (FormAbout fa = new FormAbout(SoftResources.StringResouce.SoftName,
UserClient.CurrentVersion, 2017, SoftResources.StringResouce.SoftCopyRight))
{
fa.ShowDialog();
}
@@ -416,7 +416,7 @@ namespace 软件系统客户端Wpf
/// <param name="state">网络连接对象</param>
/// <param name="customer">用户自定义的指令头，用来区分数据用途</param>
/// <param name="data">数据</param>
private void Net_socket_client_AcceptString(AsyncStateOne state, int customer, string data)
private void Net_socket_client_AcceptString(AsyncStateOne state, NetHandle customer, string data)
{
if (customer == CommonHeadCode.MultiNetHeadCode.弹窗新消息)
{
@@ -482,7 +482,7 @@ namespace 软件系统客户端Wpf
}
}
private void Net_socket_client_AcceptByte(AsyncStateOne object1, int customer, byte[] object2)
private void Net_socket_client_AcceptByte(AsyncStateOne object1, NetHandle customer, byte[] object2)
{
//接收到服务器发来的字节数据
if (IsWindowShow) Dispatcher.Invoke(new Action(() =>
@@ -520,16 +520,7 @@ namespace 软件系统客户端Wpf
TextBlock_ClientStatus.Text = object1;
}));
}
#endregion