2020-12-1

陈嘉乐

2020-12-01 e08a444a9d7acea0cf39f50d22d29179f6a59292

 HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs

File was renamed from HDL_ON/UI/UI0-Public/UpdataTcpResidenceDataDialog.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);