修改

MainForm/ClassFile/ProjectClass/GlobalContext.cs

@@ -167,7 +167,7 @@ namespace MainForm
 
         public static string UpFileUrl;  // 文档库地址
         public static string UpFilePath;  // 本地文件路径
-        public static bool IsSendUpFile;    // 启用上传文件
+        public static bool MESIsSendUpFile;    // 启用上传文件
 
         // IOT - MQTT
         public static bool IsUseIot;  // 是否 启用IOT
@@ -395,7 +395,7 @@ namespace MainForm
                 StationOutMESUrl = string.Format(StationOutMESUrl, ServerHost);
                 UpFileUrl = IniFile.INIGetStringValue(FilePath, "MES", "UpFileUrl", "");
                 UpFilePath = IniFile.INIGetStringValue(FilePath, "MES", "UpFilePath", "");
-                IsSendUpFile = bool.Parse(IniFile.INIGetStringValue(FilePath, "MES", "IsSendUpFile", ConstIsSend));
+                MESIsSendUpFile = bool.Parse(IniFile.INIGetStringValue(FilePath, "MES", "MESIsSendUpFile", ConstIsSend));
 
                 if (ServerHost.Contains(":"))
                 {

MainForm/ClassFile/XiaomiAPI_IOT/Extend/XiaomiMqttClient_DeviceStateData.cs

@@ -45,7 +45,7 @@ namespace MainForm.ClassFile.XiaomiAPI
             else
                 resultStr = XiaomiMqttResponse_ErrCode.ERR_UNKOWN.ToString();
             string logPath = GlobalContext.MqttDeviceStateDir + "macState" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
-            FileOperate.NewTxtFile(logPath, "【设备状态】MQTT提交：" + msg + "\r\n==>提交结果：" + resultStr+ "");
+            FileOperate.NewTxtFile(logPath, DateTime.Now+"===>MQTT【设备状态】提交：" + msg + "\r\n==>提交结果：" + resultStr+ "");
             return (result, resultStr);
         }
 

MainForm/ClassFile/XiaomiAPI_IOT/Extend/XiaomiMqttClient_FaultLog.cs

@@ -49,7 +49,7 @@ namespace MainForm.ClassFile.XiaomiAPI
                 resultStr = XiaomiMqttResponse_ErrCode.ERR_UNKOWN.ToString();
 
             string logPath = GlobalContext.MqttAlarmLogDir + "AlarmType" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
-            FileOperate.NewTxtFile(logPath, "MQTT【故障日志】提交：" + msg + "\r\n==>提交结果：" + resultStr + "");
+            FileOperate.NewTxtFile(logPath, DateTime.Now+"===>MQTT【故障日志】提交：" + msg + "\r\n==>提交结果：" + resultStr + "");
 
             return (result, resultStr);
         }

MainForm/ClassFile/XiaomiAPI_IOT/Extend/XiaomiMqttClient_OperateLog.cs

@@ -43,7 +43,7 @@ namespace MainForm.ClassFile.XiaomiAPI
                 resultStr = XiaomiMqttResponse_ErrCode.ERR_UNKOWN.ToString();
 
             string logPath = GlobalContext.MqttOperateLogDir + "OperationRecord" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
-            FileOperate.NewTxtFile(logPath, "MQTT【操作记录】提交：" + msg + "\r\n==>提交结果：" + resultStr + "");
+            FileOperate.NewTxtFile(logPath, DateTime.Now+"===>MQTT【操作记录】提交：" + msg + "\r\n==>提交结果：" + resultStr + "");
 
             return (result, resultStr);
         }

MainForm/ClassFile/XiaomiAPI_IOT/Extend/XiaomiMqttClient_PassStationResult.cs

@@ -43,8 +43,8 @@ namespace MainForm.ClassFile.XiaomiAPI
             else
                 resultStr = XiaomiMqttResponse_ErrCode.ERR_UNKOWN.ToString();
 
-            string logPath = GlobalContext.MqttAlarmLogDir + "PassStationResult" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
-            FileOperate.NewTxtFile(logPath, "MQTT【过站结果】提交：" + msg + "\r\n==>提交结果：" + resultStr + "");
+            string logPath = GlobalContext.MqttPassResultLogDir + "PassStationResult" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+            FileOperate.NewTxtFile(logPath, DateTime.Now+"===>MQTT【过站结果】提交：" + msg + "\r\n==>提交结果：" + resultStr + "");
 
             return (result, resultStr);
         }
@@ -168,8 +168,8 @@ namespace MainForm.ClassFile.XiaomiAPI
             else
                 resultStr = XiaomiMqttResponse_ErrCode.ERR_UNKOWN.ToString();
 
-            string logPath = GlobalContext.MqttPassResultLogDir + "PassStationDetail" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
-            FileOperate.NewTxtFile(logPath, "MQTT【过站明细】提交：" + msg + "\r\n==>提交结果：" + resultStr + "");
+            string logPath = GlobalContext.MqttPassDetailLogDir + "PassStationDetail" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+            FileOperate.NewTxtFile(logPath, DateTime.Now+"===>MQTT【过站明细】提交：" + msg + "\r\n==>提交结果：" + resultStr + "");
 
             return (result, resultStr);
         }

MainForm/ClassFile/XiaomiAPI_IOT/Extend/XiaomiMqttClient_StationInputBegin.cs

@@ -61,7 +61,7 @@ namespace MainForm.ClassFile.XiaomiAPI
             else
                 resultStr = XiaomiMqttResponse_ErrCode.ERR_UNKOWN.ToString();
             string logPath = GlobalContext.MqttInputBeginDir + "beatType" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
-            FileOperate.NewTxtFile(logPath, "MQTT【节拍日志】提交：" + msg + "\r\n==>提交结果：" + resultStr + "");
+            FileOperate.NewTxtFile(logPath, DateTime.Now+"===>MQTT【节拍日志】提交：" + msg + "\r\n==>提交结果：" + resultStr + "");
             return (result, resultStr);
         }
 

MainForm/ClassFile/XiaomiAPI_MES/XiaomiMESHttp_UpLoadFile.cs

@@ -3,6 +3,7 @@ using Newtonsoft.Json;
 using Sunny.UI.Win32;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -10,6 +11,7 @@ using System.Security.Cryptography;
 using System.Security.Policy;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 using static MainForm.ClassFile.XiaomiAPI.XiaomiMqttClient_Extend;
 using static MainForm.ClassFile.XiaomiAPI_MES.XiaomiMESHttp_StationInbound;
 using static MainForm.ClassFile.XiaomiAPI_MES.XiaomiMESHttp_StationOutbound.XmMES_StationOutRequest_Body;
@@ -44,8 +46,10 @@ namespace MainForm.ClassFile.XiaomiAPI_MES
         /// <returns>(状态码, 结果信息)</returns>
         public static async Task<(int, string)> FileUoladToMes(string wJPath, FileUpload_X5 fileUpload_X5, FileMqttPayload fileMqttPayload)
         {
+            string logPath = GlobalContext.MqttFileUpLogDir + "FileInfo" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
             try
             {
+                Stopwatch stopwatch1 = new Stopwatch();
                 // 基础参数
                 string url = "http://cm.pre.mi.com/file/x5/file/upload/mqtt";
                 url = "http://im.pre.mi.com/file/x5/file/upload/mqtt";
@@ -82,21 +86,17 @@ namespace MainForm.ClassFile.XiaomiAPI_MES
                 // 将 data 参数序列化为 Base64 编码的字符串
                 string data = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(dataParam)));
 
+                FileOperate.NewTxtFile(logPath, DateTime.Now + $"==>【文件提交】开始上传：文件包[{fileUpload_X5.bucket}]，文件名[{file.Name}]");
+                stopwatch1.Start();
                 // 调用上传方法
                 var uploadResult = UploadFile(url, file, data).Result;
+                stopwatch1.Stop();
 
-                string logPath = GlobalContext.MqttFileUpLogDir + "FileInfo" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
-                FileOperate.NewTxtFile(logPath, "【文件提交】HTTP提交：" + JsonConvert.SerializeObject(dataParam) + "\r\n==>提交结果：" + uploadResult + "");
+                FileOperate.NewTxtFile(logPath, DateTime.Now+"===>【文件提交】HTTP提交：" + JsonConvert.SerializeObject(dataParam) + "\r\n==>提交结果：" + uploadResult + "");
 
                 //获取返回参数
                 FileUpload_Result fileUpList = JsonConvert.DeserializeObject<FileUpload_Result>(uploadResult);
-                //附件信息添加到主页面
-                FileData fileData = new FileData();
-                fileData.FileName = file.Name;
-                fileData.FileId = fileUpList.body.uuid;
-                fileData.Bucket = fileUpList.body.bucket;
-                Form_Home home = new Form_Home();
-                home.fileUploadData.fileData.Add(fileData);
+
 
                 // 判断上传结果
                 if (!string.IsNullOrEmpty(uploadResult) && !uploadResult.StartsWith("异常:") && !uploadResult.StartsWith("HTTP 错误:"))
@@ -108,10 +108,19 @@ namespace MainForm.ClassFile.XiaomiAPI_MES
                         return (0, fileUpload_X5.name+newResult.Item2);
 
                     }
+                    //附件信息添加到主页面
+                    FileData fileData = new FileData();
+                    fileData.FileName = file.Name;
+                    fileData.FileId = fileUpList.body.uuid;
+                    fileData.Bucket = fileUpList.body.bucket;
+                    Form_Home.fileUploadData.fileData.Add(fileData);
+
+                    FileOperate.NewTxtFile(logPath, DateTime.Now + $"==>【文件提交】上传结束：文件包[{fileUpload_X5.bucket}]，文件名[{file.Name}],耗时[{stopwatch1.ElapsedMilliseconds}]");
                     return (0, fileUpload_X5.name + $"文件上传成功");
                 }
                 else
                 {
+                    FileOperate.NewTxtFile(logPath, DateTime.Now + $"==>【文件提交】上传失败：文件包[{fileUpload_X5.bucket}]，文件名[{file.Name}],耗时[{stopwatch1.ElapsedMilliseconds}]");
                     return (-2, fileUpload_X5.name+$"文件上传失败: {uploadResult}");
                 }
             }

MainForm/FaForm/Form_Home.Designer.cs

@@ -30,10 +30,10 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form_Home));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panel1 = new System.Windows.Forms.Panel();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.state_r = new System.Windows.Forms.Label();
@@ -178,6 +178,7 @@
             this.lblDeviceStates2.TabIndex = 101;
             this.lblDeviceStates2.Text = "未初始状态";
             this.lblDeviceStates2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.lblDeviceStates2.Visible = false;
             // 
             // lblDeviceStates
             // 
@@ -622,14 +623,14 @@
             this.systemLog.AllowUserToResizeRows = false;
             this.systemLog.BackgroundColor = System.Drawing.Color.White;
             this.systemLog.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle9.BackColor = System.Drawing.Color.WhiteSmoke;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.systemLog.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.systemLog.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.systemLog.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.systemLog.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colDate,
@@ -641,19 +642,19 @@
             this.systemLog.Location = new System.Drawing.Point(3, 32);
             this.systemLog.Name = "systemLog";
             this.systemLog.ReadOnly = true;
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.systemLog.RowHeadersDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.systemLog.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
             this.systemLog.RowHeadersVisible = false;
             this.systemLog.RowHeadersWidth = 51;
             this.systemLog.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.systemLog.RowsDefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.systemLog.RowsDefaultCellStyle = dataGridViewCellStyle4;
             this.systemLog.RowTemplate.Height = 27;
             this.systemLog.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.systemLog.Size = new System.Drawing.Size(1533, 435);
@@ -661,8 +662,8 @@
             // 
             // colDate
             // 
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.colDate.DefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.colDate.DefaultCellStyle = dataGridViewCellStyle2;
             this.colDate.HeaderText = "日期";
             this.colDate.MinimumWidth = 6;
             this.colDate.Name = "colDate";

MainForm/FaForm/Form_Home.resx

@@ -8367,7 +8367,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACQ
-        PgAAAk1TRnQBSQFMAgEBAwEAAeABCAHgAQgBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        PgAAAk1TRnQBSQFMAgEBAwEAAegBCAHoAQgBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
         AwABIAMAAQEBAAEgBgABQP8A/wA8AAP5Af8DzgH/A6gB/wOLAf8DeAH/A3EB/wNxAf8DeAH/A4sB/wOo
         Af8DzwH/A/kB/1AAAfcB+wH3Af8BuwHgAbYB/wGGAcgBfAH/AV0BtQFQAf8BQgGpATMB/wE5AaUBKQH/
         ATkBpQEpAf8BQwGqATQB/wFdAbYBUAH/AYUByAF7Af8BvAHhAbcB/wH3AfsB9wH/UAAB9gH1AfsB/wGw