From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
index ce3a5f1..b228052 100644
--- a/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
+++ b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
@@ -18,7 +18,7 @@
UpdataFunctionList(sidObjects, oidJsonString);
};
- new PublicAssmebly().TipMsg(StringId.Tip, StringId.UpdataTcpResidenceDataTip, action);
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.UpdataTcpResidenceDataTip, action);
}
/// <summary>
@@ -32,8 +32,7 @@
var functionOids = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DeviceModule>>(obj.GetValue("objects").ToString());
DB_ResidenceData.SaveOidList(oidJsonString);
- DB_ResidenceData.functionList.ClearAllDeviceFunctionList();
- DB_ResidenceData.DelAllFunctionData();
+ FunctionList.List.Clear();
foreach (var sidObj in sidObjects)
{
var oid = functionOids.Find((o) => o.oid == sidObj.sid.Substring(0, 16));
@@ -41,14 +40,12 @@
{
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 = new BusData();
+ //sidObj.bus.LoopId = Convert.ToByte(sidObj.sid.Substring(20, 4),16);
+ sidObj.bus.loopId = sidObj.sid.Substring(20, 4);
}
- DB_ResidenceData.functionList.AddDeviceFunction(sidObj);
+ //FunctionList.List.AddDeviceFunction(sidObj);
}
- MainPage.GoUserPage();
}
}
--
Gitblit v1.8.0