Commit da42b463 authored by wangjunqiang's avatar wangjunqiang

限制本地连接添加624X模块输出

parent 814b29ff
...@@ -195,7 +195,7 @@ namespace GcDevicePc ...@@ -195,7 +195,7 @@ namespace GcDevicePc
NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces(); NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces();
foreach (NetworkInterface adapter in nics) foreach (NetworkInterface adapter in nics)
{ {
// if (adapter.Name == "本地连接") if (adapter.Name == "本地连接")
{ {
bool pd1 = (adapter.NetworkInterfaceType == NetworkInterfaceType.Ethernet || bool pd1 = (adapter.NetworkInterfaceType == NetworkInterfaceType.Ethernet ||
adapter.NetworkInterfaceType == NetworkInterfaceType.Wireless80211); adapter.NetworkInterfaceType == NetworkInterfaceType.Wireless80211);
......
...@@ -58,6 +58,8 @@ namespace GcDevicePc ...@@ -58,6 +58,8 @@ namespace GcDevicePc
/// </summary> /// </summary>
CKvocUpdata dataVOC = new CKvocUpdata(); CKvocUpdata dataVOC = new CKvocUpdata();
private DataOutput wtd624xOutput = new DataOutput();
#region Author by zjx #region Author by zjx
/// <summary> /// <summary>
/// 组件初始化 /// 组件初始化
...@@ -582,6 +584,8 @@ namespace GcDevicePc ...@@ -582,6 +584,8 @@ namespace GcDevicePc
dataVOC.CKvocUpdataStart(); dataVOC.CKvocUpdataStart();
mytcptest.DataRcvStart(); mytcptest.DataRcvStart();
wtd624xOutput.DataOutStart();
} }
private void Stop_Thread() private void Stop_Thread()
...@@ -596,6 +600,8 @@ namespace GcDevicePc ...@@ -596,6 +600,8 @@ namespace GcDevicePc
mymodbus.HmiStatueStop(); mymodbus.HmiStatueStop();
mymodbus.ChannelDataStop(); mymodbus.ChannelDataStop();
} }
wtd624xOutput.DataOutStop();
} }
/// <summary> /// <summary>
......
...@@ -46,7 +46,7 @@ namespace GcDevicePc.ProThread ...@@ -46,7 +46,7 @@ namespace GcDevicePc.ProThread
NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces(); NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces();
foreach (NetworkInterface adapter in nics) foreach (NetworkInterface adapter in nics)
{ {
// if (adapter.Name == "本地连接") if (adapter.Name == "本地连接")
{ {
bool pd1 = (adapter.NetworkInterfaceType == NetworkInterfaceType.Ethernet || adapter.NetworkInterfaceType == NetworkInterfaceType.Wireless80211); //判断是否是以太网连接 bool pd1 = (adapter.NetworkInterfaceType == NetworkInterfaceType.Ethernet || adapter.NetworkInterfaceType == NetworkInterfaceType.Wireless80211); //判断是否是以太网连接
if (pd1) if (pd1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment