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

代码精简优化，正式发布框架1.0.4版本

Browse Source
This commit is contained in:
dathlin
2017-05-20 09:41:21 +08:00
parent aaf9175c35
commit 5f7e55b311
6 changed files with 82 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CommonLibrary/Common.cs
View File

@@ -11,8 +11,8 @@ namespace CommonLibrary
static CommonLibrary()
{
//初始化模版的版本号
//预计第一个正式发行的版本为1.1.0 日期为2017-05-10
SoftBasic.FrameworkVersion = new SystemVersion("1.0.3");
//预计第一个正式发行的版本为1.1.0 日期为2017-08-10
SoftBasic.FrameworkVersion = new SystemVersion("1.0.4");
}

BIN
Public/HslCommunication.dll
View File

Binary file not shown.

5
Public/HslCommunication.xml
View File

@@ -3459,6 +3459,11 @@
查找 System.Drawing.Bitmap 类型的本地化资源。
</summary>
</member>
<member name="P:HslCommunication.Properties.Resources.qrcode_for_gh_319218678954_258">
<summary>
查找 System.Drawing.Bitmap 类型的本地化资源。
</summary>
</member>
<member name="P:HslCommunication.Properties.Resources.ram">
<summary>
查找 System.Drawing.Bitmap 类型的本地化资源。

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

@@ -14,23 +14,26 @@ using HslCommunication.Enthernet;
using HslCommunication.BasicFramework;
//============================================================================
// 模版日期 2017-02-21
// 创建人 胡少林
// 版权所有 胡少林
// 授权说明 模版仅授权个人使用，如需商用，请联系hsl200909@163.com洽谈
// 说明 JSON组件引用自james newton-king，遵循MIT授权协议
// 说明 文件的图标来源于http://fileicons.chromefans.org/,感谢作者的无私分享
//============================================================================
/***************************************************************************************
*
* 模版日期 2017-05-20
* 创建人 胡少林
* 版权所有 胡少林
* 授权说明 模版仅授权个人使用，如需商用，请联系hsl200909@163.com洽谈
* 说明一 JSON组件引用自james newton-king，遵循MIT授权协议
* 说明二 文件的图标来源于http://fileicons.chromefans.org/,感谢作者的无私分享
*
****************************************************************************************/
/***************************************************************************************
*
* 版本说明 最新版以github为准，由于提交更改比较频繁，需要经常查看官网地址:https://github.com/dathlin/C-S-
* 注意 本代码的相关操作未作密码验证，如有需要，请自行完成
* 示例 密码验证具体示例参照Form1_FormClosing(object sender, FormClosingEventArgs e)方法
* 如果 遇到启动调试就退出了，请注释掉Program.cs文件中的指允许启动一个实例的代码
*
****************************************************************************************/
//============================================================================
//
// 注意：本代码的相关操作未作密码验证，如有需要，请自行完成
// 示例：具体示例参照Form1_FormClosing(object sender, FormClosingEventArgs e)方法
// 如果：遇到启动调试就退出了，请注释掉Program.cs文件中的指允许启动一个实例的代码
//
//============================================================================
@@ -125,22 +128,28 @@ namespace 软件系统客户端模版
private void 修改密码ToolStripMenuItem_Click(object sender, EventArgs e)
{
//实例化一个密码修改的窗口，并指定了实现修改的具体方法，指定了密码长度
FormPasswordModify fpm = new FormPasswordModify(UserClient.UserAccount.Password,
p => {
JObject json = new JObject();json.Add(UserAccount.UserNameText, UserClient.UserAccount.UserName);
json.Add(UserAccount.PasswordText, p);
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();
fpm.Dispose();
}, 6, 8))
{
fpm.ShowDialog();
}
}
private void 关于本软件ToolStripMenuItem_Click(object sender, EventArgs e)
{
FormAbout fa = new FormAbout(Resource.StringResouce.SoftName,
UserClient.CurrentVersion, 2017, Resource.StringResouce.SoftCopyRight);
fa.ShowDialog();
fa.Dispose();
using (FormAbout fa = new FormAbout(Resource.StringResouce.SoftName,
UserClient.CurrentVersion, 2017, Resource.StringResouce.SoftCopyRight))
{
fa.ShowDialog();
}
}
private void 更新日志ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -151,31 +160,35 @@ namespace 软件系统客户端模版
UserClient.JsonSettings.IsNewVersionRunning = false;
UserClient.JsonSettings.SaveToFile();
}
FormUpdateLog ful = new FormUpdateLog(UserClient.HistoryVersions);
ful.ShowDialog();
ful.Dispose();
using (FormUpdateLog ful = new FormUpdateLog(UserClient.HistoryVersions))
{
ful.ShowDialog();
}
}
private void 版本号说明ToolStripMenuItem_Click(object sender, EventArgs e)
{
FormAboutVersion fav = new FormAboutVersion(UserClient.CurrentVersion);
fav.ShowDialog();
fav.Dispose();
using (FormAboutVersion fav = new FormAboutVersion(UserClient.CurrentVersion))
{
fav.ShowDialog();
}
}
private void 更改公告ToolStripMenuItem_Click(object sender, EventArgs e)
{
FormInputAndAction fiaa = new FormInputAndAction(str => UserClient.Net_simplify_client.ReadFromServer(
CommonHeadCode.SimplifyHeadCode.更新公告 + str).IsSuccess,UserClient.Announcement);
fiaa.ShowDialog();
fiaa.Dispose();
using (FormInputAndAction fiaa = new FormInputAndAction(str => UserClient.Net_simplify_client.ReadFromServer(
CommonHeadCode.SimplifyHeadCode.更新公告 + str).IsSuccess, UserClient.Announcement))
{
fiaa.ShowDialog();
}
}
private void 日志查看ToolStripMenuItem_Click(object sender, EventArgs e)
{
FormLog flg = new FormLog();
flg.ShowDialog();
flg.Dispose();
using (FormLog flg = new FormLog())
{
flg.ShowDialog();
}
}
private void 注册账号ToolStripMenuItem_Click(object sender, EventArgs e)

22
软件系统服务端模版/Form1.Designer.cs generated
View File

@@ -36,6 +36,7 @@
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel_version = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel_time = new System.Windows.Forms.ToolStripStatusLabel();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.版本控制ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -53,7 +54,7 @@
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.listBox1 = new System.Windows.Forms.ListBox();
this.toolStripStatusLabel_time = new System.Windows.Forms.ToolStripStatusLabel();
this.框架作者ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
@@ -90,6 +91,12 @@
this.toolStripStatusLabel_version.Size = new System.Drawing.Size(43, 17);
this.toolStripStatusLabel_version.Text = "V1.0.0";
//
// toolStripStatusLabel_time
//
this.toolStripStatusLabel_time.Name = "toolStripStatusLabel_time";
this.toolStripStatusLabel_time.Size = new System.Drawing.Size(32, 17);
this.toolStripStatusLabel_time.Text = "时间";
//
// menuStrip1
//
this.menuStrip1.BackColor = System.Drawing.SystemColors.ActiveCaption;
@@ -155,7 +162,8 @@
//
this.关于ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.关于软件ToolStripMenuItem,
this.版本号说明ToolStripMenuItem});
this.版本号说明ToolStripMenuItem,
this.框架作者ToolStripMenuItem});
this.关于ToolStripMenuItem.Name = "关于ToolStripMenuItem";
this.关于ToolStripMenuItem.Size = new System.Drawing.Size(54, 25);
this.关于ToolStripMenuItem.Text = "关于";
@@ -246,11 +254,12 @@
this.listBox1.Size = new System.Drawing.Size(216, 344);
this.listBox1.TabIndex = 8;
//
// toolStripStatusLabel_time
// 框架作者ToolStripMenuItem
//
this.toolStripStatusLabel_time.Name = "toolStripStatusLabel_time";
this.toolStripStatusLabel_time.Size = new System.Drawing.Size(32, 17);
this.toolStripStatusLabel_time.Text = "时间";
this.框架作者ToolStripMenuItem.Name = "框架作者ToolStripMenuItem";
this.框架作者ToolStripMenuItem.Size = new System.Drawing.Size(160, 26);
this.框架作者ToolStripMenuItem.Text = "框架作者";
this.框架作者ToolStripMenuItem.Click += new System.EventHandler(this.框架作者ToolStripMenuItem_Click);
//
// Form1
//
@@ -307,6 +316,7 @@
private System.Windows.Forms.ToolStripMenuItem 版本号说明ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 账户管理ToolStripMenuItem;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel_time;
private System.Windows.Forms.ToolStripMenuItem 框架作者ToolStripMenuItem;
}
}

7
软件系统服务端模版/Form1.cs
View File

@@ -179,6 +179,13 @@ namespace 软件系统服务端模版
fm.ShowDialog();
}
}
private void 框架作者ToolStripMenuItem_Click(object sender, EventArgs e)
{
using (FormAuthorAdvertisement faa = new FormAuthorAdvertisement())
{
faa.ShowDialog();
}
}
private void 账户管理ToolStripMenuItem_Click(object sender, EventArgs e)
{
//该部分比较复杂，需要对委托，匿名委托概念比较清晰