From 12aa9d6bed791095123108eae5eac33e7e3f72bf Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:12:08 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into wxr4
---
HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
index caeabf2..b228052 100644
--- a/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
+++ b/HDL_ON/UI/UI0-Public/UpdataSidDataDialog.cs
@@ -40,12 +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.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);
}
- FunctionList.List.AddDeviceFunction(sidObj);
+ //FunctionList.List.AddDeviceFunction(sidObj);
}
- //MainPage.GoUserPage();
}
}
--
Gitblit v1.8.0