Forráskód Böngészése

针对MOTINOVA_Motor_Factory_Set软件增加不执行推行测试的功能,通过密码限制设置。

dail 3 éve
szülő
commit
5a33caeb7b
35 módosított fájl, 661 hozzáadás és 542 törlés
  1. 9 1
      CheckForm.cs
  2. 93 33
      ImportForm.Designer.cs
  3. 499 465
      ImportForm.cs
  4. 7 7
      ImportForm.resx
  5. 3 1
      MOTINOVA_Motor_Factory_Set.csproj
  6. 3 3
      Properties/Resources.Designer.cs
  7. 1 1
      Properties/Settings.Designer.cs
  8. 1 1
      StartForm.Designer.cs
  9. 3 3
      StartForm.resx
  10. 1 1
      app.config
  11. 6 3
      bin/Debug/MOTINOVA_Motor_Factory_Set.application
  12. BIN
      bin/Debug/MOTINOVA_Motor_Factory_Set.exe
  13. 1 1
      bin/Debug/MOTINOVA_Motor_Factory_Set.exe.config
  14. 10 20
      bin/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest
  15. BIN
      bin/Debug/MOTINOVA_Motor_Factory_Set.pdb
  16. 1 1
      bin/Debug/SerialNum
  17. BIN
      bin/Debug/app.publish/MOTINOVA_Motor_Factory_Set.exe
  18. BIN
      bin/Debug/发布文件20220311/MOTINOVA_Motor_Factory_Set_20220311.exe
  19. BIN
      bin/Debug/发布文件20220311/上位机使用说明20220118.pdf
  20. BIN
      bin/Debug/发布文件20220316/MOTINOVA_Motor_Factory_Set_20220316.exe
  21. BIN
      bin/Debug/发布文件20220316/上位机使用说明20220118.pdf
  22. BIN
      obj/Debug/DesignTimeResolveAssemblyReferences.cache
  23. BIN
      obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  24. BIN
      obj/Debug/MOTINOVA_Motor_Factory_Set.ExportForm.resources
  25. BIN
      obj/Debug/MOTINOVA_Motor_Factory_Set.ImportForm.resources
  26. BIN
      obj/Debug/MOTINOVA_Motor_Factory_Set.ManageForm.resources
  27. BIN
      obj/Debug/MOTINOVA_Motor_Factory_Set.PortSettings.resources
  28. BIN
      obj/Debug/MOTINOVA_Motor_Factory_Set.Properties.Resources.resources
  29. BIN
      obj/Debug/MOTINOVA_Motor_Factory_Set.StartForm.resources
  30. 1 1
      obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.CoreCompileInputs.cache
  31. 22 0
      obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.FileListAbsolute.txt
  32. BIN
      obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.GenerateResource.cache
  33. BIN
      obj/Debug/MOTINOVA_Motor_Factory_Set.exe
  34. BIN
      obj/Debug/MOTINOVA_Motor_Factory_Set.pdb
  35. BIN
      obj/Debug/TempPE/Properties.Resources.Designer.cs.dll

+ 9 - 1
CheckForm.cs

@@ -1027,7 +1027,11 @@ namespace MOTINOVA_Motor_Factory_Set
                 }
                 try
                 {
-                    if (string.Equals(richTextBox_VerInfo.Lines[0].Split(':')[1], textBox_PDinfo.Text.Substring(0, textBox_PDinfo.Text.LastIndexOf(' '))) == false)//型号不一致
+                    string mode1 = "", mode2 = "";
+                    mode1 = richTextBox_VerInfo.Lines[0].Split(':')[1].Trim();
+                    mode2 = textBox_PDinfo.Text.Contains("%#") ? textBox_PDinfo.Text.Substring(0, textBox_PDinfo.Text.LastIndexOf('%') - 1) 
+                                                               : textBox_PDinfo.Text.Substring(0, textBox_PDinfo.Text.LastIndexOf(' ')).Trim();
+                    if (string.Equals(mode1, mode2) == false)//型号不一致
                     {
                         richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "型号错误" + "\r\n";
                         label_Step.Text = "型号不一致,测试结束!";
@@ -1044,6 +1048,10 @@ namespace MOTINOVA_Motor_Factory_Set
                         portsettings_form.closePort();
                         return;
                     }
+                    string SN1 = "", SN2 = "";
+                    SN1 = richTextBox_VerInfo.Lines[1].Split(':')[1].Trim();
+                    SN2 = textBox_PDinfo.Text.Contains("%#") ? textBox_PDinfo.Text.Remove(0, textBox_PDinfo.Text.LastIndexOf('#') + 1) 
+                                                             : textBox_PDinfo.Text.Remove(0, textBox_PDinfo.Text.LastIndexOf(' ') + 1);
                     if (string.Equals(richTextBox_VerInfo.Lines[1].Split(':')[1], textBox_PDinfo.Text.Remove(0, textBox_PDinfo.Text.LastIndexOf(' ') + 1)) == false)//SN不一致
                     {
                         richTextBox_TestRecord.Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "->" + "SN错误" + "\r\n";

+ 93 - 33
ImportForm.Designer.cs

@@ -37,6 +37,9 @@
             this.系统清除ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.系统清除执行ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.系统清除不执行ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.bMS通信检测ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.BMS检测执行ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.BMS检测不执行ToolStripMenuItem1 = 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();
@@ -143,9 +146,11 @@
             this.label_NetStatus = new System.Windows.Forms.Label();
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.bMS通信检测ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.BMS检测执行ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.BMS检测不执行ToolStripMenuItem1 = 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.label_TestFun = new System.Windows.Forms.Label();
+            this.label30 = new System.Windows.Forms.Label();
             this.menuStrip1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -197,6 +202,7 @@
             // 设置ToolStripMenuItem
             // 
             this.设置ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.执行测试ToolStripMenuItem,
             this.系统清除ToolStripMenuItem,
             this.bMS通信检测ToolStripMenuItem,
             this.端口选择ToolStripMenuItem,
@@ -224,7 +230,7 @@
             this.系统清除执行ToolStripMenuItem.Name = "系统清除执行ToolStripMenuItem";
             this.系统清除执行ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.系统清除执行ToolStripMenuItem.Text = "执行";
-            this.系统清除执行ToolStripMenuItem.Click += new System.EventHandler(this.执行ToolStripMenuItem_Click);
+            this.系统清除执行ToolStripMenuItem.Click += new System.EventHandler(this.系统清除执行ToolStripMenuItem_Click);
             // 
             // 系统清除不执行ToolStripMenuItem
             // 
@@ -232,7 +238,35 @@
             this.系统清除不执行ToolStripMenuItem.Name = "系统清除不执行ToolStripMenuItem";
             this.系统清除不执行ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
             this.系统清除不执行ToolStripMenuItem.Text = "不执行";
-            this.系统清除不执行ToolStripMenuItem.Click += new System.EventHandler(this.不执行ToolStripMenuItem_Click);
+            this.系统清除不执行ToolStripMenuItem.Click += new System.EventHandler(this.系统清除不执行ToolStripMenuItem_Click);
+            // 
+            // bMS通信检测ToolStripMenuItem
+            // 
+            this.bMS通信检测ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.BMS检测执行ToolStripMenuItem1,
+            this.BMS检测不执行ToolStripMenuItem1});
+            this.bMS通信检测ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.bMS通信检测ToolStripMenuItem.Name = "bMS通信检测ToolStripMenuItem";
+            this.bMS通信检测ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.bMS通信检测ToolStripMenuItem.Text = "BMS通信检测";
+            // 
+            // BMS检测执行ToolStripMenuItem1
+            // 
+            this.BMS检测执行ToolStripMenuItem1.Checked = true;
+            this.BMS检测执行ToolStripMenuItem1.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.BMS检测执行ToolStripMenuItem1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.BMS检测执行ToolStripMenuItem1.Name = "BMS检测执行ToolStripMenuItem1";
+            this.BMS检测执行ToolStripMenuItem1.Size = new System.Drawing.Size(180, 26);
+            this.BMS检测执行ToolStripMenuItem1.Text = "执行";
+            this.BMS检测执行ToolStripMenuItem1.Click += new System.EventHandler(this.BMS检测执行ToolStripMenuItem1_Click);
+            // 
+            // BMS检测不执行ToolStripMenuItem1
+            // 
+            this.BMS检测不执行ToolStripMenuItem1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.BMS检测不执行ToolStripMenuItem1.Name = "BMS检测不执行ToolStripMenuItem1";
+            this.BMS检测不执行ToolStripMenuItem1.Size = new System.Drawing.Size(180, 26);
+            this.BMS检测不执行ToolStripMenuItem1.Text = "不执行";
+            this.BMS检测不执行ToolStripMenuItem1.Click += new System.EventHandler(this.BMS检测不执行ToolStripMenuItem1_Click);
             // 
             // 端口选择ToolStripMenuItem
             // 
@@ -283,7 +317,7 @@
             // 
             this.屏幕键盘ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
             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);
             // 
@@ -1379,33 +1413,52 @@
             this.pictureBox1.TabIndex = 32;
             this.pictureBox1.TabStop = false;
             // 
-            // bMS通信检测ToolStripMenuItem
-            // 
-            this.bMS通信检测ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.BMS检测执行ToolStripMenuItem1,
-            this.BMS检测不执行ToolStripMenuItem1});
-            this.bMS通信检测ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
-            this.bMS通信检测ToolStripMenuItem.Name = "bMS通信检测ToolStripMenuItem";
-            this.bMS通信检测ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
-            this.bMS通信检测ToolStripMenuItem.Text = "BMS通信检测";
-            // 
-            // BMS检测执行ToolStripMenuItem1
-            // 
-            this.BMS检测执行ToolStripMenuItem1.Checked = true;
-            this.BMS检测执行ToolStripMenuItem1.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.BMS检测执行ToolStripMenuItem1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
-            this.BMS检测执行ToolStripMenuItem1.Name = "BMS检测执行ToolStripMenuItem1";
-            this.BMS检测执行ToolStripMenuItem1.Size = new System.Drawing.Size(180, 26);
-            this.BMS检测执行ToolStripMenuItem1.Text = "执行";
-            this.BMS检测执行ToolStripMenuItem1.Click += new System.EventHandler(this.BMS检测执行ToolStripMenuItem1_Click);
-            // 
-            // BMS检测不执行ToolStripMenuItem1
-            // 
-            this.BMS检测不执行ToolStripMenuItem1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
-            this.BMS检测不执行ToolStripMenuItem1.Name = "BMS检测不执行ToolStripMenuItem1";
-            this.BMS检测不执行ToolStripMenuItem1.Size = new System.Drawing.Size(180, 26);
-            this.BMS检测不执行ToolStripMenuItem1.Text = "不执行";
-            this.BMS检测不执行ToolStripMenuItem1.Click += new System.EventHandler(this.BMS检测不执行ToolStripMenuItem1_Click);
+            // 执行测试ToolStripMenuItem
+            // 
+            this.执行测试ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.推行测试执行ToolStripMenuItem,
+            this.推行测试不执行ToolStripMenuItem});
+            this.执行测试ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.执行测试ToolStripMenuItem.Name = "执行测试ToolStripMenuItem";
+            this.执行测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.执行测试ToolStripMenuItem.Text = "推行测试";
+            // 
+            // 推行测试执行ToolStripMenuItem
+            // 
+            this.推行测试执行ToolStripMenuItem.Checked = true;
+            this.推行测试执行ToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.推行测试执行ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.推行测试执行ToolStripMenuItem.Name = "推行测试执行ToolStripMenuItem";
+            this.推行测试执行ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.推行测试执行ToolStripMenuItem.Text = "执行";
+            this.推行测试执行ToolStripMenuItem.Click += new System.EventHandler(this.推行测试执行ToolStripMenuItem_Click);
+            // 
+            // 推行测试不执行ToolStripMenuItem
+            // 
+            this.推行测试不执行ToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.推行测试不执行ToolStripMenuItem.Name = "推行测试不执行ToolStripMenuItem";
+            this.推行测试不执行ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.推行测试不执行ToolStripMenuItem.Text = "不执行";
+            this.推行测试不执行ToolStripMenuItem.Click += new System.EventHandler(this.推行测试不执行ToolStripMenuItem_Click);
+            // 
+            // label_TestFun
+            // 
+            this.label_TestFun.AutoSize = true;
+            this.label_TestFun.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(113)))), ((int)(((byte)(185)))));
+            this.label_TestFun.ForeColor = System.Drawing.Color.Yellow;
+            this.label_TestFun.Location = new System.Drawing.Point(741, 4);
+            this.label_TestFun.Name = "label_TestFun";
+            this.label_TestFun.Size = new System.Drawing.Size(429, 21);
+            this.label_TestFun.TabIndex = 34;
+            this.label_TestFun.Text = "测试项目:系统清除、参数写入、推行测试,BMS通信检测";
+            // 
+            // label30
+            // 
+            this.label30.BackColor = System.Drawing.Color.Silver;
+            this.label30.Location = new System.Drawing.Point(734, 4);
+            this.label30.Name = "label30";
+            this.label30.Size = new System.Drawing.Size(1, 20);
+            this.label30.TabIndex = 11;
             // 
             // ImportForm
             // 
@@ -1413,6 +1466,8 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
             this.ClientSize = new System.Drawing.Size(1230, 813);
+            this.Controls.Add(this.label30);
+            this.Controls.Add(this.label_TestFun);
             this.Controls.Add(this.pictureBox2);
             this.Controls.Add(this.pictureBox1);
             this.Controls.Add(this.richTextBox_CfgFile);
@@ -1575,5 +1630,10 @@
         private System.Windows.Forms.ToolStripMenuItem bMS通信检测ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem BMS检测执行ToolStripMenuItem1;
         private System.Windows.Forms.ToolStripMenuItem BMS检测不执行ToolStripMenuItem1;
+        private System.Windows.Forms.ToolStripMenuItem 执行测试ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 推行测试执行ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 推行测试不执行ToolStripMenuItem;
+        private System.Windows.Forms.Label label_TestFun;
+        private System.Windows.Forms.Label label30;
     }
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 499 - 465
ImportForm.cs


+ 7 - 7
ImportForm.resx

@@ -112,24 +112,24 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>137, 17</value>
   </metadata>
-  <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>227, 17</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>46</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAA0AMDAQAAEABABoBgAA1gAAACAgEAABAAQA6AIAAD4HAAAYGBAAAQAEAOgBAAAmCgAAEBAQAAEA

+ 3 - 1
MOTINOVA_Motor_Factory_Set.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>MOTINOVA_Motor_Factory_Set</RootNamespace>
     <AssemblyName>MOTINOVA_Motor_Factory_Set</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <IsWebBootstrapper>false</IsWebBootstrapper>
@@ -39,6 +39,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -48,6 +49,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>59B8C10AF31C7A7A8CE1223D08FB77D250DDFB1C</ManifestCertificateThumbprint>

+ 3 - 3
Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace MOTINOVA_Motor_Factory_Set.Properties {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen
     // (以 /str 作为命令选项),或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -47,8 +47,8 @@ namespace MOTINOVA_Motor_Factory_Set.Properties {
         }
         
         /// <summary>
-        ///   重写当前线程的 CurrentUICulture 属性
-        ///   重写当前线程的 CurrentUICulture 属性
+        ///   重写当前线程的 CurrentUICulture 属性,对
+        ///   使用此强类型资源类的所有资源查找执行重写。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {

+ 1 - 1
Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace MOTINOVA_Motor_Factory_Set.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

+ 1 - 1
StartForm.Designer.cs

@@ -118,7 +118,7 @@
             this.label_Ver.Name = "label_Ver";
             this.label_Ver.Size = new System.Drawing.Size(316, 21);
             this.label_Ver.TabIndex = 2;
-            this.label_Ver.Text = "Ver: V1.3.2 Build Time: 2022-03-09 11:52";
+            this.label_Ver.Text = "Ver: V1.3.4 Build Time: 2022-03-16 15:32";
             // 
             // label_NetStatus
             // 

+ 3 - 3
StartForm.resx

@@ -112,12 +112,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAkAMDAAAAEACACoDgAAlgAAACAgAAABAAgAqAgAAD4PAAAQEAAAAQAIAGgFAADmFwAAMDAAAAEA

+ 1 - 1
app.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

+ 6 - 3
bin/Debug/MOTINOVA_Motor_Factory_Set.application

@@ -3,15 +3,18 @@
   <assemblyIdentity name="MOTINOVA_Motor_Factory_Set.application" version="1.0.0.3" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="MOTINOVA_Motor_Factory_Set" asmv2:product="MOTINOVA_Motor_Factory_Set" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true" />
+  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
+    <framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
+  </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="MOTINOVA_Motor_Factory_Set.exe.manifest" size="5520">
+    <dependentAssembly dependencyType="install" codebase="MOTINOVA_Motor_Factory_Set.exe.manifest" size="5097">
       <assemblyIdentity name="MOTINOVA_Motor_Factory_Set.exe" version="1.0.0.3" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>flMuhfYI6b75vy7+A6P6kOd16Gc=</dsig:DigestValue>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+        <dsig:DigestValue>qhL62vYHGcBfbDZnyqTxzFXJUTwaEtTUruTLyOoL+c8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BIN
bin/Debug/MOTINOVA_Motor_Factory_Set.exe


+ 1 - 1
bin/Debug/MOTINOVA_Motor_Factory_Set.exe.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

+ 10 - 20
bin/Debug/MOTINOVA_Motor_Factory_Set.exe.manifest

@@ -10,7 +10,7 @@
   <trustInfo>
     <security>
       <applicationRequestMinimum>
-        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
+        <PermissionSet version="1" class="System.Security.NamedPermissionSet" Name="LocalIntranet" Description="Default rights given to applications on the local intranet" Unrestricted="true" ID="Custom" SameSite="site" />
         <defaultAssemblyRequest permissionSetReference="Custom" />
       </applicationRequestMinimum>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
@@ -38,28 +38,18 @@
   </dependency>
   <dependency>
     <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="2.0.50727.0" />
+      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="System.Core" version="3.5.0.0" publicKeyToken="b77a5c561934e089" language="neutral" processorArchitecture="msil" />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="WindowsBase" version="3.0.0.0" publicKeyToken="31bf3856ad364e35" language="neutral" processorArchitecture="msil" />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="671112">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MOTINOVA_Motor_Factory_Set.exe" size="674184">
       <assemblyIdentity name="MOTINOVA_Motor_Factory_Set" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>Vsi5DBaM6SL4tqx0/BX35sYigoE=</dsig:DigestValue>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+        <dsig:DigestValue>RW3HXLPmZxJ6qD4LfYN7Jlkwt4FzZ7B+i4lUkzo7u2U=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -68,17 +58,17 @@
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>OiYK6chv5oOSOBm6uBMMEqzwwgk=</dsig:DigestValue>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+      <dsig:DigestValue>s6+YDDdInF2yzWK7Wv9mpWEHV5LfKC9w+KwWSsz+j+c=</dsig:DigestValue>
     </hash>
   </file>
-  <file name="MOTINOVA_Motor_Factory_Set.exe.config" size="134">
+  <file name="MOTINOVA_Motor_Factory_Set.exe.config" size="161">
     <hash>
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>ZYVCbF014jyazUw+0nEkH92/ao4=</dsig:DigestValue>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+      <dsig:DigestValue>1hvekB5xicyX1FodTEqjnUxN4raEGXc+x3QzhQbWWa0=</dsig:DigestValue>
     </hash>
   </file>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">

BIN
bin/Debug/MOTINOVA_Motor_Factory_Set.pdb


+ 1 - 1
bin/Debug/SerialNum

@@ -1,2 +1,2 @@
 流水号:
-70
+84

BIN
bin/Debug/app.publish/MOTINOVA_Motor_Factory_Set.exe


BIN
bin/Debug/发布文件20220311/MOTINOVA_Motor_Factory_Set_20220311.exe


BIN
bin/Debug/发布文件20220311/上位机使用说明20220118.pdf


BIN
bin/Debug/发布文件20220316/MOTINOVA_Motor_Factory_Set_20220316.exe


BIN
bin/Debug/发布文件20220316/上位机使用说明20220118.pdf


BIN
obj/Debug/DesignTimeResolveAssemblyReferences.cache


BIN
obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.ExportForm.resources


BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.ImportForm.resources


BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.ManageForm.resources


BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.PortSettings.resources


BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.Properties.Resources.resources


BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.StartForm.resources


+ 1 - 1
obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-7e5c0b10d1c5b8db562121d66230c2b11b968ddb
+1266a5ed253e3a045cc8ecb5f1f9b282ae828f47

+ 22 - 0
obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.FileListAbsolute.txt

@@ -19,3 +19,25 @@ D:\SoftDesign\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MO
 D:\SoftDesign\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.exe
 D:\SoftDesign\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.pdb
 D:\SoftDesign\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.csproj.AssemblyReference.cache
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\bin\Debug\MOTINOVA_Motor_Factory_Set.exe.config
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\bin\Debug\MOTINOVA_Motor_Factory_Set.exe.manifest
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\bin\Debug\MOTINOVA_Motor_Factory_Set.application
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\bin\Debug\MOTINOVA_Motor_Factory_Set.exe
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\bin\Debug\MOTINOVA_Motor_Factory_Set.pdb
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.csproj.AssemblyReference.cache
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.csproj.SuggestedBindingRedirects.cache
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.CheckForm.resources
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.Enter.resources
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.ExportForm.resources
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.ImportForm.resources
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.ManageForm.resources
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.PortSettings.resources
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.Properties.Resources.resources
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.StartForm.resources
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.csproj.GenerateResource.cache
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.csproj.CoreCompileInputs.cache
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.TrustInfo.xml
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.exe.manifest
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.application
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.exe
+D:\SoftDesign\20171216_PC_MortorTest\MOTINOVA_MC_Test\MOTINOVA_MC_Test\MOTINOVA_Motor_Factory_Set\MOTINOVA_Motor_Factory_Set\obj\Debug\MOTINOVA_Motor_Factory_Set.pdb

BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.csproj.GenerateResource.cache


BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.exe


BIN
obj/Debug/MOTINOVA_Motor_Factory_Set.pdb


BIN
obj/Debug/TempPE/Properties.Resources.Designer.cs.dll


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott