增加一个运行时日志，修复一些其他的小BUG，调整文件删除确认

Author: dathlin

CommonLibrary/AccountSupport/ServerAccount.cs

@@ -47,6 +47,7 @@ public void UpdatePassword(string name, string password)
                     if (name == all_list_accounts[i].UserName)
                     {
                         all_list_accounts[i].Password = password;
+                        LogHelper?.LogSave(Resource.StringResouce.AccountModifyPassword + name);
                         break;
                     }
                 }
@@ -144,6 +145,7 @@ public bool AddNewAccount(T account)
                     }
                 }
                 all_list_accounts.Add(account);
+                LogHelper?.LogSave(Resource.StringResouce.AccountAddSuccess + account.UserName);
             }
             return true;
         }
@@ -161,6 +163,7 @@ public void DeleteAccount(string name)
                     if (name == all_list_accounts[i].UserName)
                     {
                         all_list_accounts.RemoveAt(i);
+                        LogHelper?.LogSave(Resource.StringResouce.AccountDeleteSuccess + name);
                         break;
                     }
                 }
@@ -208,7 +211,7 @@ public void LoadAllAccountsJson(string json)
                 }
                 catch(Exception ex)
                 {
-                    LogHelper.LogSave(Resource.StringResouce.AccountLoadFailed, ex);
+                    LogHelper?.LogSave(Resource.StringResouce.AccountLoadFailed, ex);
                 }
             }
         }

CommonLibrary/HeadCode.cs

@@ -43,6 +43,8 @@ public class SimplifyHeadCode
             public static string 同步日志清空 { get; } = "B004";
             public static string 更新日志查看 { get; } = "B005";
             public static string 更新日志清空 { get; } = "B006";
+            public static string 运行日志查看 { get; } = "B007";
+            public static string 运行日志清空 { get; } = "B008";
 
             /**************************************************************************************
              * 

CommonLibrary/Resource.cs

@@ -20,7 +20,10 @@ public class StringResouce
 
 
 
-            public const string AccountLoadFailed = "新增账户失败"; 
+            public const string AccountLoadFailed = "新增账户失败";
+            public const string AccountDeleteSuccess = "账户删除：";
+            public const string AccountAddSuccess = "账户新增：";
+            public const string AccountModifyPassword = "账户更改密码：";
         }
     }
 }

软件系统客户端模版/FormLog.Designer.cs

@@ -71,5 +71,15 @@ private void userButton5_Click(object sender, EventArgs e)
         {
             ClearFromServer(CommonHeadCode.SimplifyHeadCode.更新日志清空);
         }
+
+        private void userButton7_Click(object sender, EventArgs e)
+        {
+            ReadFromServer(CommonHeadCode.SimplifyHeadCode.运行日志查看);
+        }
+
+        private void userButton6_Click(object sender, EventArgs e)
+        {
+            ClearFromServer(CommonHeadCode.SimplifyHeadCode.运行日志清空);
+        }
     }
 }

软件系统客户端模版/FormLog.cs

@@ -40,6 +40,7 @@ private void userButton_login_Click(object sender, EventArgs e)
             UserAccount account = new UserAccount();
             account.UserName = textBox1.Text;
             account.Password = textBox2.Text;
+            account.Factory = textBox3.Text;
             switch (comboBox1.SelectedIndex)
             {
                 case 0: account.Grade = AccountGrade.SuperAdministrator; break;

软件系统客户端模版/FormRegisterAccount.cs

@@ -77,7 +77,7 @@ private void SetFilesShow(List<File_Save> files)
                             }
                             else
                             {
-                                return true;
+                                return MessageBox.Show("请确认是否真的删除？", "删除确认", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes;
                             }
                         });
                     panel2.Controls.Add(item);

软件系统客户端模版/UIControls/ShareFilesRender.cs

@@ -65,7 +65,7 @@ public Form1()
         private void Form1_Load(object sender, EventArgs e)
         {
             //初始化日志工具
-            LogHelper = new SoftLogHelper()
+            RuntimeLogHelper = new SoftLogHelper()
             {
                 LogSaveFileName = Application.StartupPath + @"\log.txt",
             };
@@ -78,7 +78,7 @@ private void Form1_Load(object sender, EventArgs e)
             //加载账户信息
             UserServer.ServerAccounts.FileSavePath = Application.StartupPath + @"\accounts.txt";
             UserServer.ServerAccounts.LoadByFile();
-            UserServer.ServerAccounts.LogHelper = LogHelper;
+            UserServer.ServerAccounts.LogHelper = RuntimeLogHelper;
         }
         private void Form1_FormClosing(object sender, FormClosingEventArgs e)
         {
@@ -449,6 +449,15 @@ private void DataProcessingWithStartB(AsyncStateBase object1, string object2)
                 net_soft_update_Server.LogHelper.ClearLogText();
                 net_simplify_server.SendMessage(object1, "成功");
             }
+            else if (headCode == CommonHeadCode.SimplifyHeadCode.运行日志查看)
+            {
+                net_simplify_server.SendMessage(object1, RuntimeLogHelper.GetLogText());
+            }
+            else if (headCode == CommonHeadCode.SimplifyHeadCode.运行日志清空)
+            {
+                RuntimeLogHelper.ClearLogText();
+                net_simplify_server.SendMessage(object1, "成功");
+            }
             else
             {
                 net_simplify_server.SendMessage(object1, object2);
@@ -680,9 +689,9 @@ private void MelsecNetMultiInnitialization()
                 IpEndPoints.Add(new System.Net.IPEndPoint(System.Net.IPAddress.Parse("192.168.10." + i), 6000));
             }
 
-            //每隔1000秒钟访问一次
+            //每隔1秒钟访问一次
             MelsecMulti = new HslCommunication.Profinet.MelsecNetMultiAsync(0, 0, HslCommunication.Profinet.MelsecDataType.D, 6000, 20, 700, 1000, IpEndPoints.ToArray());
-            MelsecMulti.OnReceivedData += MelsecMulti_OnReceivedData;
+            MelsecMulti.OnReceivedData += MelsecMulti_OnReceivedData;//所有机台的数据都返回时触发
         }
 
         private void MelsecMulti_OnReceivedData(byte[] object1)
@@ -696,7 +705,13 @@ private void MelsecMulti_OnReceivedData(byte[] object1)
              *    每台设备的前两个字节都为0才说明本次数据访问正常，为0x00,0x01说明连接失败，其他说明说明三菱本身的异常
              * 
              ********************************************************************************************/
+            for (int i = 0; i < 100; i++)
+            {
+                int startIndex = i * 42;
+                ushort netState = BitConverter.ToUInt16(object1, startIndex);//为0，说明数据正常，不为0说明网络访问失败或是指令出错
 
+
+            }
         }
 
 
@@ -711,6 +726,6 @@ private void MelsecMulti_OnReceivedData(byte[] object1)
         /// <summary>
         /// 用来记录一般的事物日志
         /// </summary>
-        private SoftLogHelper LogHelper { get; set; }
+        private SoftLogHelper RuntimeLogHelper { get; set; }
     }
 }