From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/DriverLayer/Control_Bus.cs | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/DriverLayer/Control_Bus.cs b/HDL_ON/DriverLayer/Control_Bus.cs
index 0579d89..e4eadf7 100644
--- a/HDL_ON/DriverLayer/Control_Bus.cs
+++ b/HDL_ON/DriverLayer/Control_Bus.cs
@@ -49,6 +49,8 @@
return control.UsefulBytes;
}
+ static DAL.Net.TcpListener tcpListener;
+
/// <summary>
/// 000E 鎼滅储鍥炲
/// </summary>
@@ -63,6 +65,11 @@
return;
}
+ if (tcpListener == null)
+ {
+ tcpListener = new DAL.Net.TcpListener();
+ tcpListener.OpenServer(8586);
+ }
if (!CommonPage.isHttpListenerStart)
{
@@ -343,14 +350,14 @@
//case Command.ReadWirelessPanelButtonKeyACK:
//case Command.WriteWirelessPanelButtonKeyACK:
//case Command.ReadDryContactStatusACK:
- //case Command.InstructionPanelKeyACK:
- //case Command.ReadInstructionPanelKeyACK:
- //case Command.ReadAnalogValueACK:
- //case Command.ReadSensorTargetRemarkACK:
- //case Command.SetHornTargetStateACK:
- //case Command.ReadHornTargetStateACK:
- // receiveFlag += string.Format("{0},{1}", usefulBytes[0], usefulBytes[1]);
- // break;
+ case Command.InstructionPanelKeyACK:
+ case Command.ReadInstructionPanelKeyACK:
+ //case Command.ReadAnalogValueACK:
+ //case Command.ReadSensorTargetRemarkACK:
+ //case Command.SetHornTargetStateACK:
+ //case Command.ReadHornTargetStateACK:
+ receiveFlag += string.Format("{0},{1}", usefulBytes[0], usefulBytes[1]);
+ break;
//case Command.AssignedAddressACK:
//case Command.UpdataCurtainModelRunTimeACK:
//case Command.ReadCurtainStutasACK:
@@ -524,7 +531,6 @@
MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
BusSocket.AsyncBeginSend(Packet);
Packet.HaveSendCount--;
- controlLostCount++;
//杩欓噷鏄噸鍙戜袱娆�
while (Packet.HaveSendCount < 3)
@@ -533,6 +539,7 @@
{
MainPage.Log("閲嶅彂鏁版嵁:" + SendFlag);
BusSocket.AsyncBeginSend(Packet);
+ controlLostCount++;
}
System.Threading.Thread.Sleep(100);
}
@@ -714,12 +721,12 @@
//case Command.SetCurtainModelStutas:
//case Command.DownloadInfrared:
//case Command.UpLoadInfrared:
- //case Command.InstructionPanelKey:
- //case Command.ReadInstructionPanelKey:
- //case Command.ReadSensorTargetRemark:
- //case Command.SetHornTargetState:
- // this.sendFlag += string.Format("{0},{1}", target.AddData[0], target.AddData[1]);
- // break;
+ case Command.InstructionPanelKey:
+ case Command.ReadInstructionPanelKey:
+ //case Command.ReadSensorTargetRemark:
+ //case Command.SetHornTargetState:
+ this.sendFlag += string.Format("{0},{1}", target.AddData[0], target.AddData[1]);
+ break;
//case Command.AssignedAddress:
//case Command.UpdataCurtainModelRunTime:
//case Command.ReadCurtainStatus:
--
Gitblit v1.8.0