1、去掉强名称

2、增加10 11 12 需求单 146296

ClientForWEDS/ClientForWEDS.csproj

@@ -11,7 +11,8 @@
     <RootNamespace>ClientForWEDS</RootNamespace>
     <AssemblyName>ClientForWEDS</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -37,7 +38,8 @@
     <ApplicationIcon>2017.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AxInterop.WEDS4_CommSV2">
+    <Reference Include="AxInterop.WEDS4_CommSV2, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>.\AxInterop.WEDS4_CommSV2.dll</HintPath>
     </Reference>
     <Reference Include="Forks.JsonRpc.Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL">
@@ -52,18 +54,41 @@
       <HintPath>.\Interop.WEDS4_CommSV2.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Core">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="Microsoft.CSharp">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Data">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Deployment">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Windows.Forms">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System.Xml">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\version\Tools_version.cs">
+      <Link>Tools_version.cs</Link>
+    </Compile>
     <Compile Include="ConfigUtil.cs" />
     <Compile Include="Form1.cs">
       <SubType>Form</SubType>
@@ -71,6 +96,12 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
+    <Compile Include="Form2.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form2.Designer.cs">
+      <DependentUpon>Form2.cs</DependentUpon>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RpcHelper.cs" />
@@ -78,6 +109,9 @@
       <DependentUpon>Form1.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Form2.resx">
+      <DependentUpon>Form2.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -86,7 +120,9 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="app.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

ClientForWEDS/ConfigUtil.cs

@@ -18,6 +18,10 @@ namespace ClientForWEDS {
         IP6 = nutFile.AsString(ConfigItem.IP6, "");
         IP7 = nutFile.AsString(ConfigItem.IP7, "");
         IP8 = nutFile.AsString(ConfigItem.IP8, "");
+        IP9 = nutFile.AsString(ConfigItem.IP9, "");
+        IP10 = nutFile.AsString(ConfigItem.IP10, "");
+        IP11 = nutFile.AsString(ConfigItem.IP11, "");
+        IP12 = nutFile.AsString(ConfigItem.IP12, "");
         Port = nutFile.AsString(ConfigItem.Port, "3350");
         Timeout = nutFile.AsString(ConfigItem.Timeout, "8000");
         ValidateType = nutFile.AsString(ConfigItem.ValidateType, "no");
@@ -36,6 +40,10 @@ namespace ClientForWEDS {
     public static string IP6;
     public static string IP7;
     public static string IP8;
+    public static string IP9;
+    public static string IP10;
+    public static string IP11;
+    public static string IP12;
     public static string Port;
     public static string Timeout;
     public static string ValidateType;
@@ -54,6 +62,10 @@ namespace ClientForWEDS {
       public const string IP6 = "IP6";
       public const string IP7 = "IP7";
       public const string IP8 = "IP8";
+      public const string IP9 = "IP9";
+      public const string IP10 = "IP10";
+      public const string IP11 = "IP11";
+      public const string IP12 = "IP12";
       public const string Port = "Port";
       public const string Timeout = "Timeout";
 

ClientForWEDS/Form1.cs

@@ -24,6 +24,7 @@ namespace ClientForWEDS {
     public Form1() {
       InitializeComponent();
       CheckForIllegalCrossThreadCalls = false;
+      panel2.VerticalScroll.Visible = false;
     }
 
     private void Form1_Load(object sender, EventArgs e) {
@@ -42,6 +43,12 @@ namespace ClientForWEDS {
       txtIP6.Text = ConfigUtil.IP6;
       txtIP7.Text = ConfigUtil.IP7;
       txtIP8.Text = ConfigUtil.IP8;
+      txtIP9.Text = ConfigUtil.IP9;
+      txtIP10.Text = ConfigUtil.IP10;
+      txtIP11.Text = ConfigUtil.IP11;
+      txtIP12.Text = ConfigUtil.IP12;
+
+
       txtTimeout.Text = ConfigUtil.Timeout;
       nudPort.Text = ConfigUtil.Port;
       txtReciveZDPath.Text = ConfigUtil.ZDPath;
@@ -377,7 +384,15 @@ namespace ClientForWEDS {
       if (txtIP7.Text.Length > 0)
         ipList.Add(txtIP7.Text);
       if (txtIP8.Text.Length > 0)
-        ipList.Add(txtIP8.Text);
+        ipList.Add(txtIP8.Text);   
+      if (txtIP9.Text.Length > 0)
+        ipList.Add(txtIP9.Text);   
+      if (txtIP10.Text.Length > 0)
+        ipList.Add(txtIP10.Text);    
+      if (txtIP11.Text.Length > 0)
+        ipList.Add(txtIP11.Text);
+      if (txtIP12.Text.Length > 0)
+        ipList.Add(txtIP12.Text);
       _zdPath = txtReciveZDPath.Text.Trim();
       on_off = false;
       ma.Set();
@@ -410,6 +425,10 @@ namespace ClientForWEDS {
         nutFile.SetValue(ConfigUtil.ConfigItem.IP6, txtIP6.Text.Trim());
         nutFile.SetValue(ConfigUtil.ConfigItem.IP7, txtIP7.Text.Trim());
         nutFile.SetValue(ConfigUtil.ConfigItem.IP8, txtIP8.Text.Trim());
+        nutFile.SetValue(ConfigUtil.ConfigItem.IP9, txtIP9.Text.Trim());
+        nutFile.SetValue(ConfigUtil.ConfigItem.IP10, txtIP10.Text.Trim());
+        nutFile.SetValue(ConfigUtil.ConfigItem.IP11, txtIP11.Text.Trim());
+        nutFile.SetValue(ConfigUtil.ConfigItem.IP12, txtIP12.Text.Trim());
 
         nutFile.SetValue(ConfigUtil.ConfigItem.Port, nudPort.Text.Trim());
         nutFile.SetValue(ConfigUtil.ConfigItem.Timeout, txtTimeout.Text.Trim());
@@ -556,5 +575,8 @@ namespace ClientForWEDS {
         textBox1.Text = openFileDialogDangAn.FileName;
       }
     }
+
+
+
   }
 }