Commit 11f4be57 LN

1

1 个父辈 f2edf9b3
......@@ -85,8 +85,8 @@
<conversionPattern value="[%date][%t]%-5p %m%n" />
</layout>
</appender>
<appender name="AIOBOX" type="log4net.Appender.RollingFileAppender">
<file value="logs/aio/AIOBOX-line.log" />
<appender name="Rmaxis" type="log4net.Appender.RollingFileAppender">
<file value="logs/rmaix/Rmaxis-line.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
......@@ -103,9 +103,9 @@
<level value="Info" />
<appender-ref ref="TheRFID" />
</logger>
<logger name="AIOBOX">
<logger name="Rmaxis">
<level value="Info" />
<appender-ref ref="AIOBOX" />
<appender-ref ref="Rmaxis" />
</logger>
<!--<root>
<level value="Info" />
......
......@@ -45,7 +45,7 @@ namespace OnlineStore.AssemblyLine
}
return str;
}
internal static string GetCodeNum(string codeName = "RC1250-AssemblyLine")
internal static string GetCodeNum(string codeName = "SO827-AssemblyLine")
{
byte[] byteArray = System.Text.Encoding.ASCII.GetBytes(codeName);
string result = "";
......

51.8 KB | 宽: | 高:

56.5 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
......@@ -125,6 +125,9 @@
<Compile Include="server\LineServer.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="device_config.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="eyemLib.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
......@@ -155,6 +158,12 @@
<Content Include="opencv_world420.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="SDK\MotorMaster.Sdk.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="system_config.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="zxing.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
......@@ -211,6 +220,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="packages.config" />
<Content Include="SDK\MotorMaster.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
......
......@@ -28,7 +28,7 @@ namespace OnlineStore.DeviceLibrary
}
if (rmaxis == null)
{
rmaxis = new Rmaxis();
rmaxis = new Rmaxis("Rmaxis");
}
if (!rmaxis.IsPortOpen)
{
......
此文件的差异太大,无法显示。
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!