修改服务器文件夹和文件名列表获取方法。

Welling_Motor_Debug_Tool/ftp.cs

@@ -284,20 +284,10 @@ namespace Welling_Motor_Debug_Tool
                 {
                     if (str.Trim().Length == 0)
                         continue;
-                    //会有两种格式的详细信息返回
-                    //一种包含<DIR>
-                    //一种第一个字符串是drwxerwxx这样的权限操作符号
-                    //现在写代码包容两种格式的字符串
-                    if (!str.Trim().Contains("<DIR>"))
+                    //-rwxrwxrwx开头
+                    if (str.Trim().Substring(0, 1).ToUpper() == "-")
                     {
-                        strList.Add(str.Substring(str.LastIndexOf(":") + 4).Trim()) ;
-                    }
-                    else
-                    {
-                        if (str.Trim().Substring(0, 1).ToUpper() != "D")
-                        {
-                            strList.Add(str.Substring(str.LastIndexOf(":") + 1).Trim()) ;
-                        }
+                        strList.Add(str.Substring(str.LastIndexOf(":") + 4).Trim());
                     }
                 }
             }
@@ -330,20 +320,10 @@ namespace Welling_Motor_Debug_Tool
                 {
                     if (str.Trim().Length == 0)
                         continue;
-                    //会有两种格式的详细信息返回
-                    //一种包含<DIR>
-                    //一种第一个字符串是drwxerwxx这样的权限操作符号
-                    //现在写代码包容两种格式的字符串
-                    if (str.Trim().Contains("<DIR>"))
-                    {
-                        strList.Add(str.Substring(39).Trim());
-                    }
-                    else
+                    //drwxrwxrwx开头
+                    if (str.Trim().Substring(0, 1) == "d")
                     {
-                        if (str.Trim().Substring(0, 1) == "d")
-                        {
-                            strList.Add(str.Split(' ')[str.Split(' ').Length - 1].Trim());
-                        }
+                        strList.Add(str.Split(' ')[str.Split(' ').Length - 1].Trim());
                     }
                 }
             }

Welling_Motor_Debug_Tool/mainForm.Designer.cs

@@ -799,7 +799,7 @@ namespace Welling_Motor_Debug_Tool
             // 允许ToolStripMenuItem
             // 
             this.允许ToolStripMenuItem.Name = "允许ToolStripMenuItem";
-            this.允许ToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+            this.允许ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.允许ToolStripMenuItem.Text = "允许";
             this.允许ToolStripMenuItem.Click += new System.EventHandler(this.允许ToolStripMenuItem_Click);
             // 
@@ -808,7 +808,7 @@ namespace Welling_Motor_Debug_Tool
             this.不允许ToolStripMenuItem.Checked = true;
             this.不允许ToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
             this.不允许ToolStripMenuItem.Name = "不允许ToolStripMenuItem";
-            this.不允许ToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+            this.不允许ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.不允许ToolStripMenuItem.Text = "不允许";
             this.不允许ToolStripMenuItem.Click += new System.EventHandler(this.不允许ToolStripMenuItem_Click);
             // 
@@ -837,7 +837,7 @@ namespace Welling_Motor_Debug_Tool
             this.toolStripTextBox_ServerIP.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
             this.toolStripTextBox_ServerIP.Name = "toolStripTextBox_ServerIP";
             this.toolStripTextBox_ServerIP.Size = new System.Drawing.Size(200, 28);
-            this.toolStripTextBox_ServerIP.Text = "10.176.42.30";
+            this.toolStripTextBox_ServerIP.Text = "8.134.109.44";
             this.toolStripTextBox_ServerIP.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ConfigFileSave_KeyDown);
             // 
             // 端口ToolStripMenuItem
@@ -869,7 +869,7 @@ namespace Welling_Motor_Debug_Tool
             this.toolStripTextBox_ServerUser.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
             this.toolStripTextBox_ServerUser.Name = "toolStripTextBox_ServerUser";
             this.toolStripTextBox_ServerUser.Size = new System.Drawing.Size(200, 28);
-            this.toolStripTextBox_ServerUser.Text = "factory_test";
+            this.toolStripTextBox_ServerUser.Text = "ttium";
             this.toolStripTextBox_ServerUser.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ConfigFileSave_KeyDown);
             // 
             // 密码ToolStripMenuItem
@@ -885,7 +885,7 @@ namespace Welling_Motor_Debug_Tool
             this.toolStripTextBox_ServerPasswd.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F);
             this.toolStripTextBox_ServerPasswd.Name = "toolStripTextBox_ServerPasswd";
             this.toolStripTextBox_ServerPasswd.Size = new System.Drawing.Size(200, 28);
-            this.toolStripTextBox_ServerPasswd.Text = "ttium";
+            this.toolStripTextBox_ServerPasswd.Text = "ttium123";
             this.toolStripTextBox_ServerPasswd.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ConfigFileSave_KeyDown);
             // 
             // 存储路径ToolStripMenuItem
@@ -1025,7 +1025,7 @@ namespace Welling_Motor_Debug_Tool
             this.电压ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_ThVol});
             this.电压ToolStripMenuItem.Name = "电压ToolStripMenuItem";
-            this.电压ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.电压ToolStripMenuItem.Size = new System.Drawing.Size(151, 26);
             this.电压ToolStripMenuItem.Text = "电压";
             // 
             // toolStripTextBox_ThVol
@@ -1041,7 +1041,7 @@ namespace Welling_Motor_Debug_Tool
             this.电流ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_ThCur});
             this.电流ToolStripMenuItem.Name = "电流ToolStripMenuItem";
-            this.电流ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.电流ToolStripMenuItem.Size = new System.Drawing.Size(151, 26);
             this.电流ToolStripMenuItem.Text = "电流";
             // 
             // toolStripTextBox_ThCur
@@ -1057,7 +1057,7 @@ namespace Welling_Motor_Debug_Tool
             this.转速ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_ThSpeed});
             this.转速ToolStripMenuItem.Name = "转速ToolStripMenuItem";
-            this.转速ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.转速ToolStripMenuItem.Size = new System.Drawing.Size(151, 26);
             this.转速ToolStripMenuItem.Text = "转速";
             // 
             // toolStripTextBox_ThSpeed
@@ -1073,7 +1073,7 @@ namespace Welling_Motor_Debug_Tool
             this.力矩ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_ThTor});
             this.力矩ToolStripMenuItem.Name = "力矩ToolStripMenuItem";
-            this.力矩ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.力矩ToolStripMenuItem.Size = new System.Drawing.Size(151, 26);
             this.力矩ToolStripMenuItem.Text = "力矩";
             // 
             // toolStripTextBox_ThTor
@@ -1089,7 +1089,7 @@ namespace Welling_Motor_Debug_Tool
             this.踏频ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_ThCad});
             this.踏频ToolStripMenuItem.Name = "踏频ToolStripMenuItem";
-            this.踏频ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.踏频ToolStripMenuItem.Size = new System.Drawing.Size(151, 26);
             this.踏频ToolStripMenuItem.Text = "踏频";
             // 
             // toolStripTextBox_ThCad
@@ -1105,7 +1105,7 @@ namespace Welling_Motor_Debug_Tool
             this.车速ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_ThBikeSpeed});
             this.车速ToolStripMenuItem.Name = "车速ToolStripMenuItem";
-            this.车速ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.车速ToolStripMenuItem.Size = new System.Drawing.Size(151, 26);
             this.车速ToolStripMenuItem.Text = "车速";
             // 
             // toolStripTextBox_ThBikeSpeed
@@ -1121,7 +1121,7 @@ namespace Welling_Motor_Debug_Tool
             this.pCB温度ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_ThT_PCB});
             this.pCB温度ToolStripMenuItem.Name = "pCB温度ToolStripMenuItem";
-            this.pCB温度ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.pCB温度ToolStripMenuItem.Size = new System.Drawing.Size(151, 26);
             this.pCB温度ToolStripMenuItem.Text = "PCB温度";
             // 
             // toolStripTextBox_ThT_PCB
@@ -1137,7 +1137,7 @@ namespace Welling_Motor_Debug_Tool
             this.mCU温度ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_ThT_MCU});
             this.mCU温度ToolStripMenuItem.Name = "mCU温度ToolStripMenuItem";
-            this.mCU温度ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.mCU温度ToolStripMenuItem.Size = new System.Drawing.Size(151, 26);
             this.mCU温度ToolStripMenuItem.Text = "MCU温度";
             // 
             // toolStripTextBox_ThT_MCU
@@ -1153,7 +1153,7 @@ namespace Welling_Motor_Debug_Tool
             this.电机温度ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripTextBox_ThT_Motor});
             this.电机温度ToolStripMenuItem.Name = "电机温度ToolStripMenuItem";
-            this.电机温度ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.电机温度ToolStripMenuItem.Size = new System.Drawing.Size(151, 26);
             this.电机温度ToolStripMenuItem.Text = "电机温度";
             // 
             // toolStripTextBox_ThT_Motor
@@ -1187,28 +1187,28 @@ namespace Welling_Motor_Debug_Tool
             // 运行信息记录ToolStripMenuItem
             // 
             this.运行信息记录ToolStripMenuItem.Name = "运行信息记录ToolStripMenuItem";
-            this.运行信息记录ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
+            this.运行信息记录ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.运行信息记录ToolStripMenuItem.Text = "自动记录";
             this.运行信息记录ToolStripMenuItem.Click += new System.EventHandler(this.记录数据ToolStripMenuItem_Click);
             // 
             // 计算器ToolStripMenuItem
             // 
             this.计算器ToolStripMenuItem.Name = "计算器ToolStripMenuItem";
-            this.计算器ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
+            this.计算器ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.计算器ToolStripMenuItem.Text = "计算器";
             this.计算器ToolStripMenuItem.Click += new System.EventHandler(this.计算器ToolStripMenuItem_Click);
             // 
             // 页面保存ToolStripMenuItem
             // 
             this.页面保存ToolStripMenuItem.Name = "页面保存ToolStripMenuItem";
-            this.页面保存ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
+            this.页面保存ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.页面保存ToolStripMenuItem.Text = "页面保存";
             this.页面保存ToolStripMenuItem.Click += new System.EventHandler(this.页面保存ToolStripMenuItem_Click);
             // 
             // 屏幕键盘ToolStripMenuItem
             // 
             this.屏幕键盘ToolStripMenuItem.Name = "屏幕键盘ToolStripMenuItem";
-            this.屏幕键盘ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
+            this.屏幕键盘ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.屏幕键盘ToolStripMenuItem.Text = "屏幕键盘";
             this.屏幕键盘ToolStripMenuItem.Click += new System.EventHandler(this.屏幕键盘ToolStripMenuItem_Click);
             // 
@@ -1216,7 +1216,7 @@ namespace Welling_Motor_Debug_Tool
             // 
             this.指令调试ToolStripMenuItem.Enabled = false;
             this.指令调试ToolStripMenuItem.Name = "指令调试ToolStripMenuItem";
-            this.指令调试ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
+            this.指令调试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.指令调试ToolStripMenuItem.Text = "指令调试";
             // 
             // 查询ToolStripMenuItem

Welling_Motor_Debug_Tool/mainForm.cs

@@ -4238,6 +4238,7 @@ namespace Welling_Motor_Debug_Tool
                 string DataFileName = "";
                 string FileInfo = "";
                 DataFileName = Save_Path + "\\" + textBox_FacModeName.Text + "_" + textBox_FacModeNum.Text + "_记录数据" + ".txt";
+                FileInfo += "测试计算机：\r\n" + label_Computername.Text + "\r\n";
                 FileInfo += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "\r\n";
                 FileInfo += "\r\n";
                 FileInfo += "[电机信息]\r\n";
@@ -5368,6 +5369,7 @@ namespace Welling_Motor_Debug_Tool
             //测试记录
             LogSaveFileName = LogSavePath + "\\" + ProductInfo + "_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + "_测试记录" + ".log";
             string file_str = "";
+            file_str += "测试计算机：\r\n" + label_Computername.Text + "\r\n";
             file_str += "测试时间：\r\n" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "\r\n\r\n";
             file_str += "检验记录：\r\n" + richTextBox_FacModeLog.Text.Replace("\n", "\r\n") + "\r\n\r\n";
             file_str += "检验结果：\r\n" + label_FacModeResult.Text + "\r\n\r\n";
@@ -6698,6 +6700,7 @@ namespace Welling_Motor_Debug_Tool
             //测试记录
             LogSaveFileName = LogSavePath + "\\" + ProductInfo + "_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + "_测试记录" + ".log";
             string file_str = "";
+            file_str += "测试计算机：\r\n" + label_Computername.Text + "\r\n";
             file_str += "测试时间：\r\n" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "\r\n\r\n";
             file_str += "检验记录：\r\n" + richTextBox_CheckModeLog.Text.Replace("\n", "\r\n") + "\r\n\r\n";
             file_str += "检验结果：\r\n" + label_CheckModeResult.Text + "\r\n\r\n";