修改客户端协议

AgvClient/AgvClient.csproj

@@ -31,8 +31,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net">
+      <HintPath>..\..\..\..\DLL\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -42,6 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Client.cs" />
+    <Compile Include="CodeFile1.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

AgvClient/obj/Debug/AgvClient.csproj.CoreCompileInputs.cache

-cb561d0b559b2b210a73908bfa1b19f722a475ae
+a0778d1eda99bd700643c1ae6955f161aa53e149

AgvClient/obj/Debug/AgvClient.csproj.FileListAbsolute.txt

@@ -10,3 +10,11 @@ D:\OneDrive - 上海挚锦科技有限公司\SMD\ControlCenter\AgvClient\obj\Deb
 D:\OneDrive - 上海挚锦科技有限公司\SMD\ControlCenter\AgvClient\obj\Debug\AgvClient.csproj.CoreCompileInputs.cache
 D:\OneDrive - 上海挚锦科技有限公司\SMD\ControlCenter\AgvClient\obj\Debug\Client.dll
 D:\OneDrive - 上海挚锦科技有限公司\SMD\ControlCenter\AgvClient\obj\Debug\Client.pdb
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClient\bin\Debug\Client.dll
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClient\bin\Debug\Client.pdb
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClient\bin\Debug\log4net.dll
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClient\obj\Debug\AgvClient.csproj.CoreCompileInputs.cache
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClient\obj\Debug\AgvClient.csproj.CopyComplete
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClient\obj\Debug\Client.dll
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClient\obj\Debug\Client.pdb
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClient\obj\Debug\AgvClient.csprojAssemblyReference.cache

AgvClientTest/Form1.cs

@@ -21,52 +21,18 @@ namespace AgvClientTest
 
         private void Form1_Load(object sender, EventArgs e)
         {
-            CboAction1.SelectedIndex = 0;
-            CboLevel1.SelectedIndex = 0;
-            CboAction2.SelectedIndex = 0;
-            CboLevel2.SelectedIndex = 0;
-            CboAction3.SelectedIndex = 0;
-            CboLevel3.SelectedIndex = 0;
-            CboAction4.SelectedIndex = 0;
-            CboLevel4.SelectedIndex = 0;
-            client = new Asa.AgvClient("127.0.0.1");
-            client.SetStatus("A1");
-            client.SetStatus("B1");
-            client.Log += Client_Log;
-          
-        }
+            Asa.ClientNode node = new Asa.ClientNode();
+            node.Name = "abc";
 
-        private void Client_Log(string s)
-        {
-            Invoke(new Action(() => { TxtLog.AppendText(s + "\r\n"); }));
+            client = new Asa.AgvClient("");
+            client.Decode(new byte[] { 1 });
         }
 
         private void Form1_FormClosing(object sender, FormClosingEventArgs e)
         {
-           if(client.IsConn)
-                client.Close();
-        }
 
-        private void BtnSend_Click(object sender, EventArgs e)
-        {
-            string id = (sender as Button).Name.Replace("BtnSend", "");
-            string name = Controls["TxtName" + id].Text;
-            string mark = Controls["TxtMark" + id].Text;
-            string rfid = Controls["TxtRFID" + id].Text;
-            int action = ((ComboBox)Controls["CboAction" + id]).SelectedIndex;
-            int level = ((ComboBox)Controls["CboLevel" + id]).SelectedIndex;
-            client.SetStatus(name, mark, rfid, (Asa.ClientAction)action, (Asa.ClientLevel)level);
         }
 
-        private void button2_Click(object sender, EventArgs e)
-        {
-            client.Connect();
-        }
-
-        private void button3_Click(object sender, EventArgs e)
-        {
-            client.Close();
-        }
 
     }
 }

AgvClientTest/obj/Debug/AgvClientTest.csproj.CoreCompileInputs.cache

-e9f6f33ab4bd66774ad14211cfa560527e0a7c54
+04752e378157393bb9ae825befb853bbaba9c5f7

AgvClientTest/obj/Debug/AgvClientTest.csproj.FileListAbsolute.txt

@@ -36,3 +36,17 @@ D:\OneDrive - 上海挚锦科技有限公司\SMD\ControlCenter\AgvClientTest\obj
 D:\OneDrive - 上海挚锦科技有限公司\SMD\ControlCenter\AgvClientTest\obj\Debug\AgvClientTest.csproj.CopyComplete
 D:\OneDrive - 上海挚锦科技有限公司\SMD\ControlCenter\AgvClientTest\obj\Debug\AgvClientTest.exe
 D:\OneDrive - 上海挚锦科技有限公司\SMD\ControlCenter\AgvClientTest\obj\Debug\AgvClientTest.pdb
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\obj\Debug\AgvClientTest.csprojAssemblyReference.cache
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\obj\Debug\AgvClientTest.Form1.resources
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\obj\Debug\AgvClientTest.Properties.Resources.resources
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\obj\Debug\AgvClientTest.csproj.GenerateResource.cache
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\obj\Debug\AgvClientTest.csproj.CoreCompileInputs.cache
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\obj\Debug\AgvClientTest.exe
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\obj\Debug\AgvClientTest.pdb
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\bin\Debug\AgvClientTest.exe.config
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\bin\Debug\AgvClientTest.exe
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\bin\Debug\AgvClientTest.pdb
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\bin\Debug\Client.dll
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\bin\Debug\log4net.dll
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\bin\Debug\Client.pdb
+D:\OneDrive - 上海挚锦科技有限公司\SMD\AGVControl\AgvClientTest\obj\Debug\AgvClientTest.csproj.CopyComplete