From 8245dd3bba861d60556cd4804b39bca74c19c329 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 14:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Common/Device.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 053b0f0..a7e9d6f 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -1163,14 +1163,14 @@
public DeviceUI GetDeviceUI(string filePath)
{
string[] arry = filePath.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries);
- if (arry.Length != 5)
+ if (arry.Length != 4)
{
return null;
}
//鍒涘缓涓�涓柊鐨勪笢瑗跨粰杩囧幓
var deviceUi = new DeviceUI();
- deviceUi.DeviceAddr = arry[3];
- deviceUi.DeviceEpoint = Convert.ToInt32(arry[4]);
+ deviceUi.DeviceAddr = arry[2];
+ deviceUi.DeviceEpoint = Convert.ToInt32(arry[3]);
return deviceUi;
}
--
Gitblit v1.8.0