Commit 73248902 LN

修改:启动方法执行2次

1 个父辈 3c91b77f
......@@ -67,14 +67,14 @@
<conversionPattern value="[%date][%t]%-5p %m%n" />
</layout>
</appender>
<appender name="RfidLog" type="log4net.Appender.RollingFileAppender">
<file value="logs/RFID.log"/>
<appender name="TheRFID" type="log4net.Appender.RollingFileAppender">
<file value="logs/TheRFID.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="%m%n"/>
<conversionPattern value="[%date][%t]%-5p %m%n" />
</layout>
</appender>
......@@ -82,9 +82,9 @@
<level value="Info" />
<appender-ref ref="RollingLogFileAppender" />
</logger>
<logger name="RfidLog">
<logger name="TheRFID">
<level value="Debug" />
<appender-ref ref="RfidLog" />
<appender-ref ref="TheRFID" />
</logger>
<!--<root>
<level value="Info" />
......
......@@ -321,13 +321,18 @@ namespace OnlineStore.AssemblyLine
LogUtil.info(LOGGER, "开始启动");
startTimer.Interval = 300;
startTimer.Elapsed += timer_Elapsed;
startTimer.AutoReset = false;
startTimer.Enabled = true;
this.timer1.Start();
}
private delegate void ShowFormDelegate();
void timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
startTimer.Enabled = false;
startTimer.Stop();
if (lineBean.runStatus > LineRunStatus.Wait)
{
return;
}
if (lineBean.StartRun())
{
BeginInvoke(new ShowFormDelegate(ShowStatus));
......
......@@ -14,7 +14,7 @@ namespace OnlineStore.Common
public static readonly ILog AIOLog = LogManager.GetLogger("AIOBOXLog");
private static LogUtil instance = new LogUtil();
public delegate void ShowLog(string msg, Color color);
public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public static readonly ILog LOGGER = LogManager.GetLogger("RollingLogFileAppender");
public static readonly ILog rfidLog = LogManager.GetLogger("RfidLog");
public static Dictionary<int, DateTime> lastErrorLogTime = new Dictionary<int, DateTime>();
......
......@@ -15,15 +15,17 @@ namespace OnlineStore.DeviceLibrary
{
public static Asa.RFID.ReaderAll RfidReader = new ReaderAll();
private static int DefaultTrayNum = ConfigAppSettings.GetIntValue(Setting_Init.DefaultTrayNum);
static RFIDManager()
{
RfidReader.GetValue += RfidReader_GetValue;
}
public static void Open(string[] iparray)
{
{
string path = Application.StartupPath + @"\logs\rfid\";
RFIDManager.RfidReader.LogPath = path;
// string[] rfidArray = rfidList.ToArray();
// string[] rfidArray = rfidList.ToArray();
//连接rfip
RFIDManager.RfidReader.Open(iparray);
RfidReader.GetValue += RfidReader_GetValue;
}
private static void RfidReader_GetValue(string s)
......@@ -93,7 +95,12 @@ namespace OnlineStore.DeviceLibrary
{
if (String.IsNullOrEmpty(ip).Equals(false) && LineManager.Line.rfidList.Contains(ip))
{
RFIDData data = new RFIDData(RfidReader.Read(ip));
byte[] bdata = RfidReader.Read(ip);
if (bdata == null)
{
LogUtil.error("RFID [ " + ip + " ] 读到数据=null");
}
RFIDData data = new RFIDData(bdata);
if (isClear)
{
RfidReader.Clear(ip);
......@@ -126,7 +133,7 @@ namespace OnlineStore.DeviceLibrary
public static void Close()
{
try
{
{
RfidReader.Close();
}catch(Exception ex)
{
......
......@@ -82,13 +82,7 @@ namespace OnlineStore.LoadCSVLibrary
protected static bool WriteCSVFile(string filePath, string[] lines)
{
try
{
if (File.Exists(filePath))
{
File.Delete(filePath);
}
File.WriteAllLines(filePath, lines, Encoding.GetEncoding("gbk"));
{
//备份保存
try
{
......@@ -105,12 +99,21 @@ namespace OnlineStore.LoadCSVLibrary
{
File.Delete(backFile);
}
File.WriteAllLines(backFile, lines, Encoding.GetEncoding("gbk"));
File.Copy(filePath, backFile, true );
// File.WriteAllLines(backFile, lines, Encoding.GetEncoding("gbk"));
}
catch (Exception e)
{
LOGGER.Error("出错:", e);
}
if (File.Exists(filePath))
{
File.Delete(filePath);
}
File.WriteAllLines(filePath, lines, Encoding.GetEncoding("gbk"));
}
catch (Exception ex)
{
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!