From b3aa95bab5796caaf28a06922abf111ae55e37df Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期六, 20 二月 2021 10:58:39 +0800
Subject: [PATCH] xlsx文件异常处理
---
src/Bro.Device.Gocator/GocatorConfig.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/Bro.Device.Gocator/GocatorConfig.cs b/src/Bro.Device.Gocator/GocatorConfig.cs
index b6d73ac..40ec8ba 100644
--- a/src/Bro.Device.Gocator/GocatorConfig.cs
+++ b/src/Bro.Device.Gocator/GocatorConfig.cs
@@ -24,6 +24,7 @@
[Category("璁＄畻璁剧疆")]
[Description("true锛氳绠楁椂浣跨敤鍔犻�熷櫒锛宖alse锛氫笉浣跨敤鍔犻�熷櫒")]
[DefaultValue(false)]
+ [Browsable(false)]
public bool IsUseAccelerator { get; set; } = false;
[Category("鎷嶆憚璁剧疆")]
@@ -37,15 +38,25 @@
[DefaultValue(1000)]
public int SnapshotTimeout { get; set; } = 1000;
- //[Category("閲囧浘妯″紡")]
- //[Description("鏄惁纭Е鍙戞ā寮忋�倀rue锛氱‖瑙﹀彂锛沠alse锛氳蒋瑙﹀彂")]
- //[DisplayName("纭Е鍙�")]
- //public bool IsHardwareTrigger { get; set; } = false;
+ [Category("閲囧浘妯″紡")]
+ [Description("寮傛閲囧浘鏃讹紝鏄惁纭Е鍙戞ā寮忋�倀rue锛氱‖瑙﹀彂锛沠alse锛氳蒋瑙﹀彂")]
+ [DisplayName("纭Е鍙�")]
+ public bool IsHardwareTrigger { get; set; } = false;
[Category("閲囧浘妯″紡")]
[Description("true锛氬紓姝�/琚姩閲囧浘妯″紡 false锛氬悓姝�/涓诲姩閲囧浘妯″紡")]
[DefaultValue(false)]
public bool IsAsyncMode { get; set; } = false;
+
+ [Category("鏁版嵁浣嶉厤缃�")]
+ [Description("鍥惧儚鏁版嵁浣嶆暟锛�2浣�/4浣�")]
+ public GocatorDataByteNums ByteNums { get; set; } = GocatorDataByteNums.Byte2;
+ }
+
+ public enum GocatorDataByteNums
+ {
+ Byte2 = 2,
+ Byte4 = 4,
}
[Device("Gocator", "Gocator婵�鍏夋壂鎻忎华", EnumHelper.DeviceAttributeType.OperationConfig)]
--
Gitblit v1.8.0