From a6f2ba736d1ac63d8fe33c71dfc3a578b1702b95 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期一, 06 七月 2020 11:27:08 +0800
Subject: [PATCH] 三色灯和蜂鸣器逻辑实现
---
src/Bro.Process/ProcessControl.cs | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs
index 04271dd..948b3c0 100644
--- a/src/Bro.Process/ProcessControl.cs
+++ b/src/Bro.Process/ProcessControl.cs
@@ -342,6 +342,31 @@
}
}
+ public void CreateNewConfig(IProcessConfig config, string newProductionCode)
+ {
+ try
+ {
+ if (config == null)
+ throw new ProcessException("淇濆瓨鐨勯厤缃俊鎭笉鑳戒负绌�");
+ ProductionCode = newProductionCode;
+ //鐢熸垚config.json
+ string newConfig = JsonConvert.SerializeObject(config, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.All });
+ using (StreamWriter writer = new StreamWriter(_configPath, false, System.Text.Encoding.UTF8))
+ {
+ writer.Write(newConfig);
+ writer.Flush();
+ writer.Close();
+ }
+
+ //娣诲姞鍒癝etting.json
+ SettingHelper.AddNewProductionCode(ProductionCode);
+ }
+ catch (Exception ex)
+ {
+ throw new ProcessException(ex.Message, null);
+ }
+ }
+
private void SaveBackupConfig()
{
string backPath = Path.GetDirectoryName(_configPath);
@@ -495,6 +520,9 @@
return;
}
+ if (!ProcessInvokePreCheck())
+ return;
+
IOperationConfig config = monitorSet.OpConfig;
object res = null;
int reTryTimes = config.ReTryTimes;
@@ -553,6 +581,8 @@
}
LogAsync(DateTime.Now, methodCode + "寮傚父淇℃伅", ex.GetExceptionMessage());
+
+ ExceptionRaisedInMonitor(ex);
}
}
@@ -576,12 +606,29 @@
LogAsync(DateTime.Now, $"{device.Name}璋冪敤{methodCode}瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", "");
TimeRecordCSV(DateTime.Now, device.Name, $"{methodCode}璋冪敤瀹屾垚", (int)sw.ElapsedMilliseconds);
}
+
+ /// <summary>
+ /// 娴佺▼鎵ц鐨勯妫�鏌�
+ /// </summary>
+ /// <returns></returns>
+ public virtual bool ProcessInvokePreCheck()
+ {
+ return true;
+ }
+
+ /// <summary>
+ /// 鐩戝惉娴佺▼涓紓甯告姏鍑� 鍦ㄥ叿浣撲笟鍔′腑鍏蜂綋澶勭悊
+ /// </summary>
+ /// <param name="ex">鐩戝惉娴佺▼涓紓甯稿璞�</param>
+ public virtual void ExceptionRaisedInMonitor(Exception ex)
+ {
+ }
#endregion
#region 鍥惧儚澶勭悊
protected HImage CollectHImage(CameraBase camera, IOperationConfig opConfig, out string imgSetId, [CallerMemberName]string methodCode = "")
{
- ImageSet set = null;
+ IImageSet set = null;
if (IConfig.IsImageOffline)
{
@@ -628,7 +675,7 @@
TimeRecordCSV(DateTime.Now, camera.Name, methodCode + "閲囧浘", (int)sw.ElapsedMilliseconds);
}
- imgSetId = set.Id;
+ imgSetId = set?.Id;
return set.HImage;
}
@@ -673,6 +720,11 @@
OnAlarmUpdate?.BeginInvoke(alarmMsg, null, null);
}
+
+ public virtual void RaisedAlarm(string alarmMsg)
+ {
+ OnAlarmUpdate?.Invoke(alarmMsg);
+ }
#endregion
#region ILogger
--
Gitblit v1.8.0