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-07-12 10:25:23 +08:00
parent 6d79df3582
commit 0022c081d4
2 changed files with 167 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,39 +31,39 @@
<MenuItem.Icon>
<materialDesign:PackIcon Kind="AccountSettingsVariant" />
</MenuItem.Icon>
<MenuItem Header="公告更改">
<MenuItem Header="公告更改" x:Name="MenuItem公告管理" Click="MenuItem公告管理_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="BorderColor" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="账户管理">
<MenuItem Header="账户管理" x:Name="MenuItem账户管理" Click="MenuItem账户管理_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="AccountCircle" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="注册账户">
<MenuItem Header="注册账户" x:Name="MenuItem注册账户" Click="MenuItem注册账户_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="AccountPlus" />
</MenuItem.Icon>
</MenuItem>
<Separator />
<MenuItem Header="日志查看">
<MenuItem Header="日志查看" x:Name="MenuItem日志查看" Click="MenuItem日志查看_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="FlagVariant" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="远程更新">
<MenuItem Header="远程更新" x:Name="MenuItem远程更新" Click="MenuItem远程更新_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="Rotate3d" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="消息发送">
<MenuItem Header="消息发送" x:Name="MenuItem消息发送" Click="MenuItem消息发送_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="MessageTextOutline" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="开发中心">
<MenuItem Header="开发中心" x:Name="MenuItem开发中心" Click="MenuItem开发中心_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="Security" />
</MenuItem.Icon>
@@ -73,17 +73,17 @@
<MenuItem.Icon>
<materialDesign:PackIcon Kind="Settings" />
</MenuItem.Icon>
<MenuItem Header="密码更改">
<MenuItem Header="密码更改" x:Name="MenuItem密码更改" Click="MenuItem密码更改_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="KeyChange" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="聊天信息">
<MenuItem Header="聊天信息" x:Name="MenuItem聊天信息" Click="MenuItem聊天信息_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="MessageOutline" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="头像更改">
<MenuItem Header="头像更改" x:Name="MenuItem头像更改" Click="MenuItem头像更改_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="AccountConvert" />
</MenuItem.Icon>
@@ -94,22 +94,22 @@
<MenuItem.Icon>
<materialDesign:PackIcon Kind="CubeOutline" />
</MenuItem.Icon>
<MenuItem Header="关于本软件">
<MenuItem Header="关于本软件" x:Name="MenuItem关于本软件" Click="MenuItem关于本软件_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="Leaf" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="更新日志">
<MenuItem Header="更新日志" x:Name="MenuItem更新日志" Click="MenuItem更新日志_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="BookOpen" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="版本号说明">
<MenuItem Header="版本号说明" x:Name="MenuItem版本号说明" Click="MenuItem版本号说明_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="InformationOutline" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="意见反馈">
<MenuItem Header="意见反馈" x:Name="MenuItem意见反馈" Click="MenuItem意见反馈_Click">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="Bridge" />
</MenuItem.Icon>

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

@@ -1,4 +1,5 @@
using CommonLibrary;
using HslCommunication;
using HslCommunication.BasicFramework;
using HslCommunication.Enthernet;
using Newtonsoft.Json.Linq;
@@ -59,8 +60,151 @@ namespace 软件系统客户端Wpf
}
#region 菜单逻辑块
private void MenuItem公告管理_Click(object sender, RoutedEventArgs e)
{
using (FormInputAndAction fiaa = new FormInputAndAction(str => UserClient.Net_simplify_client.ReadFromServer(
CommonHeadCode.SimplifyHeadCode.更新公告, str).IsSuccess, UserClient.Announcement, "请输入公告内容"))
{
fiaa.ShowDialog();
}
}
private void MenuItem账户管理_Click(object sender, RoutedEventArgs e)
{
FormAccountManage fam = new FormAccountManage(() =>
{
OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.获取账户);
if (result.IsSuccess) return result.Content;
else return result.ToMessageShowString();
}, m => UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更细账户, m).IsSuccess);
fam.ShowDialog();
fam.Dispose();
}
private void MenuItem注册账户_Click(object sender, RoutedEventArgs e)
{
//using (FormRegisterAccount fra = new FormRegisterAccount())
//{
// fra.ShowDialog();
//}
}
private void MenuItem日志查看_Click(object sender, RoutedEventArgs e)
{
}
private void MenuItem远程更新_Click(object sender, RoutedEventArgs e)
{
if (UserClient.UserAccount.UserName == "admin")
{
//using (FormUpdateRemote fur = new FormUpdateRemote())
//{
// fur.ShowDialog();
//}
}
else
{
MessageBox.Show("权限不足！");
}
}
private void MenuItem消息发送_Click(object sender, RoutedEventArgs e)
{
using (FormInputAndAction fiaa = new FormInputAndAction(str => UserClient.Net_simplify_client.ReadFromServer(
CommonHeadCode.SimplifyHeadCode.群发消息, UserClient.UserAccount.UserName + ":" + str).IsSuccess, "", "请输入群发的消息："))
{
fiaa.ShowDialog();
}
}
private void MenuItem开发中心_Click(object sender, RoutedEventArgs e)
{
using (FormSuper fs = new FormSuper(() =>
{
OperateResultBytes result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.性能计数, new byte[0]);
//解析
if (result.IsSuccess)
{
int[] data = new int[result.Content.Length / 4];
for (int i = 0; i < data.Length; i++)
{
data[i] = BitConverter.ToInt32(result.Content, i * 4);
}
return data;
}
else
{
return null;
}
}))
{
fs.ShowDialog();
}
}
private void MenuItem密码更改_Click(object sender, RoutedEventArgs e)
{
using (FormPasswordModify fpm = new FormPasswordModify(UserClient.UserAccount.Password,
p =>
{
JObject json = new JObject
{
{ UserAccount.UserNameText, UserClient.UserAccount.UserName },
{ UserAccount.PasswordText, p }
};
return UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.密码修改, json.ToString()).IsSuccess;
}, 6, 8))
{
fpm.ShowDialog();
}
}
private void MenuItem聊天信息_Click(object sender, RoutedEventArgs e)
{
}
private void MenuItem头像更改_Click(object sender, RoutedEventArgs e)
{
}
private void MenuItem关于本软件_Click(object sender, RoutedEventArgs e)
{
using (FormAbout fa = new FormAbout(Resource.StringResouce.SoftName,
UserClient.CurrentVersion, 2017, Resource.StringResouce.SoftCopyRight))
{
fa.ShowDialog();
}
}
private void MenuItem更新日志_Click(object sender, RoutedEventArgs e)
{
}
private void MenuItem版本号说明_Click(object sender, RoutedEventArgs e)
{
}
private void MenuItem意见反馈_Click(object sender, RoutedEventArgs e)
{
using (FormInputAndAction fiaa = new FormInputAndAction(str => UserClient.Net_simplify_client.ReadFromServer(
CommonHeadCode.SimplifyHeadCode.意见反馈, UserClient.UserAccount.UserName + ":" + str).IsSuccess, "", "请输入意见反馈："))
{
fiaa.ShowDialog();
}
}
#endregion
#region 异步网络块
@@ -194,15 +338,16 @@ namespace 软件系统客户端Wpf
}
#endregion
}
}