From 6ba43603ccd8868a4ee73e9b978b7cb20a5b2c52 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 04 十二月 2020 14:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC'
---
HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
index ce3a5f1..5cb1ec7 100644
--- a/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
+++ b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
@@ -33,7 +33,7 @@
DB_ResidenceData.SaveOidList(oidJsonString);
DB_ResidenceData.functionList.ClearAllDeviceFunctionList();
- DB_ResidenceData.DelAllFunctionData();
+ DB_ResidenceData.functionList.DelAllFunctionData();
foreach (var sidObj in sidObjects)
{
var oid = functionOids.Find((o) => o.oid == sidObj.sid.Substring(0, 16));
@@ -42,9 +42,7 @@
var oidNetId = Convert.ToByte(oid.addresses.Substring(0, 2),16);
var oidDevId = Convert.ToByte(oid.addresses.Substring(2, 2),16);
sidObj.bus_Data = new BusData();
- sidObj.bus_Data.SubnetID = oidNetId;
- sidObj.bus_Data.DeviceID = oidDevId;
- sidObj.bus_Data.LoopID = Convert.ToByte(sidObj.sid.Substring(20, 4),16);
+ sidObj.bus_Data.loopId = Convert.ToByte(sidObj.sid.Substring(20, 4),16);
}
DB_ResidenceData.functionList.AddDeviceFunction(sidObj);
}
--
Gitblit v1.8.0