diff --git a/CommonLibrary/HeadCode.cs b/CommonLibrary/HeadCode.cs index 46901a9..9caec24 100644 --- a/CommonLibrary/HeadCode.cs +++ b/CommonLibrary/HeadCode.cs @@ -52,6 +52,7 @@ namespace CommonLibrary public static int 更新版本 { get; } = 10009; public static int 请求文件 { get; } = 10010; public static int 意见反馈 { get; } = 10011; + public static int 群发消息 { get; } = 10012; diff --git a/软件系统客户端模版/FormMainWindow.Designer.cs b/软件系统客户端模版/FormMainWindow.Designer.cs index ad023e2..9e75df8 100644 --- a/软件系统客户端模版/FormMainWindow.Designer.cs +++ b/软件系统客户端模版/FormMainWindow.Designer.cs @@ -50,6 +50,7 @@ this.关于本软件ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.更新日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.版本号说明ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.意见反馈ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel_right = new System.Windows.Forms.Panel(); this.label_file_count = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); @@ -74,7 +75,7 @@ this.panel_left = new System.Windows.Forms.Panel(); this.label10 = new System.Windows.Forms.Label(); this.panel_main = new System.Windows.Forms.Panel(); - this.意见反馈ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.消息发送ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.panel_right.SuspendLayout(); @@ -163,7 +164,8 @@ this.日志查看ToolStripMenuItem, this.账户管理ToolStripMenuItem, this.远程更新ToolStripMenuItem, - this.注册账号ToolStripMenuItem}); + this.注册账号ToolStripMenuItem, + this.消息发送ToolStripMenuItem}); this.管理员ToolStripMenuItem.Image = global::软件系统客户端模版.Properties.Resources.Team_32xLG; this.管理员ToolStripMenuItem.Name = "管理员ToolStripMenuItem"; this.管理员ToolStripMenuItem.Size = new System.Drawing.Size(100, 31); @@ -261,6 +263,13 @@ this.版本号说明ToolStripMenuItem.Text = "版本号说明"; this.版本号说明ToolStripMenuItem.Click += new System.EventHandler(this.版本号说明ToolStripMenuItem_Click); // + // 意见反馈ToolStripMenuItem + // + this.意见反馈ToolStripMenuItem.Name = "意见反馈ToolStripMenuItem"; + this.意见反馈ToolStripMenuItem.Size = new System.Drawing.Size(184, 32); + this.意见反馈ToolStripMenuItem.Text = "意见反馈"; + this.意见反馈ToolStripMenuItem.Click += new System.EventHandler(this.意见反馈ToolStripMenuItem_Click); + // // panel_right // this.panel_right.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -510,12 +519,12 @@ this.panel_main.Size = new System.Drawing.Size(557, 419); this.panel_main.TabIndex = 5; // - // 意见反馈ToolStripMenuItem + // 消息发送ToolStripMenuItem // - this.意见反馈ToolStripMenuItem.Name = "意见反馈ToolStripMenuItem"; - this.意见反馈ToolStripMenuItem.Size = new System.Drawing.Size(184, 32); - this.意见反馈ToolStripMenuItem.Text = "意见反馈"; - this.意见反馈ToolStripMenuItem.Click += new System.EventHandler(this.意见反馈ToolStripMenuItem_Click); + this.消息发送ToolStripMenuItem.Name = "消息发送ToolStripMenuItem"; + this.消息发送ToolStripMenuItem.Size = new System.Drawing.Size(164, 32); + this.消息发送ToolStripMenuItem.Text = "消息发送"; + this.消息发送ToolStripMenuItem.Click += new System.EventHandler(this.消息发送ToolStripMenuItem_Click); // // FormMainWindow // @@ -597,6 +606,7 @@ private System.Windows.Forms.Label label10; private System.Windows.Forms.ToolStripMenuItem 留言板ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 意见反馈ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 消息发送ToolStripMenuItem; } } diff --git a/软件系统客户端模版/FormMainWindow.cs b/软件系统客户端模版/FormMainWindow.cs index 04dcdeb..774352d 100644 --- a/软件系统客户端模版/FormMainWindow.cs +++ b/软件系统客户端模版/FormMainWindow.cs @@ -254,6 +254,15 @@ namespace 软件系统客户端模版 } } + private void 消息发送ToolStripMenuItem_Click(object sender, EventArgs e) + { + using (FormInputAndAction fiaa = new FormInputAndAction(str => UserClient.Net_simplify_client.ReadFromServer( + CommonHeadCode.SimplifyHeadCode.群发消息, UserClient.UserAccount.UserName + ":" + str).IsSuccess, "", "请输入群发的消息:")) + { + fiaa.ShowDialog(); + } + } + #endregion #region 异步网络块 @@ -565,5 +574,7 @@ namespace 软件系统客户端模版 #endregion + + } } diff --git a/软件系统服务端模版/FormServerWindow.cs b/软件系统服务端模版/FormServerWindow.cs index 5d3a92b..11216cf 100644 --- a/软件系统服务端模版/FormServerWindow.cs +++ b/软件系统服务端模版/FormServerWindow.cs @@ -448,6 +448,11 @@ namespace 软件系统服务端模版 AdviceLogHelper.SaveInformation(data); net_simplify_server.SendMessage(state, customer, "成功"); } + else if (customer == CommonHeadCode.SimplifyHeadCode.群发消息) + { + net_socket_server.SendAllClients(CommonHeadCode.MultiNetHeadCode.弹窗新消息, data); + net_simplify_server.SendMessage(state, customer, "成功"); + } else { net_simplify_server.SendMessage(state, customer, data);