添加单元测试. & 原CCID输入!

.gitignore

@@ -37,3 +37,7 @@ GWSocketClient/obj/Release/GWSocketClient.MyMessageBox.resources
 GWSocketClient/obj/Release/GWSocketClient.IdItemEditor.resources
 GWSocketClient/obj/Debug/GWSocketClient.AnaProtocol.resources
 GWSocketClient/obj/Release/GWSocketClient.AnaProtocol.resources
+GWSocketClientTests/bin
+GWSocketClientTests/obj
+packages/
+TestResults/

GWSocketClient.sln

@@ -1,10 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.6
+VisualStudioVersion = 15.0.26430.15
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GWSocketClient", "GWSocketClient\GWSocketClient.csproj", "{1E7C256A-9CA5-4937-A5DD-7F281A2EBB21}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GWSocketClientTests", "GWSocketClientTests\GWSocketClientTests.csproj", "{8D9E3AB8-D1FE-41F6-93CF-3ACC7616163D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{1E7C256A-9CA5-4937-A5DD-7F281A2EBB21}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E7C256A-9CA5-4937-A5DD-7F281A2EBB21}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E7C256A-9CA5-4937-A5DD-7F281A2EBB21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D9E3AB8-D1FE-41F6-93CF-3ACC7616163D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D9E3AB8-D1FE-41F6-93CF-3ACC7616163D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D9E3AB8-D1FE-41F6-93CF-3ACC7616163D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D9E3AB8-D1FE-41F6-93CF-3ACC7616163D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

GWSocketClient/Form1.Designer.cs

@@ -38,7 +38,6 @@
             this.label6 = new System.Windows.Forms.Label();
             this.tfTmpSendData = new System.Windows.Forms.TextBox();
             this.tbCCID = new System.Windows.Forms.TextBox();
-            this.label5 = new System.Windows.Forms.Label();
             this.btnPressureTest = new System.Windows.Forms.Button();
             this.label4 = new System.Windows.Forms.Label();
             this.tbPresureTestCount = new System.Windows.Forms.TextBox();
@@ -74,6 +73,7 @@
             this.rightMenuCopyCmd = new System.Windows.Forms.ToolStripMenuItem();
             this.rightMenuClearInfo = new System.Windows.Forms.ToolStripMenuItem();
             this.timerHeartBeat = new System.Windows.Forms.Timer(this.components);
+            this.cbCCIDIsSource = new System.Windows.Forms.CheckBox();
             this.groupBox1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
             this.statusStrip1.SuspendLayout();
@@ -85,6 +85,7 @@
             // 
             this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox1.Controls.Add(this.cbCCIDIsSource);
             this.groupBox1.Controls.Add(this.btnTextCmd);
             this.groupBox1.Controls.Add(this.buttonCmdManager);
             this.groupBox1.Controls.Add(this.label7);
@@ -92,7 +93,6 @@
             this.groupBox1.Controls.Add(this.label6);
             this.groupBox1.Controls.Add(this.tfTmpSendData);
             this.groupBox1.Controls.Add(this.tbCCID);
-            this.groupBox1.Controls.Add(this.label5);
             this.groupBox1.Controls.Add(this.btnPressureTest);
             this.groupBox1.Controls.Add(this.label4);
             this.groupBox1.Controls.Add(this.tbPresureTestCount);
@@ -175,23 +175,14 @@
             this.tbCCID.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tbCCID.ForeColor = System.Drawing.Color.Blue;
-            this.tbCCID.Location = new System.Drawing.Point(701, 21);
+            this.tbCCID.Location = new System.Drawing.Point(713, 21);
             this.tbCCID.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.tbCCID.Name = "tbCCID";
-            this.tbCCID.Size = new System.Drawing.Size(414, 23);
+            this.tbCCID.Size = new System.Drawing.Size(402, 23);
             this.tbCCID.TabIndex = 12;
             this.tbCCID.Text = "3839383630324231313931353530343739383737";
             this.tbCCID.TextChanged += new System.EventHandler(this.tbCCID_TextChanged);
             // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(650, 24);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(45, 17);
-            this.label5.TabIndex = 11;
-            this.label5.Text = "CCCID";
-            // 
             // btnPressureTest
             // 
             this.btnPressureTest.Location = new System.Drawing.Point(329, 61);
@@ -266,7 +257,7 @@
             this.tbEquipmentAddress.Location = new System.Drawing.Point(462, 21);
             this.tbEquipmentAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.tbEquipmentAddress.Name = "tbEquipmentAddress";
-            this.tbEquipmentAddress.Size = new System.Drawing.Size(182, 23);
+            this.tbEquipmentAddress.Size = new System.Drawing.Size(157, 23);
             this.tbEquipmentAddress.TabIndex = 5;
             this.tbEquipmentAddress.Text = "4442832E833D";
             this.tbEquipmentAddress.TextChanged += new System.EventHandler(this.tbEquipmentAddress_TextChanged);
@@ -512,6 +503,16 @@
             this.timerHeartBeat.Interval = 1000;
             this.timerHeartBeat.Tick += new System.EventHandler(this.timerHeartBeat_Tick);
             // 
+            // cbCCIDIsSource
+            // 
+            this.cbCCIDIsSource.AutoSize = true;
+            this.cbCCIDIsSource.Location = new System.Drawing.Point(625, 23);
+            this.cbCCIDIsSource.Name = "cbCCIDIsSource";
+            this.cbCCIDIsSource.Size = new System.Drawing.Size(82, 21);
+            this.cbCCIDIsSource.TabIndex = 19;
+            this.cbCCIDIsSource.Text = "CCID ? 源";
+            this.cbCCIDIsSource.UseVisualStyleBackColor = true;
+            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@@ -563,7 +564,6 @@
         private System.Windows.Forms.Button btnQuickLogout;
         private System.Windows.Forms.Button btnLogin;
         private System.Windows.Forms.TextBox tbCCID;
-        private System.Windows.Forms.Label label5;
         private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel2;
         private System.Windows.Forms.ToolStripStatusLabel tsslCCIDLEN;
         private System.Windows.Forms.GroupBox groupBox2;
@@ -588,6 +588,7 @@
         private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItemLogHb;
         private System.Windows.Forms.Timer timerHeartBeat;
         private System.Windows.Forms.ToolStripMenuItem StripMenuItemLoSucHb;
+        private System.Windows.Forms.CheckBox cbCCIDIsSource;
     }
 }
 

GWSocketClient/Form1.cs

@@ -326,12 +326,12 @@ namespace GWSocketClient
 
                 if (ToolStripMenuItemLogHb.Checked && hbLen.Equals("0000"))
                 {
-                    addToListboxItem(string.Format("收到服务端{0}发来心跳：[{1}]", sks.Ip, reqData));
+                    addToListboxItem(string.Format("收到服务端{0}发来心跳funCode={2}:[{1}]", sks.Ip, reqData,reqData.Substring(18,2)));
                 }
             }
             else
             {
-                addToListboxItem(string.Format("收到服务端{0}发来消息：[{1}]", sks.Ip, reqData));
+                addToListboxItem(string.Format("收到服务端{0}发来消息,funCode={2}:[{1}]", sks.Ip, reqData,reqData.Substring(18,2)));
             }
 
             if (!(funcode == 16 || funcode == 32))
@@ -437,14 +437,26 @@ namespace GWSocketClient
         {
             //                string loginCmd = "7e7e7e4442832e833c8200143839383630324231313931353530343739383737f7";
             string loginCmd = vcarecityProtocolBean.ProtocolStartSymbol;
-            loginCmd += tbEquipmentAddress.Text.Trim() + "82" +
-                        Utils.stringWith0(Utils.tenToHex(tbCCID.Text.Trim().Length / 2), 4);
-            loginCmd += tbCCID.Text.Trim();
+            loginCmd += tbEquipmentAddress.Text.Trim() + "82";
+                        
+
+            if(cbCCIDIsSource.Checked)
+            {
+                loginCmd += Utils.stringWith0(Utils.tenToHex(tbCCID.Text.Trim().Length ), 4);
+                loginCmd += Utils.transateCCID(tbCCID.Text.Trim());
+            }
+            else
+            {
+                loginCmd += Utils.stringWith0(Utils.tenToHex(tbCCID.Text.Trim().Length / 2), 4);
+                loginCmd += tbCCID.Text.Trim();
+            }
+
+            
             loginCmd = Utils.calcCrcCode(loginCmd);
             //发送登录命令
             byte[] ts = HexUtil.hexToBytes(loginCmd);
 
-            addToListboxItem(string.Format("发送到服务端:[{0}]", loginCmd));
+            addToListboxItem(string.Format("发送到服务端,funCode={0} : [{1}]", loginCmd.Substring(18, 2), loginCmd));
 
             sockeTcpClients.SendData(ts);
         }

GWSocketClient/GWSocketClient.csproj

@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{1E7C256A-9CA5-4937-A5DD-7F281A2EBB21}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <RootNamespace>GWSocketClient</RootNamespace>
     <AssemblyName>GWSocketClient</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

GWSocketClient/util/Utils.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace GWSocketClient.util
 {
-    class Utils
+    public class Utils
     {
         public static int hexToTen(string hex)
         {
@@ -129,5 +129,20 @@ namespace GWSocketClient.util
             }
             return stringWith0(tenToHex(result), 2);
         }
+
+        public static string transateCCID(string source)
+        {
+            string res = "";
+            for(int i=0;i< source.Length; i++)
+            {
+                int hex = Int32.Parse(source[i].ToString(), NumberStyles.HexNumber);
+                int ten = hexToTen(hex + "")+30;
+
+                res += ten + "";
+               // Console.WriteLine(ten);
+            }
+            return res;
+        }
+
     }
 }

GWSocketClientTests/GWSocketClientTests.csproj

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{8D9E3AB8-D1FE-41F6-93CF-3ACC7616163D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>GWSocketClientTests</RootNamespace>
+    <AssemblyName>GWSocketClientTests</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.1.1.11\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.1.1.11\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+      </ItemGroup>
+    </When>
+    <Otherwise />
+  </Choose>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="util\UtilsTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GWSocketClient\GWSocketClient.csproj">
+      <Project>{1E7C256A-9CA5-4937-A5DD-7F281A2EBB21}</Project>
+      <Name>GWSocketClient</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
+      <ItemGroup>
+        <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+          <Private>False</Private>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>此项目引用这台计算机上缺少的 NuGet 程序包。使用 NuGet 程序包还原可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets'))" />
+  </Target>
+  <Import Project="..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.11\build\net45\MSTest.TestAdapter.targets')" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

GWSocketClientTests/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("GWSocketClientTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("GWSocketClientTests")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+//将 ComVisible 设置为 false 将使此程序集中的类型
+//对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型，
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("8d9e3ab8-d1fe-41f6-93cf-3acc7616163d")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
+// 方法是按如下所示使用“*”: :
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

GWSocketClientTests/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MSTest.TestAdapter" version="1.1.11" targetFramework="net452" />
+  <package id="MSTest.TestFramework" version="1.1.11" targetFramework="net452" />
+</packages>

GWSocketClientTests/util/UtilsTests.cs

@@ -0,0 +1,24 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using GWSocketClient.util;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GWSocketClient.util.Tests
+{
+    [TestClass()]
+    public class UtilsTests
+    {
+        [TestMethod()]
+        public void transateCCIDTest()
+        {
+
+            string abc = Utils.transateCCID("898602B1191550339913");
+            Console.WriteLine(abc);
+            Console.WriteLine("3839383630324231313931353530333339393133");
+
+        }
+    }
+}