From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/UpdataTcpResidenceDataDialog.cs b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
similarity index 78%
rename from HDL_ON/UI/UI0-Public/UpdataTcpResidenceDataDialog.cs
rename to HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
index 85ea5ad..ce3a5f1 100644
--- a/HDL_ON/UI/UI0-Public/UpdataTcpResidenceDataDialog.cs
+++ b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
@@ -5,7 +5,7 @@
namespace HDL_ON.UI
{
- public class UpdataTcpResidenceDataDialog
+ public class UpdataSidDataDialog
{
public void ShowDialog(List<Function> sidObjects,string oidJsonString)
{
@@ -29,9 +29,9 @@
public void UpdataFunctionList(List<Function> sidObjects, string oidJsonString)//, List<FunctionOid> functionOids)
{
var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<Newtonsoft.Json.Linq.JObject>(oidJsonString);
- var functionOids = Newtonsoft.Json.JsonConvert.DeserializeObject<List<FunctionOid>>(obj.GetValue("objects").ToString());
+ var functionOids = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DeviceModule>>(obj.GetValue("objects").ToString());
- DB_ResidenceData.SaveFunctionOidJsonDataList(oidJsonString);
+ DB_ResidenceData.SaveOidList(oidJsonString);
DB_ResidenceData.functionList.ClearAllDeviceFunctionList();
DB_ResidenceData.DelAllFunctionData();
foreach (var sidObj in sidObjects)
@@ -39,9 +39,11 @@
var oid = functionOids.Find((o) => o.oid == sidObj.sid.Substring(0, 16));
if(oid!=null)
{
+ 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 = Convert.ToByte(oid.net_id, 16);
- sidObj.bus_Data.DeviceID = Convert.ToByte(oid.dev_id, 16);
+ sidObj.bus_Data.SubnetID = oidNetId;
+ sidObj.bus_Data.DeviceID = oidDevId;
sidObj.bus_Data.LoopID = Convert.ToByte(sidObj.sid.Substring(20, 4),16);
}
DB_ResidenceData.functionList.AddDeviceFunction(sidObj);
--
Gitblit v1.8.0