合并edid抄写相关代码，同时修复窗口因AutoScalMode=Font导致的缩放异常。

FactoryTool_CShare/Models/StructList.cs

@@ -232,6 +232,12 @@ namespace MOKA_Factory_Tools
         public string MIKeyUrl { get; set; } = "http://smes-app-prod.tclking.com:9006/api/SMESCustomer/GetXMCard";
         public string MIKeyReportUrl { get; set; } = "http://smes-app-prod.tclking.com:9006/api/SMESCustomer/UploadXMDataControl";
         #endregion
+
+        #region 离线EDID
+        public bool edid_offline { get; set; } = false;
+        public string edid_pid { get; set; } = "";
+        public string edid_model_name { get; set; } = "";
+        #endregion
     }
 
     public class KeyData
@@ -294,6 +300,7 @@ namespace MOKA_Factory_Tools
         public KeyData ACASKey_DataMd5 = new KeyData();
         public KeyData ACASKey_ToolMd5 = new KeyData();
         public KeyData DAK = new KeyData();
+        public KeyData FVP = new KeyData();
         #region Kayla所需数据;
         public KeyData _PSN = new KeyData();
         #endregion

FactoryTool_CShare/Views/CreateDBManually.Designer.cs

@@ -32,13 +32,13 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CreateDBManually));
             this.Order_Text = new CCWin.SkinControl.SkinWaterTextBox();
             this.skinGroupBox2 = new CCWin.SkinControl.SkinGroupBox();
-            this.OrderQuantity = new CCWin.SkinControl.SkinWaterTextBox();
-            this.skinLabel1 = new CCWin.SkinControl.SkinLabel();
             this.skinLabel14 = new CCWin.SkinControl.SkinLabel();
             this.skinLabel13 = new CCWin.SkinControl.SkinLabel();
+            this.skinLabel1 = new CCWin.SkinControl.SkinLabel();
             this.skinLabel12 = new CCWin.SkinControl.SkinLabel();
             this.ProjectID_Text = new CCWin.SkinControl.SkinWaterTextBox();
             this.ClientType_Text = new CCWin.SkinControl.SkinWaterTextBox();
+            this.OrderQuantity = new CCWin.SkinControl.SkinWaterTextBox();
             this.skinLabel11 = new CCWin.SkinControl.SkinLabel();
             this.SoftwareVersion_Text = new CCWin.SkinControl.SkinWaterTextBox();
             this.SubmitMIDInfo = new CCWin.SkinControl.SkinButton();
@@ -57,20 +57,20 @@
             // 
             // skinGroupBox2
             // 
-            resources.ApplyResources(this.skinGroupBox2, "skinGroupBox2");
             this.skinGroupBox2.BackColor = System.Drawing.Color.Transparent;
             this.skinGroupBox2.BorderColor = System.Drawing.Color.Red;
-            this.skinGroupBox2.Controls.Add(this.OrderQuantity);
-            this.skinGroupBox2.Controls.Add(this.skinLabel1);
             this.skinGroupBox2.Controls.Add(this.skinLabel14);
             this.skinGroupBox2.Controls.Add(this.skinLabel13);
+            this.skinGroupBox2.Controls.Add(this.skinLabel1);
             this.skinGroupBox2.Controls.Add(this.skinLabel12);
             this.skinGroupBox2.Controls.Add(this.ProjectID_Text);
             this.skinGroupBox2.Controls.Add(this.ClientType_Text);
+            this.skinGroupBox2.Controls.Add(this.OrderQuantity);
             this.skinGroupBox2.Controls.Add(this.skinLabel11);
             this.skinGroupBox2.Controls.Add(this.SoftwareVersion_Text);
             this.skinGroupBox2.Controls.Add(this.Order_Text);
             this.skinGroupBox2.ForeColor = System.Drawing.Color.Blue;
+            resources.ApplyResources(this.skinGroupBox2, "skinGroupBox2");
             this.skinGroupBox2.Name = "skinGroupBox2";
             this.skinGroupBox2.RectBackColor = System.Drawing.Color.White;
             this.skinGroupBox2.RoundStyle = CCWin.SkinClass.RoundStyle.All;
@@ -79,21 +79,6 @@
             this.skinGroupBox2.TitleRectBackColor = System.Drawing.Color.White;
             this.skinGroupBox2.TitleRoundStyle = CCWin.SkinClass.RoundStyle.All;
             // 
-            // OrderQuantity
-            // 
-            resources.ApplyResources(this.OrderQuantity, "OrderQuantity");
-            this.OrderQuantity.Name = "OrderQuantity";
-            this.OrderQuantity.ReadOnly = true;
-            this.OrderQuantity.WaterColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127)))));
-            this.OrderQuantity.WaterText = "";
-            // 
-            // skinLabel1
-            // 
-            resources.ApplyResources(this.skinLabel1, "skinLabel1");
-            this.skinLabel1.BackColor = System.Drawing.Color.Transparent;
-            this.skinLabel1.BorderColor = System.Drawing.Color.White;
-            this.skinLabel1.Name = "skinLabel1";
-            // 
             // skinLabel14
             // 
             resources.ApplyResources(this.skinLabel14, "skinLabel14");
@@ -108,6 +93,13 @@
             this.skinLabel13.BorderColor = System.Drawing.Color.White;
             this.skinLabel13.Name = "skinLabel13";
             // 
+            // skinLabel1
+            // 
+            resources.ApplyResources(this.skinLabel1, "skinLabel1");
+            this.skinLabel1.BackColor = System.Drawing.Color.Transparent;
+            this.skinLabel1.BorderColor = System.Drawing.Color.White;
+            this.skinLabel1.Name = "skinLabel1";
+            // 
             // skinLabel12
             // 
             resources.ApplyResources(this.skinLabel12, "skinLabel12");
@@ -131,6 +123,14 @@
             this.ClientType_Text.WaterColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127)))));
             this.ClientType_Text.WaterText = "";
             // 
+            // OrderQuantity
+            // 
+            resources.ApplyResources(this.OrderQuantity, "OrderQuantity");
+            this.OrderQuantity.Name = "OrderQuantity";
+            this.OrderQuantity.ReadOnly = true;
+            this.OrderQuantity.WaterColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127)))));
+            this.OrderQuantity.WaterText = "";
+            // 
             // skinLabel11
             // 
             resources.ApplyResources(this.skinLabel11, "skinLabel11");
@@ -148,10 +148,10 @@
             // 
             // SubmitMIDInfo
             // 
-            resources.ApplyResources(this.SubmitMIDInfo, "SubmitMIDInfo");
             this.SubmitMIDInfo.BackColor = System.Drawing.Color.Transparent;
             this.SubmitMIDInfo.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.SubmitMIDInfo.DownBack = null;
+            resources.ApplyResources(this.SubmitMIDInfo, "SubmitMIDInfo");
             this.SubmitMIDInfo.MouseBack = null;
             this.SubmitMIDInfo.Name = "SubmitMIDInfo";
             this.SubmitMIDInfo.NormlBack = null;
@@ -160,10 +160,10 @@
             // 
             // skinButton1
             // 
-            resources.ApplyResources(this.skinButton1, "skinButton1");
             this.skinButton1.BackColor = System.Drawing.Color.Transparent;
             this.skinButton1.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.skinButton1.DownBack = null;
+            resources.ApplyResources(this.skinButton1, "skinButton1");
             this.skinButton1.MouseBack = null;
             this.skinButton1.Name = "skinButton1";
             this.skinButton1.NormlBack = null;
@@ -177,17 +177,17 @@
             // 
             // comboBox1
             // 
-            resources.ApplyResources(this.comboBox1, "comboBox1");
             this.comboBox1.FormattingEnabled = true;
             this.comboBox1.Items.AddRange(new object[] {
             resources.GetString("comboBox1.Items"),
             resources.GetString("comboBox1.Items1")});
+            resources.ApplyResources(this.comboBox1, "comboBox1");
             this.comboBox1.Name = "comboBox1";
             // 
             // CreateDBManually
             // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             resources.ApplyResources(this, "$this");
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.comboBox1);
             this.Controls.Add(this.progressBar1);
             this.Controls.Add(this.skinButton1);

FactoryTool_CShare/Views/CreateDBManually.resx

@@ -118,359 +118,404 @@
     <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=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="skinLabel11.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="&gt;&gt;skinGroupBox2.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;comboBox1.Name" xml:space="preserve">
-    <value>comboBox1</value>
+  <data name="Order_Text.Location" type="System.Drawing.Point, System.Drawing">
+    <value>22, 53</value>
   </data>
-  <data name="&gt;&gt;SoftwareVersion_Text.ZOrder" xml:space="preserve">
-    <value>8</value>
+  <data name="Order_Text.Size" type="System.Drawing.Size, System.Drawing">
+    <value>239, 21</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="ClientType_Text.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="skinGroupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>200, 100</value>
-  </data>
-  <data name="&gt;&gt;skinLabel14.Name" xml:space="preserve">
-    <value>skinLabel14</value>
+  <data name="Order_Text.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
   </data>
-  <data name="skinLabel14.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+  <data name="&gt;&gt;Order_Text.Name" xml:space="preserve">
+    <value>Order_Text</value>
   </data>
   <data name="&gt;&gt;Order_Text.Type" xml:space="preserve">
     <value>CCWin.SkinControl.SkinWaterTextBox, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="&gt;&gt;SoftwareVersion_Text.Name" xml:space="preserve">
-    <value>SoftwareVersion_Text</value>
+  <data name="&gt;&gt;Order_Text.Parent" xml:space="preserve">
+    <value>skinGroupBox2</value>
   </data>
   <data name="&gt;&gt;Order_Text.ZOrder" xml:space="preserve">
     <value>9</value>
   </data>
-  <data name="skinLabel1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>微软雅黑, 9pt</value>
+  <data name="skinLabel14.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
-  <data name="skinLabel11.Font" type="System.Drawing.Font, System.Drawing">
+  <data name="skinLabel14.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 9pt</value>
   </data>
-  <data name="ProjectID_Text.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="skinLabel14.Location" type="System.Drawing.Point, System.Drawing">
+    <value>161, 214</value>
   </data>
-  <data name="&gt;&gt;SubmitMIDInfo.Type" xml:space="preserve">
-    <value>CCWin.SkinControl.SkinButton, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  <data name="skinLabel14.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 17</value>
   </data>
-  <data name="ProjectID_Text.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 25</value>
+  <data name="skinLabel14.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
   </data>
-  <data name="&gt;&gt;skinLabel11.Name" xml:space="preserve">
-    <value>skinLabel11</value>
+  <data name="skinLabel14.Text" xml:space="preserve">
+    <value>Project ID</value>
   </data>
-  <data name="&gt;&gt;skinLabel12.Name" xml:space="preserve">
-    <value>skinLabel12</value>
+  <data name="&gt;&gt;skinLabel14.Name" xml:space="preserve">
+    <value>skinLabel14</value>
   </data>
-  <data name="&gt;&gt;skinLabel12.Parent" xml:space="preserve">
+  <data name="&gt;&gt;skinLabel14.Type" xml:space="preserve">
+    <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;skinLabel14.Parent" xml:space="preserve">
     <value>skinGroupBox2</value>
   </data>
-  <data name="skinLabel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="&gt;&gt;skinLabel14.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
-  <data name="&gt;&gt;ProjectID_Text.Parent" xml:space="preserve">
-    <value>skinGroupBox2</value>
+  <data name="skinLabel13.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
-  <data name="&gt;&gt;ClientType_Text.Name" xml:space="preserve">
-    <value>ClientType_Text</value>
+  <data name="skinLabel13.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 9pt</value>
   </data>
-  <data name="skinLabel14.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="skinLabel13.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="&gt;&gt;skinLabel1.Name" xml:space="preserve">
-    <value>skinLabel1</value>
+  <data name="skinLabel13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>24, 147</value>
   </data>
   <data name="skinLabel13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+    <value>108, 17</value>
   </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>8, 15</value>
+  <data name="skinLabel13.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
   </data>
-  <data name="&gt;&gt;SoftwareVersion_Text.Type" xml:space="preserve">
-    <value>CCWin.SkinControl.SkinWaterTextBox, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  <data name="skinLabel13.Text" xml:space="preserve">
+    <value>Customer model:</value>
   </data>
-  <data name="SubmitMIDInfo.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="&gt;&gt;skinLabel13.Name" xml:space="preserve">
+    <value>skinLabel13</value>
   </data>
-  <data name="&gt;&gt;skinLabel14.Type" xml:space="preserve">
+  <data name="&gt;&gt;skinLabel13.Type" xml:space="preserve">
     <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="skinLabel13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="&gt;&gt;skinLabel13.Parent" xml:space="preserve">
+    <value>skinGroupBox2</value>
   </data>
-  <data name="&gt;&gt;OrderQuantity.Name" xml:space="preserve">
-    <value>OrderQuantity</value>
+  <data name="&gt;&gt;skinLabel13.ZOrder" xml:space="preserve">
+    <value>1</value>
   </data>
-  <data name="&gt;&gt;SubmitMIDInfo.Name" xml:space="preserve">
-    <value>SubmitMIDInfo</value>
+  <data name="skinLabel1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
-  <data name="skinLabel13.Font" type="System.Drawing.Font, System.Drawing">
+  <data name="skinLabel1.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 9pt</value>
   </data>
-  <data name="&gt;&gt;skinLabel13.Parent" xml:space="preserve">
-    <value>skinGroupBox2</value>
-  </data>
-  <data name="SoftwareVersion_Text.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="skinLabel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>24, 31</value>
   </data>
-  <data name="skinLabel14.Font" type="System.Drawing.Font, System.Drawing">
-    <value>微软雅黑, 9pt</value>
+  <data name="skinLabel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>87, 17</value>
   </data>
-  <data name="&gt;&gt;skinButton1.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="skinLabel1.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
   </data>
-  <data name="&gt;&gt;skinGroupBox2.ZOrder" xml:space="preserve">
-    <value>3</value>
+  <data name="skinLabel1.Text" xml:space="preserve">
+    <value>Order Num：</value>
   </data>
-  <data name="skinLabel12.Font" type="System.Drawing.Font, System.Drawing">
-    <value>微软雅黑, 9pt</value>
+  <data name="&gt;&gt;skinLabel1.Name" xml:space="preserve">
+    <value>skinLabel1</value>
   </data>
-  <data name="&gt;&gt;skinLabel13.Type" xml:space="preserve">
+  <data name="&gt;&gt;skinLabel1.Type" xml:space="preserve">
     <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="OrderQuantity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="&gt;&gt;skinLabel1.Parent" xml:space="preserve">
+    <value>skinGroupBox2</value>
   </data>
-  <data name="skinLabel1.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+  <data name="&gt;&gt;skinLabel1.ZOrder" xml:space="preserve">
+    <value>2</value>
   </data>
-  <data name="SoftwareVersion_Text.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 25</value>
+  <data name="skinLabel12.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
-  <data name="&gt;&gt;skinGroupBox2.Type" xml:space="preserve">
-    <value>CCWin.SkinControl.SkinGroupBox, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  <data name="skinLabel12.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 9pt</value>
   </data>
-  <data name="comboBox1.TabIndex" type="System.Int32, mscorlib">
+  <data name="skinLabel12.Location" type="System.Drawing.Point, System.Drawing">
+    <value>24, 89</value>
+  </data>
+  <data name="skinLabel12.Size" type="System.Drawing.Size, System.Drawing">
+    <value>119, 17</value>
+  </data>
+  <data name="skinLabel12.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
   </data>
-  <data name="&gt;&gt;comboBox1.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="skinLabel12.Text" xml:space="preserve">
+    <value>Software Version：</value>
   </data>
-  <data name="&gt;&gt;skinLabel1.Parent" xml:space="preserve">
-    <value>skinGroupBox2</value>
+  <data name="&gt;&gt;skinLabel12.Name" xml:space="preserve">
+    <value>skinLabel12</value>
   </data>
-  <data name="&gt;&gt;SubmitMIDInfo.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="&gt;&gt;skinLabel12.Type" xml:space="preserve">
+    <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="&gt;&gt;skinGroupBox2.Name" xml:space="preserve">
+  <data name="&gt;&gt;skinLabel12.Parent" xml:space="preserve">
     <value>skinGroupBox2</value>
   </data>
-  <data name="SubmitMIDInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
+  <data name="&gt;&gt;skinLabel12.ZOrder" xml:space="preserve">
+    <value>3</value>
   </data>
-  <data name="&gt;&gt;OrderQuantity.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="ProjectID_Text.Location" type="System.Drawing.Point, System.Drawing">
+    <value>161, 235</value>
   </data>
-  <data name="&gt;&gt;skinButton1.Type" xml:space="preserve">
-    <value>CCWin.SkinControl.SkinButton, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  <data name="ProjectID_Text.Size" type="System.Drawing.Size, System.Drawing">
+    <value>100, 21</value>
   </data>
-  <data name="skinLabel11.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
+  <data name="ProjectID_Text.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
   </data>
-  <data name="&gt;&gt;skinLabel14.Parent" xml:space="preserve">
+  <data name="&gt;&gt;ProjectID_Text.Name" xml:space="preserve">
+    <value>ProjectID_Text</value>
+  </data>
+  <data name="&gt;&gt;ProjectID_Text.Type" xml:space="preserve">
+    <value>CCWin.SkinControl.SkinWaterTextBox, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;ProjectID_Text.Parent" xml:space="preserve">
     <value>skinGroupBox2</value>
   </data>
-  <data name="&gt;&gt;skinLabel11.ZOrder" xml:space="preserve">
-    <value>7</value>
+  <data name="&gt;&gt;ProjectID_Text.ZOrder" xml:space="preserve">
+    <value>4</value>
   </data>
-  <data name="Order_Text.TabIndex" type="System.Int32, mscorlib">
-    <value>9</value>
+  <data name="ClientType_Text.Location" type="System.Drawing.Point, System.Drawing">
+    <value>22, 167</value>
   </data>
-  <data name="skinLabel13.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+  <data name="ClientType_Text.Size" type="System.Drawing.Size, System.Drawing">
+    <value>239, 21</value>
   </data>
-  <data name="&gt;&gt;skinLabel13.Name" xml:space="preserve">
-    <value>skinLabel13</value>
+  <data name="ClientType_Text.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;ClientType_Text.Name" xml:space="preserve">
+    <value>ClientType_Text</value>
+  </data>
+  <data name="&gt;&gt;ClientType_Text.Type" xml:space="preserve">
+    <value>CCWin.SkinControl.SkinWaterTextBox, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;ClientType_Text.Parent" xml:space="preserve">
     <value>skinGroupBox2</value>
   </data>
   <data name="&gt;&gt;ClientType_Text.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>5</value>
   </data>
-  <data name="&gt;&gt;progressBar1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="OrderQuantity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>22, 235</value>
   </data>
-  <data name="&gt;&gt;skinLabel1.Type" xml:space="preserve">
-    <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  <data name="OrderQuantity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>100, 21</value>
   </data>
-  <data name="&gt;&gt;ClientType_Text.Type" xml:space="preserve">
+  <data name="OrderQuantity.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;OrderQuantity.Name" xml:space="preserve">
+    <value>OrderQuantity</value>
+  </data>
+  <data name="&gt;&gt;OrderQuantity.Type" xml:space="preserve">
     <value>CCWin.SkinControl.SkinWaterTextBox, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="&gt;&gt;ProjectID_Text.Name" xml:space="preserve">
-    <value>ProjectID_Text</value>
+  <data name="&gt;&gt;OrderQuantity.Parent" xml:space="preserve">
+    <value>skinGroupBox2</value>
   </data>
-  <data name="&gt;&gt;skinLabel12.Type" xml:space="preserve">
-    <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  <data name="&gt;&gt;OrderQuantity.ZOrder" xml:space="preserve">
+    <value>6</value>
   </data>
-  <data name="comboBox1.Items" xml:space="preserve">
-    <value>EEPROM</value>
+  <data name="skinLabel11.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
-  <data name="skinLabel12.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="skinLabel11.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 9pt</value>
   </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>CreateDBManually</value>
+  <data name="skinLabel11.Location" type="System.Drawing.Point, System.Drawing">
+    <value>24, 214</value>
   </data>
-  <data name="skinButton1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="skinLabel11.Size" type="System.Drawing.Size, System.Drawing">
+    <value>56, 17</value>
   </data>
-  <data name="skinGroupBox2.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+  <data name="skinLabel11.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
   </data>
-  <data name="Order_Text.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 25</value>
+  <data name="skinLabel11.Text" xml:space="preserve">
+    <value>Quantity</value>
   </data>
-  <data name="Order_Text.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="&gt;&gt;skinLabel11.Name" xml:space="preserve">
+    <value>skinLabel11</value>
   </data>
-  <data name="skinGroupBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="&gt;&gt;skinLabel11.Type" xml:space="preserve">
+    <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="&gt;&gt;skinButton1.ZOrder" xml:space="preserve">
-    <value>2</value>
+  <data name="&gt;&gt;skinLabel11.Parent" xml:space="preserve">
+    <value>skinGroupBox2</value>
   </data>
-  <data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+  <data name="&gt;&gt;skinLabel11.ZOrder" xml:space="preserve">
+    <value>7</value>
   </data>
-  <data name="&gt;&gt;skinLabel12.ZOrder" xml:space="preserve">
-    <value>4</value>
+  <data name="SoftwareVersion_Text.Location" type="System.Drawing.Point, System.Drawing">
+    <value>22, 110</value>
   </data>
-  <data name="skinLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+  <data name="SoftwareVersion_Text.Size" type="System.Drawing.Size, System.Drawing">
+    <value>239, 21</value>
   </data>
-  <data name="&gt;&gt;SoftwareVersion_Text.Parent" xml:space="preserve">
-    <value>skinGroupBox2</value>
+  <data name="SoftwareVersion_Text.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
   </data>
-  <data name="&gt;&gt;OrderQuantity.Type" xml:space="preserve">
-    <value>CCWin.SkinControl.SkinWaterTextBox, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  <data name="&gt;&gt;SoftwareVersion_Text.Name" xml:space="preserve">
+    <value>SoftwareVersion_Text</value>
   </data>
-  <data name="&gt;&gt;ProjectID_Text.Type" xml:space="preserve">
+  <data name="&gt;&gt;SoftwareVersion_Text.Type" xml:space="preserve">
     <value>CCWin.SkinControl.SkinWaterTextBox, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="comboBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>106, 183</value>
+  <data name="&gt;&gt;SoftwareVersion_Text.Parent" xml:space="preserve">
+    <value>skinGroupBox2</value>
   </data>
-  <data name="ClientType_Text.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="&gt;&gt;SoftwareVersion_Text.ZOrder" xml:space="preserve">
+    <value>8</value>
   </data>
-  <data name="progressBar1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+  <data name="skinGroupBox2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 42</value>
   </data>
-  <data name="skinLabel12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+  <data name="skinGroupBox2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>292, 288</value>
   </data>
-  <data name="comboBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>121, 23</value>
+  <data name="skinGroupBox2.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
   </data>
-  <data name="&gt;&gt;progressBar1.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="skinGroupBox2.Text" xml:space="preserve">
+    <value>Order Info</value>
   </data>
-  <data name="skinButton1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
+  <data name="&gt;&gt;skinGroupBox2.Name" xml:space="preserve">
+    <value>skinGroupBox2</value>
   </data>
-  <data name="&gt;&gt;skinLabel13.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;skinGroupBox2.Type" xml:space="preserve">
+    <value>CCWin.SkinControl.SkinGroupBox, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;skinGroupBox2.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;skinGroupBox2.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="OrderQuantity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 25</value>
+  <data name="SubmitMIDInfo.Location" type="System.Drawing.Point, System.Drawing">
+    <value>160, 352</value>
   </data>
-  <data name="skinLabel11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+  <data name="SubmitMIDInfo.Size" type="System.Drawing.Size, System.Drawing">
+    <value>73, 23</value>
   </data>
   <data name="SubmitMIDInfo.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
-  <data name="skinButton1.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+  <data name="SubmitMIDInfo.Text" xml:space="preserve">
+    <value>Download</value>
   </data>
-  <data name="SoftwareVersion_Text.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+  <data name="&gt;&gt;SubmitMIDInfo.Name" xml:space="preserve">
+    <value>SubmitMIDInfo</value>
   </data>
-  <data name="&gt;&gt;skinLabel1.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="&gt;&gt;SubmitMIDInfo.Type" xml:space="preserve">
+    <value>CCWin.SkinControl.SkinButton, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="&gt;&gt;skinLabel14.ZOrder" xml:space="preserve">
-    <value>2</value>
+  <data name="&gt;&gt;SubmitMIDInfo.Parent" xml:space="preserve">
+    <value>$this</value>
   </data>
-  <data name="comboBox1.Items1" xml:space="preserve">
-    <value>FireTV</value>
+  <data name="&gt;&gt;SubmitMIDInfo.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="skinButton1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>240, 352</value>
+  </data>
+  <data name="skinButton1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>58, 23</value>
+  </data>
+  <data name="skinButton1.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="skinButton1.Text" xml:space="preserve">
+    <value>report</value>
   </data>
   <data name="&gt;&gt;skinButton1.Name" xml:space="preserve">
     <value>skinButton1</value>
   </data>
+  <data name="&gt;&gt;skinButton1.Type" xml:space="preserve">
+    <value>CCWin.SkinControl.SkinButton, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;skinButton1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;skinButton1.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
   <data name="progressBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+    <value>11, 389</value>
   </data>
-  <data name="ProjectID_Text.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+  <data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>292, 24</value>
   </data>
-  <data name="&gt;&gt;comboBox1.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="progressBar1.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
   </data>
-  <data name="skinLabel14.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="&gt;&gt;progressBar1.Name" xml:space="preserve">
+    <value>progressBar1</value>
   </data>
-  <data name="&gt;&gt;OrderQuantity.Parent" xml:space="preserve">
-    <value>skinGroupBox2</value>
+  <data name="&gt;&gt;progressBar1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;progressBar1.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="skinLabel12.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+  <data name="&gt;&gt;progressBar1.ZOrder" xml:space="preserve">
+    <value>1</value>
   </data>
-  <data name="&gt;&gt;comboBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="comboBox1.Items" xml:space="preserve">
+    <value>EEPROM</value>
   </data>
-  <data name="&gt;&gt;SubmitMIDInfo.ZOrder" xml:space="preserve">
+  <data name="comboBox1.Items1" xml:space="preserve">
+    <value>FireTV</value>
+  </data>
+  <data name="comboBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>11, 354</value>
+  </data>
+  <data name="comboBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>143, 20</value>
+  </data>
+  <data name="comboBox1.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
   </data>
-  <data name="&gt;&gt;ProjectID_Text.ZOrder" xml:space="preserve">
-    <value>5</value>
+  <data name="&gt;&gt;comboBox1.Name" xml:space="preserve">
+    <value>comboBox1</value>
   </data>
-  <data name="&gt;&gt;Order_Text.Name" xml:space="preserve">
-    <value>Order_Text</value>
+  <data name="&gt;&gt;comboBox1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="OrderQuantity.TabIndex" type="System.Int32, mscorlib">
+  <data name="&gt;&gt;comboBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;comboBox1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>292, 263</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>CCWin.Skin_Color, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;Order_Text.Parent" xml:space="preserve">
-    <value>skinGroupBox2</value>
+    <value>316, 434</value>
   </data>
-  <data name="ClientType_Text.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 25</value>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>2, 2, 2, 2</value>
   </data>
-  <data name="&gt;&gt;progressBar1.Name" xml:space="preserve">
-    <value>progressBar1</value>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Download Copy Order
+
+</value>
   </data>
-  <data name="&gt;&gt;skinLabel11.Parent" xml:space="preserve">
-    <value>skinGroupBox2</value>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>CreateDBManually</value>
   </data>
-  <data name="&gt;&gt;skinLabel11.Type" xml:space="preserve">
-    <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>CCWin.Skin_Color, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>zh-CN</value>
-  </metadata>
 </root>

FactoryTool_CShare/Views/CreateDBManually.zh-CN.resx

@@ -117,147 +117,46 @@
   <resheader name="writer">
     <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=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="Order_Text.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 46</value>
-  </data>
-  <data name="Order_Text.Size" type="System.Drawing.Size, System.Drawing">
-    <value>295, 25</value>
-  </data>
-  <data name="skinGroupBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>13, 52</value>
-  </data>
-  <data name="skinGroupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>346, 299</value>
-  </data>
   <data name="skinGroupBox2.Text" xml:space="preserve">
     <value>订单信息</value>
   </data>
-  <data name="OrderQuantity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>28, 242</value>
-  </data>
-  <data name="OrderQuantity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>98, 25</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="OrderQuantity.TabIndex" type="System.Int32, mscorlib">
-    <value>14</value>
-  </data>
-  <data name="skinLabel1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="skinLabel1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="skinLabel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 23</value>
-  </data>
-  <data name="skinLabel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
-  </data>
-  <data name="skinLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>54, 20</value>
-  </data>
-  <data name="skinLabel1.Text" xml:space="preserve">
-    <value>订单号</value>
-  </data>
-  <data name="skinLabel14.Location" type="System.Drawing.Point, System.Drawing">
-    <value>213, 218</value>
-  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="skinLabel14.Size" type="System.Drawing.Size, System.Drawing">
-    <value>39, 20</value>
+    <value>33, 17</value>
   </data>
   <data name="skinLabel14.Text" xml:space="preserve">
     <value>屏ID</value>
   </data>
-  <data name="skinLabel13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>20, 156</value>
-  </data>
   <data name="skinLabel13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>69, 20</value>
+    <value>68, 17</value>
   </data>
   <data name="skinLabel13.Text" xml:space="preserve">
-    <value>客户机型</value>
+    <value>客户机型：</value>
   </data>
-  <data name="skinLabel12.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 90</value>
+  <data name="skinLabel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>56, 17</value>
+  </data>
+  <data name="skinLabel1.Text" xml:space="preserve">
+    <value>订单号：</value>
   </data>
   <data name="skinLabel12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>69, 20</value>
+    <value>68, 17</value>
   </data>
   <data name="skinLabel12.Text" xml:space="preserve">
-    <value>软件版本</value>
-  </data>
-  <data name="ProjectID_Text.Location" type="System.Drawing.Point, System.Drawing">
-    <value>217, 242</value>
-  </data>
-  <data name="ProjectID_Text.Size" type="System.Drawing.Size, System.Drawing">
-    <value>102, 25</value>
-  </data>
-  <data name="ClientType_Text.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 182</value>
-  </data>
-  <data name="ClientType_Text.Size" type="System.Drawing.Size, System.Drawing">
-    <value>295, 25</value>
-  </data>
-  <data name="skinLabel11.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 217</value>
+    <value>软件版本：</value>
   </data>
   <data name="skinLabel11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>39, 20</value>
+    <value>44, 17</value>
   </data>
   <data name="skinLabel11.Text" xml:space="preserve">
-    <value>数量</value>
-  </data>
-  <data name="SoftwareVersion_Text.Location" type="System.Drawing.Point, System.Drawing">
-    <value>24, 114</value>
-  </data>
-  <data name="SoftwareVersion_Text.Size" type="System.Drawing.Size, System.Drawing">
-    <value>295, 25</value>
-  </data>
-  <data name="SubmitMIDInfo.Location" type="System.Drawing.Point, System.Drawing">
-    <value>149, 357</value>
-  </data>
-  <data name="SubmitMIDInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>99, 37</value>
+    <value>数量：</value>
   </data>
   <data name="SubmitMIDInfo.Text" xml:space="preserve">
     <value>下载</value>
   </data>
-  <data name="skinButton1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="skinButton1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>262, 357</value>
-  </data>
-  <data name="skinButton1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
-  </data>
-  <data name="skinButton1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>99, 37</value>
-  </data>
   <data name="skinButton1.Text" xml:space="preserve">
     <value>上报</value>
   </data>
-  <data name="progressBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>13, 401</value>
-  </data>
-  <data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 23</value>
-  </data>
-  <data name="comboBox1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>宋体, 12pt</value>
-  </data>
-  <data name="comboBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>13, 361</value>
-  </data>
-  <data name="comboBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>121, 28</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>373, 437</value>
-  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>下载抄写订单</value>
   </data>

FactoryTool_CShare/Views/Download.Designer.cs

@@ -41,10 +41,11 @@
             this.ProgressBar1.BarBack = null;
             this.ProgressBar1.BarRadiusStyle = CCWin.SkinClass.RoundStyle.All;
             this.ProgressBar1.ForeColor = System.Drawing.Color.Red;
-            this.ProgressBar1.Location = new System.Drawing.Point(40, 130);
+            this.ProgressBar1.Location = new System.Drawing.Point(30, 101);
+            this.ProgressBar1.Margin = new System.Windows.Forms.Padding(2);
             this.ProgressBar1.Name = "ProgressBar1";
             this.ProgressBar1.RadiusStyle = CCWin.SkinClass.RoundStyle.All;
-            this.ProgressBar1.Size = new System.Drawing.Size(274, 38);
+            this.ProgressBar1.Size = new System.Drawing.Size(206, 30);
             this.ProgressBar1.TabIndex = 0;
             // 
             // skinLabel1
@@ -53,9 +54,10 @@
             this.skinLabel1.BackColor = System.Drawing.Color.Transparent;
             this.skinLabel1.BorderColor = System.Drawing.Color.White;
             this.skinLabel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.skinLabel1.Location = new System.Drawing.Point(49, 85);
+            this.skinLabel1.Location = new System.Drawing.Point(37, 68);
+            this.skinLabel1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.skinLabel1.Name = "skinLabel1";
-            this.skinLabel1.Size = new System.Drawing.Size(16, 20);
+            this.skinLabel1.Size = new System.Drawing.Size(14, 17);
             this.skinLabel1.TabIndex = 1;
             this.skinLabel1.Text = "s";
             // 
@@ -64,11 +66,12 @@
             this.skinButton1.BackColor = System.Drawing.Color.Transparent;
             this.skinButton1.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.skinButton1.DownBack = null;
-            this.skinButton1.Location = new System.Drawing.Point(124, 195);
+            this.skinButton1.Location = new System.Drawing.Point(93, 149);
+            this.skinButton1.Margin = new System.Windows.Forms.Padding(2);
             this.skinButton1.MouseBack = null;
             this.skinButton1.Name = "skinButton1";
             this.skinButton1.NormlBack = null;
-            this.skinButton1.Size = new System.Drawing.Size(102, 36);
+            this.skinButton1.Size = new System.Drawing.Size(76, 29);
             this.skinButton1.TabIndex = 2;
             this.skinButton1.Text = "Cancel";
             this.skinButton1.UseVisualStyleBackColor = false;
@@ -76,15 +79,15 @@
             // 
             // Download
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.CaptionBackColorBottom = System.Drawing.Color.Cyan;
             this.CaptionBackColorTop = System.Drawing.Color.RoyalBlue;
-            this.ClientSize = new System.Drawing.Size(352, 242);
+            this.ClientSize = new System.Drawing.Size(264, 194);
             this.Controls.Add(this.skinButton1);
             this.Controls.Add(this.skinLabel1);
             this.Controls.Add(this.ProgressBar1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "Download";

FactoryTool_CShare/Views/Login.Designer.cs

@@ -41,10 +41,10 @@
             // 
             // BtnLogin
             // 
-            resources.ApplyResources(this.BtnLogin, "BtnLogin");
             this.BtnLogin.BackColor = System.Drawing.Color.Transparent;
             this.BtnLogin.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.BtnLogin.DownBack = null;
+            resources.ApplyResources(this.BtnLogin, "BtnLogin");
             this.BtnLogin.MouseBack = null;
             this.BtnLogin.Name = "BtnLogin";
             this.BtnLogin.NormlBack = null;
@@ -91,10 +91,10 @@
             // 
             // login
             // 
-            resources.ApplyResources(this, "$this");
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.CaptionBackColorBottom = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
             this.CaptionBackColorTop = System.Drawing.Color.RoyalBlue;
+            resources.ApplyResources(this, "$this");
             this.Controls.Add(this.skinLabel3);
             this.Controls.Add(this.LineText);
             this.Controls.Add(this.PwdText);

FactoryTool_CShare/Views/Login.resx

@@ -117,125 +117,203 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="&gt;&gt;PwdText.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;skinLabel3.Type" xml:space="preserve">
-    <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="skinLabel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>19, 135</value>
+  <data name="BtnLogin.Location" type="System.Drawing.Point, System.Drawing">
+    <value>70, 132</value>
   </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>CCWin.Skin_Color, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  <data name="BtnLogin.Size" type="System.Drawing.Size, System.Drawing">
+    <value>88, 27</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="skinLabel2.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+  <data name="BtnLogin.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
   </data>
-  <data name="&gt;&gt;PwdText.Name" xml:space="preserve">
-    <value>PwdText</value>
+  <data name="BtnLogin.Text" xml:space="preserve">
+    <value>Confirm</value>
   </data>
-  <data name="&gt;&gt;textBox1.Name" xml:space="preserve">
-    <value>textBox1</value>
+  <data name="&gt;&gt;BtnLogin.Name" xml:space="preserve">
+    <value>BtnLogin</value>
   </data>
   <data name="&gt;&gt;BtnLogin.Type" xml:space="preserve">
     <value>CCWin.SkinControl.SkinButton, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="&gt;&gt;skinLabel3.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="&gt;&gt;BtnLogin.Parent" xml:space="preserve">
+    <value>$this</value>
   </data>
-  <data name="skinLabel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>78, 20</value>
+  <data name="&gt;&gt;BtnLogin.ZOrder" xml:space="preserve">
+    <value>6</value>
   </data>
-  <data name="skinLabel2.Font" type="System.Drawing.Font, System.Drawing">
+  <data name="skinLabel1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="skinLabel1.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 9pt</value>
   </data>
-  <data name="BtnLogin.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="skinLabel1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="&gt;&gt;LineText.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="skinLabel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>19, 59</value>
   </data>
-  <data name="&gt;&gt;skinLabel2.Name" xml:space="preserve">
-    <value>skinLabel2</value>
+  <data name="skinLabel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>33, 17</value>
   </data>
   <data name="skinLabel1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="skinLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>70, 20</value>
+  <data name="skinLabel1.Text" xml:space="preserve">
+    <value>user</value>
   </data>
-  <data name="skinLabel1.AutoSize" type="System.Boolean, mscorlib">
+  <data name="&gt;&gt;skinLabel1.Name" xml:space="preserve">
+    <value>skinLabel1</value>
+  </data>
+  <data name="&gt;&gt;skinLabel1.Type" xml:space="preserve">
+    <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;skinLabel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;skinLabel1.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="skinLabel2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="skinLabel3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>19, 126</value>
+  <data name="skinLabel2.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 9pt</value>
   </data>
-  <data name="&gt;&gt;LineText.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="skinLabel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>19, 92</value>
   </data>
-  <data name="BtnLogin.Size" type="System.Drawing.Size, System.Drawing">
-    <value>110, 42</value>
+  <data name="skinLabel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>33, 17</value>
   </data>
-  <data name="&gt;&gt;AccountText.Parent" xml:space="preserve">
+  <data name="skinLabel2.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="skinLabel2.Text" xml:space="preserve">
+    <value>pwd</value>
+  </data>
+  <data name="&gt;&gt;skinLabel2.Name" xml:space="preserve">
+    <value>skinLabel2</value>
+  </data>
+  <data name="&gt;&gt;skinLabel2.Type" xml:space="preserve">
+    <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;skinLabel2.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="skinLabel3.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+  <data name="&gt;&gt;skinLabel2.ZOrder" xml:space="preserve">
+    <value>4</value>
   </data>
-  <data name="&gt;&gt;BtnLogin.Name" xml:space="preserve">
-    <value>BtnLogin</value>
+  <data name="AccountText.Location" type="System.Drawing.Point, System.Drawing">
+    <value>59, 58</value>
   </data>
-  <data name="&gt;&gt;LineText.Name" xml:space="preserve">
-    <value>LineText</value>
+  <data name="AccountText.Size" type="System.Drawing.Size, System.Drawing">
+    <value>134, 21</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 2, 2, 2</value>
+  <data name="AccountText.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
   </data>
-  <data name="&gt;&gt;skinLabel3.Parent" xml:space="preserve">
+  <data name="&gt;&gt;AccountText.Name" xml:space="preserve">
+    <value>AccountText</value>
+  </data>
+  <data name="&gt;&gt;AccountText.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;AccountText.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;skinLabel3.Name" xml:space="preserve">
-    <value>skinLabel3</value>
+  <data name="&gt;&gt;AccountText.ZOrder" xml:space="preserve">
+    <value>3</value>
   </data>
-  <data name="AccountText.Size" type="System.Drawing.Size, System.Drawing">
-    <value>207, 25</value>
+  <data name="PwdText.Location" type="System.Drawing.Point, System.Drawing">
+    <value>59, 90</value>
   </data>
-  <data name="&gt;&gt;skinLabel1.ZOrder" xml:space="preserve">
-    <value>5</value>
+  <data name="PwdText.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
+    <value>*</value>
+  </data>
+  <data name="PwdText.Size" type="System.Drawing.Size, System.Drawing">
+    <value>134, 21</value>
+  </data>
+  <data name="PwdText.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;PwdText.Name" xml:space="preserve">
+    <value>PwdText</value>
   </data>
   <data name="&gt;&gt;PwdText.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;skinLabel1.Name" xml:space="preserve">
-    <value>skinLabel1</value>
+  <data name="&gt;&gt;PwdText.Parent" xml:space="preserve">
+    <value>$this</value>
   </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>login</value>
+  <data name="&gt;&gt;PwdText.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="LineText.Location" type="System.Drawing.Point, System.Drawing">
+    <value>59, 122</value>
+  </data>
+  <data name="LineText.Size" type="System.Drawing.Size, System.Drawing">
+    <value>134, 21</value>
+  </data>
+  <data name="LineText.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="LineText.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;LineText.Name" xml:space="preserve">
+    <value>LineText</value>
   </data>
-  <data name="&gt;&gt;textBox1.Type" xml:space="preserve">
+  <data name="&gt;&gt;LineText.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;skinLabel2.Parent" xml:space="preserve">
+  <data name="&gt;&gt;LineText.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="AccountText.Location" type="System.Drawing.Point, System.Drawing">
-    <value>113, 79</value>
+  <data name="&gt;&gt;LineText.ZOrder" xml:space="preserve">
+    <value>1</value>
   </data>
-  <data name="skinLabel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>19, 79</value>
+  <data name="skinLabel3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
-  <data name="&gt;&gt;LineText.Parent" xml:space="preserve">
+  <data name="skinLabel3.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 9pt</value>
+  </data>
+  <data name="skinLabel3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>19, 124</value>
+  </data>
+  <data name="skinLabel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>31, 17</value>
+  </data>
+  <data name="skinLabel3.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="skinLabel3.Text" xml:space="preserve">
+    <value>Line</value>
+  </data>
+  <data name="skinLabel3.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;skinLabel3.Name" xml:space="preserve">
+    <value>skinLabel3</value>
+  </data>
+  <data name="&gt;&gt;skinLabel3.Type" xml:space="preserve">
+    <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;skinLabel3.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;AccountText.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;skinLabel3.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
-  <data name="LineText.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>230, 181</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -431,95 +509,16 @@
         AAD///////8AAP///////wAA////////AAD///////8AAA==
 </value>
   </data>
-  <data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>64, 123</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>364, 243</value>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>2, 2, 2, 2</value>
   </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>8, 15</value>
+  <data name="$this.Text" xml:space="preserve">
+    <value>login</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>login</value>
   </data>
-  <data name="LineText.Location" type="System.Drawing.Point, System.Drawing">
-    <value>64, 122</value>
-  </data>
-  <data name="PwdText.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
-    <value>*</value>
-  </data>
-  <data name="&gt;&gt;skinLabel1.Type" xml:space="preserve">
-    <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;BtnLogin.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="skinLabel1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>微软雅黑, 9pt</value>
-  </data>
-  <data name="AccountText.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;textBox1.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;skinLabel2.Type" xml:space="preserve">
-    <value>CCWin.SkinControl.SkinLabel, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;skinLabel2.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="PwdText.Size" type="System.Drawing.Size, System.Drawing">
-    <value>207, 25</value>
-  </data>
-  <data name="&gt;&gt;skinLabel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="skinLabel2.Text" xml:space="preserve">
-    <value>Password
-</value>
-  </data>
-  <data name="skinLabel1.Text" xml:space="preserve">
-    <value>Account</value>
-  </data>
-  <data name="skinLabel2.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="&gt;&gt;textBox1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;AccountText.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="BtnLogin.Text" xml:space="preserve">
-    <value>Confirm</value>
-  </data>
-  <data name="BtnLogin.Location" type="System.Drawing.Point, System.Drawing">
-    <value>149, 174</value>
-  </data>
-  <data name="&gt;&gt;PwdText.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="PwdText.Location" type="System.Drawing.Point, System.Drawing">
-    <value>113, 130</value>
-  </data>
-  <data name="PwdText.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;AccountText.Name" xml:space="preserve">
-    <value>AccountText</value>
-  </data>
-  <data name="textBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;BtnLogin.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>CCWin.Skin_Color, CSkin, Version=16.1.14.3, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>zh-CN</value>
-  </metadata>
 </root>

FactoryTool_CShare/Views/Login.zh-CN.resx

@@ -163,16 +163,6 @@
   <data name="LineText.Size" type="System.Drawing.Size, System.Drawing">
     <value>143, 21</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="LineText.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="skinLabel3.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="skinLabel3.Font" type="System.Drawing.Font, System.Drawing">
-    <value>微软雅黑, 9pt</value>
-  </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="skinLabel3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -186,12 +176,6 @@
   <data name="skinLabel3.Text" xml:space="preserve">
     <value>线体</value>
   </data>
-  <data name="skinLabel3.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
-  </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>230, 181</value>
   </data>

FactoryTool_CShare/Views/Main.Designer.cs

@@ -131,6 +131,7 @@
             this.ChannelList.BaseColor = System.Drawing.Color.Cyan;
             this.ChannelList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
             this.ChannelList.DropDownHeight = 100;
+            this.ChannelList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.ChannelList.FormattingEnabled = true;
             this.ChannelList.Name = "ChannelList";
             this.ChannelList.WaterText = "";
@@ -141,6 +142,7 @@
             resources.ApplyResources(this.OSDList, "OSDList");
             this.OSDList.BaseColor = System.Drawing.Color.Cyan;
             this.OSDList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.OSDList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.OSDList.FormattingEnabled = true;
             this.OSDList.Name = "OSDList";
             this.OSDList.WaterText = "";
@@ -151,6 +153,7 @@
             resources.ApplyResources(this.SHOPList, "SHOPList");
             this.SHOPList.BaseColor = System.Drawing.Color.Cyan;
             this.SHOPList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.SHOPList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.SHOPList.FormattingEnabled = true;
             this.SHOPList.Name = "SHOPList";
             this.SHOPList.WaterText = "";
@@ -313,6 +316,7 @@
             resources.ApplyResources(this.TVBaud, "TVBaud");
             this.TVBaud.BaseColor = System.Drawing.Color.Cyan;
             this.TVBaud.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.TVBaud.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.TVBaud.FormattingEnabled = true;
             this.TVBaud.Items.AddRange(new object[] {
             resources.GetString("TVBaud.Items"),
@@ -326,6 +330,7 @@
             resources.ApplyResources(this.TVCOM, "TVCOM");
             this.TVCOM.BaseColor = System.Drawing.Color.Cyan;
             this.TVCOM.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.TVCOM.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.TVCOM.FormattingEnabled = true;
             this.TVCOM.Name = "TVCOM";
             this.TVCOM.WaterText = "";
@@ -489,13 +494,14 @@
             this.timer1.Interval = 500;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
-            // Form1
+            // Main
             // 
             resources.ApplyResources(this, "$this");
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.CaptionBackColorBottom = System.Drawing.Color.Cyan;
             this.CaptionBackColorTop = System.Drawing.Color.RoyalBlue;
+            this.CaptionFont = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Controls.Add(this.ProductionNum_Text);
             this.Controls.Add(this.Preload);
             this.Controls.Add(this.CreateKeyManually);
@@ -507,7 +513,7 @@
             this.Controls.Add(this.skinGroupBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
             this.MaximizeBox = false;
-            this.Name = "Form1";
+            this.Name = "Main";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Form1_FormClosed);
             this.Load += new System.EventHandler(this.Form1_Load);
             this.Move += new System.EventHandler(this.Form1_Move);

FactoryTool_CShare/Views/Main.cs

@@ -580,6 +580,14 @@ namespace MOKA_Factory_Tools
                             projectid = Custom_ProjectID,
                             host = "LocalPC"
                         };
+
+                        #region EDID离线模式;
+                        if (functionSetting1.edid_offline)
+                        {
+                            midList1.keytype.Add("edid_pid", functionSetting1.edid_pid);
+                            midList1.keytype.Add("edid_model_name", functionSetting1.edid_model_name);
+                        }
+                        #endregion
                     }
 
                     OperationPanel operationPanel1 = new OperationPanel(this, LocalDB, ErrorDB, null, functionSetting1, cfg_writecheck, cfg_readcheck, cfg_writedone, Preload.Checked, midList1, OrderText.Text.Trim());
@@ -723,6 +731,35 @@ namespace MOKA_Factory_Tools
                     functionSetting1.NextCommandWaitTime = SerialCMD.NextCommandWaitTime = jObject["NextCommandWaitTime"].Value<int>();
                 }
 
+                #region EDID离线模式,使用offline账号登录;
+                if (jObject["edid_offline"] == null)
+                {
+                    SaveJsonConfig("edid_offline", functionSetting1.edid_offline);
+                }
+                else
+                {
+                    functionSetting1.edid_offline = jObject["edid_offline"].Value<bool>();
+                }
+
+                if (jObject["edid_pid"] == null)
+                {
+                    SaveJsonConfig("edid_pid", functionSetting1.edid_pid);
+                }
+                else
+                {
+                    functionSetting1.edid_pid = jObject["edid_pid"].Value<string>();
+                }
+
+                if (jObject["edid_model_name"] == null)
+                {
+                    SaveJsonConfig("edid_model_name", functionSetting1.edid_model_name);
+                }
+                else
+                {
+                    functionSetting1.edid_model_name = jObject["edid_model_name"].Value<string>();
+                }
+                #endregion
+
                 #region 波兰工厂DHA解决方案
                 if (jObject["CheckDHAWaitTime"] == null)
                 {

FactoryTool_CShare/Views/Main.zh-CN.resx

@@ -118,245 +118,129 @@
     <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=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="WriteChannel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>311, 161</value>
-  </data>
   <data name="WriteChannel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>114, 31</value>
+    <value>75, 21</value>
   </data>
   <data name="WriteChannel.Text" xml:space="preserve">
     <value>预置频道</value>
   </data>
-  <data name="WriteOSD.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 208</value>
-  </data>
   <data name="WriteOSD.Size" type="System.Drawing.Size, System.Drawing">
-    <value>157, 31</value>
+    <value>101, 21</value>
   </data>
   <data name="WriteOSD.Text" xml:space="preserve">
     <value>预置OSD语言</value>
   </data>
-  <data name="WriteSHOP.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 252</value>
-  </data>
   <data name="WriteSHOP.Size" type="System.Drawing.Size, System.Drawing">
-    <value>154, 31</value>
+    <value>108, 21</value>
   </data>
   <data name="WriteSHOP.Text" xml:space="preserve">
-    <value>预置出厂语言</value>
-  </data>
-  <data name="skinLabel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 167</value>
+    <value>预置SHOP语言</value>
   </data>
   <data name="skinLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>57, 27</value>
+    <value>59, 17</value>
   </data>
   <data name="skinLabel1.Text" xml:space="preserve">
-    <value>频道:</value>
-  </data>
-  <data name="ChannelList.Location" type="System.Drawing.Point, System.Drawing">
-    <value>91, 163</value>
-  </data>
-  <data name="OSDList.Location" type="System.Drawing.Point, System.Drawing">
-    <value>262, 210</value>
-  </data>
-  <data name="SHOPList.Location" type="System.Drawing.Point, System.Drawing">
-    <value>262, 254</value>
-  </data>
-  <data name="skinGroupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>451, 290</value>
-  </data>
-  <data name="skinGroupBox1.Text" xml:space="preserve">
-    <value>参数设定:</value>
-  </data>
-  <data name="BarcodeWrite.Location" type="System.Drawing.Point, System.Drawing">
-    <value>136, 27</value>
+    <value>频道列表:</value>
   </data>
   <data name="BarcodeWrite.Size" type="System.Drawing.Size, System.Drawing">
-    <value>114, 31</value>
+    <value>76, 21</value>
   </data>
   <data name="BarcodeWrite.Text" xml:space="preserve">
     <value>PSN抄写</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="UsinglocalIDCheck.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="UsinglocalIDCheck.Location" type="System.Drawing.Point, System.Drawing">
-    <value>278, 116</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="UsinglocalIDCheck.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 2, 3, 2</value>
-  </data>
   <data name="UsinglocalIDCheck.Size" type="System.Drawing.Size, System.Drawing">
-    <value>147, 31</value>
+    <value>88, 21</value>
   </data>
   <data name="UsinglocalIDCheck.Text" xml:space="preserve">
-    <value>使用本地PID</value>
-  </data>
-  <data name="skinLabel8.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="skinLabel8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="skinLabel8.Location" type="System.Drawing.Point, System.Drawing">
-    <value>270, 69</value>
+    <value>使用本地ID</value>
   </data>
   <data name="skinLabel8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>57, 27</value>
+    <value>35, 17</value>
   </data>
   <data name="skinLabel8.Text" xml:space="preserve">
     <value>长度:</value>
   </data>
-  <data name="skinLabel7.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="skinLabel7.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="skinLabel7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 70</value>
-  </data>
   <data name="skinLabel7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>77, 27</value>
+    <value>47, 17</value>
   </data>
   <data name="skinLabel7.Text" xml:space="preserve">
     <value>关键字:</value>
   </data>
-  <data name="BarCodeLengthText.Location" type="System.Drawing.Point, System.Drawing">
-    <value>345, 69</value>
-  </data>
-  <data name="BarCodeKeyCodeText.Location" type="System.Drawing.Point, System.Drawing">
-    <value>94, 70</value>
-  </data>
-  <data name="BarCodeKeyCodeText.Size" type="System.Drawing.Size, System.Drawing">
-    <value>156, 30</value>
-  </data>
-  <data name="BarcodeLimit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 27</value>
-  </data>
   <data name="BarcodeLimit.Size" type="System.Drawing.Size, System.Drawing">
-    <value>114, 31</value>
+    <value>75, 21</value>
   </data>
   <data name="BarcodeLimit.Text" xml:space="preserve">
     <value>条码限制</value>
   </data>
-  <data name="skinLabel6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 120</value>
-  </data>
   <data name="skinLabel6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>58, 27</value>
+    <value>36, 17</value>
   </data>
   <data name="skinLabel6.Text" xml:space="preserve">
     <value>屏ID:</value>
   </data>
-  <data name="PID_Num.Location" type="System.Drawing.Point, System.Drawing">
-    <value>91, 117</value>
-  </data>
-  <data name="PID_Num.Size" type="System.Drawing.Size, System.Drawing">
-    <value>159, 30</value>
-  </data>
-  <data name="skinGroupBox2.Text" xml:space="preserve">
-    <value>串口设定:</value>
-  </data>
   <data name="skinLabel3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>226, 32</value>
+    <value>184, 33</value>
   </data>
   <data name="skinLabel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>77, 27</value>
+    <value>47, 17</value>
   </data>
   <data name="skinLabel3.Text" xml:space="preserve">
     <value>波特率:</value>
   </data>
-  <data name="TVCOM.Location" type="System.Drawing.Point, System.Drawing">
-    <value>110, 29</value>
-  </data>
   <data name="skinLabel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>77, 27</value>
+    <value>35, 17</value>
   </data>
   <data name="skinLabel2.Text" xml:space="preserve">
-    <value>串口号:</value>
-  </data>
-  <data name="skinGroupBox3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 436</value>
-  </data>
-  <data name="skinGroupBox3.Text" xml:space="preserve">
-    <value>白平衡设定:</value>
-  </data>
-  <data name="WBPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>110, 45</value>
+    <value>串口:</value>
   </data>
-  <data name="skinButton1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>343, 45</value>
+  <data name="skinGroupBox2.Text" xml:space="preserve">
+    <value>串口设置:</value>
   </data>
   <data name="skinButton1.Text" xml:space="preserve">
     <value>选择</value>
   </data>
   <data name="WriteWB.Location" type="System.Drawing.Point, System.Drawing">
-    <value>213, 101</value>
+    <value>149, 28</value>
   </data>
   <data name="WriteWB.Size" type="System.Drawing.Size, System.Drawing">
-    <value>134, 31</value>
+    <value>87, 21</value>
   </data>
   <data name="WriteWB.Text" xml:space="preserve">
     <value>预置白平衡</value>
   </data>
   <data name="WBInit.Size" type="System.Drawing.Size, System.Drawing">
-    <value>154, 31</value>
+    <value>99, 21</value>
   </data>
   <data name="WBInit.Text" xml:space="preserve">
     <value>白平衡初始化</value>
   </data>
   <data name="skinLabel5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>77, 27</value>
+    <value>47, 17</value>
   </data>
   <data name="skinLabel5.Text" xml:space="preserve">
     <value>白平衡:</value>
   </data>
-  <data name="skinLabel4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 581</value>
+  <data name="skinGroupBox3.Text" xml:space="preserve">
+    <value>白平衡设置:</value>
   </data>
   <data name="skinLabel4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>77, 27</value>
+    <value>47, 17</value>
   </data>
   <data name="skinLabel4.Text" xml:space="preserve">
     <value>订单号:</value>
   </data>
-  <data name="OrderText.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 613</value>
-  </data>
-  <data name="OrderSubmit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>343, 662</value>
-  </data>
   <data name="OrderSubmit.Text" xml:space="preserve">
     <value>确定</value>
   </data>
-  <data name="CreateKeyManually.Location" type="System.Drawing.Point, System.Drawing">
-    <value>212, 662</value>
-  </data>
-  <data name="CreateKeyManually.Text" xml:space="preserve">
-    <value>下载合成key</value>
-  </data>
-  <data name="Preload.Location" type="System.Drawing.Point, System.Drawing">
-    <value>329, 577</value>
-  </data>
   <data name="Preload.Size" type="System.Drawing.Size, System.Drawing">
-    <value>134, 31</value>
+    <value>87, 21</value>
   </data>
   <data name="Preload.Text" xml:space="preserve">
     <value>预绑定模式</value>
   </data>
-  <data name="ProductionNum_Text.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 665</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>474, 718</value>
-  </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-		AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAwMAAAAQAgAKglAADGBgAAKAAAABAA
+        AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAwMAAAAQAgAKglAADGBgAAKAAAABAA
         AAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICA
         AACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAdnR3AAAAAHbGRmxoAAAHZHZWR0
         ZwAHxnRsdkbGcAZkbHZGVnRgdHR2hGxkZWh2xkeGVnRsZ2R2R/iHxnZGZWxmjH9kZWV8Z0f2eGVsZ3ZG
@@ -546,9 +430,6 @@
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAEAAIAAAAAAAQAAwAAAAAADAADAAAAAAAMAAOAA
         AAAABwAA4AAAAAAHAADwAAAAAA8AAPgAAAAAHwAA/AAAAAA/AAD8AAAAAD8AAP8AAAAA/wAA/4AAAAH/
         AAD/wAAAA/8AAP/wAAAP/wAA//wAAD//AAD//wAA//8AAA==
-	</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>MOKA 工厂抄写工具</value>
+</value>
   </data>
 </root>