From 8cbf4a6b9f334246d88c8101ae3db9a21f1bab3f Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 28 四月 2021 11:40:08 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/M071Process.cs | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 69301a8..b3c0725 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -58,25 +58,31 @@
{
InitialSetting();
- base.Open();
+ if (!Config.IsOfflineMode)
+ {
+ base.Open();
- InitialMotionCardBaseAxisAlarm();
+ InitialMotionCardBaseAxisAlarm();
- SwitchBeep(false);
- SwitchLightGreen(false);
- SwitchLightRed(false);
- SwitchLightYellow(false);
+ SwitchBeep(false);
+ SwitchLightGreen(false);
+ SwitchLightRed(false);
+ SwitchLightYellow(false);
- Reset(null, null, null);
- FullReset(null);
+ Reset(null, null, null);
+ FullReset(null);
+ }
if (Config.Precision > 0)
{
_precision = "f" + Config.Precision;
}
- IncomingCheckMethod = InitialMESWebServiceMethod(IncomingCheckMethodName, out IncomingCheckObj);
- DataUploadMethod = InitialMESWebServiceMethod(DataUploadMethodName, out DataUploadObj);
+ if (Config.IsEnableMESUpload)
+ {
+ IncomingCheckMethod = InitialMESWebServiceMethod(IncomingCheckMethodName, out IncomingCheckObj);
+ DataUploadMethod = InitialMESWebServiceMethod(DataUploadMethodName, out DataUploadObj);
+ }
var allowedShiftStr = ConfigurationManager.AppSettings["DataShift"];
if (!double.TryParse(allowedShiftStr, out _allowedShift))
@@ -1438,8 +1444,15 @@
keyBindList.ForEach(kb =>
{
- kb.KeyImages.Add(image.ConvertHObjectToHImage());
- kb.FillKeyValues(resultDict);
+ if (kb.KeyImages != null)
+ {
+ kb.KeyImages.Add(image.ConvertHObjectToHImage());
+ kb.FillKeyValues(resultDict);
+ }
+ else
+ {
+
+ }
});
});
--
Gitblit v1.8.0