Commit 444cd4e0 张东亮

1

1 个父辈 6e0fc3cc
正在显示 52 个修改的文件 包含 7 行增加31 行删除
此文件类型无法预览
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.30523.141 VisualStudioVersion = 17.2.32616.157
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgvClientTest", "AgvClientTest\AgvClientTest.csproj", "{E1C0827A-FA12-49A9-AC71-6D3E6518754A}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgvClientTest", "AgvClientTest\AgvClientTest.csproj", "{E1C0827A-FA12-49A9-AC71-6D3E6518754A}"
EndProject EndProject
......
...@@ -17,7 +17,7 @@ namespace Agv ...@@ -17,7 +17,7 @@ namespace Agv
/// <summary> /// <summary>
/// 节点信息解析方式:默认解析单个 /// 节点信息解析方式:默认解析单个
/// </summary> /// </summary>
public static bool EnDecodeSingleNode = true; public static bool EnDecodeSingleNode = false;
public static bool CheckHeadChar(byte[] head, out int starIdx) public static bool CheckHeadChar(byte[] head, out int starIdx)
{ {
starIdx = -1; starIdx = -1;
...@@ -115,7 +115,7 @@ namespace Agv ...@@ -115,7 +115,7 @@ namespace Agv
try try
{ {
string json = System.Text.Encoding.UTF8.GetString(buff); string json = System.Text.Encoding.UTF8.GetString(buff);
log.debug(string.Format("Decode[{0}]", json)); log.debug(string.Format("Decode【{0}】", json));
Node node = JsonHelper.DeserializeJsonToObject<Node>(json); Node node = JsonHelper.DeserializeJsonToObject<Node>(json);
return node; return node;
...@@ -136,7 +136,7 @@ namespace Agv ...@@ -136,7 +136,7 @@ namespace Agv
try try
{ {
string json = System.Text.Encoding.UTF8.GetString(buff); string json = System.Text.Encoding.UTF8.GetString(buff);
log.debug(string.Format("DecodeNodes[{0}]", json)); log.debug(string.Format("DecodeNodes【{0}】", json));
List<Node> node = JsonHelper.DeserializeJsonToList<Node>(json); List<Node> node = JsonHelper.DeserializeJsonToList<Node>(json);
return node; return node;
......
...@@ -29,7 +29,7 @@ namespace Agv ...@@ -29,7 +29,7 @@ namespace Agv
} }
public static void warn(string warn) public static void warn(string warn)
{ {
LOGGER.Warn(warn); //LOGGER.Warn(warn);
} }
} }
} }
此文件类型无法预览
此文件类型无法预览
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup>
<log4net>
<appender name="Agv" type="log4net.Appender.RollingFileAppender">
<file value="logs/Agv.log"/>
<param name="Encoding" value="UTF-8"/>
<appendToFile value="true"/>
<rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t][%c:%L]%-5p %m%n"/>
</layout>
</appender>
<root>
<level value="debug"/>
<appender-ref ref="Agv"/>
</root>
</log4net>
</configuration>
此文件的差异太大,无法显示。
...@@ -58,3 +58,4 @@ E:\Neotel\Projects\Gitee\AGV-Com\AgvClientTest\obj\Debug\AgvClientTest.csproj.Co ...@@ -58,3 +58,4 @@ E:\Neotel\Projects\Gitee\AGV-Com\AgvClientTest\obj\Debug\AgvClientTest.csproj.Co
E:\Neotel\Projects\Gitee\AGV-Com\AgvClientTest\obj\Debug\AgvClientTest.exe E:\Neotel\Projects\Gitee\AGV-Com\AgvClientTest\obj\Debug\AgvClientTest.exe
E:\Neotel\Projects\Gitee\AGV-Com\AgvClientTest\obj\Debug\AgvClientTest.pdb E:\Neotel\Projects\Gitee\AGV-Com\AgvClientTest\obj\Debug\AgvClientTest.pdb
E:\Neotel\Projects\Gitee\AGV-Com\AgvClientTest\obj\Debug\AgvClientTest.csproj.AssemblyReference.cache E:\Neotel\Projects\Gitee\AGV-Com\AgvClientTest\obj\Debug\AgvClientTest.csproj.AssemblyReference.cache
E:\Neotel\Projects\Gitee\AGV-Com\AgvClientTest\obj\Debug\AgvClientTest.csproj.SuggestedBindingRedirects.cache
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!