From 8df24b0a3dfd5b6f39c5393ef24eab25b70ab858 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 九月 2020 13:18:33 +0800
Subject: [PATCH] 202009111
---
HDL_ON/DriverLayer/Control_Bus.cs | 252 +++++++++++++++++++++++++++++++++----------------
1 files changed, 169 insertions(+), 83 deletions(-)
diff --git a/HDL_ON/DriverLayer/Control_Bus.cs b/HDL_ON/DriverLayer/Control_Bus.cs
index b5d7d40..b73abd8 100644
--- a/HDL_ON/DriverLayer/Control_Bus.cs
+++ b/HDL_ON/DriverLayer/Control_Bus.cs
@@ -1,16 +1,21 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Text;
using HDL_ON.DAL;
using HDL_ON.DAL.Net;
using HDL_ON.Entity;
-using Shared;
-using Shared.Net;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
namespace HDL_ON
{
public partial class Control
{
public DateTime LatestDateTime = DateTime.Now;
+ /// <summary>
+ /// 鎺у埗澶辫触娆℃暟
+ /// </summary>
+ public static int controlLostCount = 0;
/// <summary>
/// 鎵�鏈夊井淇″涓�绔彛鐨勬帶鍒堕兘浼氭斁鍒拌繖涓泦鍚堥噷
@@ -20,7 +25,7 @@
/// <summary>
/// 鍙戦�佹暟鎹紝涓嶉渶瑕佺瓑寰呭洖澶�
/// </summary>
- static void ControlBytesSend(Command command, byte subnetID, byte deviceID, byte[] gatewayBytes, int sendCount = 3, System.Net.IPEndPoint ipEndpoint = null)
+ public static void ControlBytesSend(Command command, byte subnetID, byte deviceID, byte[] gatewayBytes, int sendCount = 3, System.Net.IPEndPoint ipEndpoint = null)
{
Control control = new Control();
control.Send(new Target()
@@ -31,9 +36,17 @@
DeviceID = deviceID,
AddData = gatewayBytes,
}, sendCount, false);
- MainPage.Log(command.ToString() + "::" + CommonPage.EndPoint.ToString());
-
}
+
+ public static byte[] ReadGatewayIPAddress()
+ {
+ Control control = new Control();
+ control.ReadGatewayIP();
+ return control.UsefulBytes;
+ }
+
+ static DAL.Net.TcpListener tcpListener;
+
/// <summary>
/// 000E 鎼滅储鍥炲
/// </summary>
@@ -48,59 +61,70 @@
return;
}
- //if (!isHttpListenerStart)
- //{
- // //鏁版嵁鎺ユ敹绔彛娌℃墦寮�锛屼笉鍥炲
- // return;
- //}
-
- var sendStr = MainPage.LoginUser.accountString;
-
-
- //濡傛灉IP鍦板潃鑾峰彇鎴愬姛 鏄剧ず鏈�鍚庝竴浣�
- var mAddressBytes = new Shared.Net.NetWiFi().IpAddress.GetAddressBytes();
- if (mAddressBytes != null && mAddressBytes.Length == 4)
+ if (tcpListener == null)
{
- sendStr = (mAddressBytes[3] & 0xFF).ToString() + ":" + sendStr;
+ tcpListener = new DAL.Net.TcpListener();
+ tcpListener.OpenServer(8586);
}
- if (usefullBytes.Length <= 2)
+ //if (!CommonPage.isHttpListenerStart)
+ //{
+ // //鏁版嵁鎺ユ敹绔彛娌℃墦寮�锛屼笉鍥炲
+ // CommonPage.InitHttpListener();
+ //}
+ var sendStr = MainPage.LoginUser.accountString;
+ if (usefullBytes.Length == 0)
{
- byte[] sendBytes = new byte[20];
- byte[] b1 = CommonPage.MyEncodingGB2312.GetBytes(sendStr);
- Array.Copy(b1, 0, sendBytes, 0, 20 < b1.Length ? 20 : b1.Length);
- Control.ControlBytesSend(Command.ReadRemarkACK, 0xFF, 0xFF, sendBytes, 1);
-
+ SenRemark(sendStr);
}
else
{
-
- for (int i = 2, len = usefullBytes.Length; i < len; i++)
+ bool isExit = false;
+ for (int i = 0, len = usefullBytes.Length; i < len; i++)
{
if (i % 2 == 0)
{
- if ((usefullBytes[i] & 0xFF) == 0xFC
- && (usefullBytes[i + 1] & 0xFF) == 0xFC
- )
+ if ((usefullBytes[i] & 0xFF) == 252
+ && (usefullBytes[i + 1] & 0xFF) == 252)
{
-
- byte[] sendBytes = new byte[20];
- byte[] b1 = CommonPage.MyEncodingGB2312.GetBytes(sendStr);
- //Remote_GroupName = CommonPage.MyEncodingGB2312.GetString (b1);
- Array.Copy(b1, 0, sendBytes, 0, 20 < b1.Length ? 20 : b1.Length);
- Control.ControlBytesSend(Command.ReadRemarkACK, 0xFF, 0xFF, sendBytes, 1);
-
+ isExit = true;
break;
}
}
}
-
+ if (!isExit)
+ {
+ //涓嶅瓨鍦紝浠ｈ〃娌℃敹鍒版湰鏈虹殑鍙戦�侊紝缁х画鍥炲
+ SenRemark(sendStr);
+ }
}
-
}
- catch { }
+ catch (Exception ex) {
+ Console.WriteLine($"鍥炲bus鎼滅储寮傚父 : {ex.Message}");
+ }
}
+ /// <summary>
+ /// 000F鍥炲澶囨敞
+ /// </summary>
+ /// <param name="sendStr"></param>
+ static void SenRemark(string sendStr)
+ {
+ byte[] sendBytes = new byte[20];
+ byte[] b1 = CommonPage.MyEncodingGB2312.GetBytes(sendStr);
+ //Remote_GroupName = CommonPage.MyEncodingGB2312.GetString (b1);
+ Array.Copy(b1, 0, sendBytes, 0, 20 < b1.Length ? 20 : b1.Length);
+
+ var control = new Control();
+ control.Send(new Target()
+ {
+ IPEndPoint = CommonPage.EndPoint,
+ Command = Command.ReadRemarkACK,
+ SubnetID = 0xFF,
+ DeviceID = 0xFF,
+ AddData = sendBytes,
+ }, 0, false); //璁剧疆褰撳墠鍙戦�佹寚浠ゆ柟寮忎负锛氫换浣曟儏鍐典笅鏈湴鍙戦�併�佷笉闄愬埗銆佷笉鍔犲瘑鏄庢枃鍙戦��
+ }
/// <summary>
/// 澶勭悊鎺ユ敹鍥炴潵鐨勬暟鎹�
/// </summary>
@@ -111,6 +135,25 @@
/// <param name="remoteEndPoint">婧愮綉缁滃鎺ュ瓧</param>
public static void ManagerReceive(byte subnetID, byte deviceID, Command command, byte targetSubnetID, byte targetDeviceID, byte[] usefulBytes, System.Net.EndPoint remoteEndPoint)
{
+ if (((System.Net.IPEndPoint)remoteEndPoint).Port == 6688)
+ {
+
+ for (int i = 0; i < controlList.Count; i++)
+ {
+ try
+ {
+ var control = controlList[i];
+ control.LatestDateTime = DateTime.Now;
+ control.UsefulBytes = usefulBytes;//
+ control.run();
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"control error : {ex.Message}");
+ }
+ }
+ }
+
try
{
string receiveFlag = string.Format("{0},{1},{2},", subnetID, deviceID, (int)command);
@@ -132,7 +175,11 @@
break;
case Command.ReadRemark:
//buspro 璇诲娉ㄥ洖澶�
+ Console.WriteLine("buspro 璇诲娉ㄥ洖澶�");
ReceiveReadRemark(usefulBytes);
+ break;
+ case Command.ReadLightAllLoopBrightnessACK:
+ receiveFlag += "";
break;
//case Command.YIPanelDeviceInofACK:
// for (int i = 0; i < 4; i++)
@@ -183,8 +230,6 @@
//case Command.SetSensorPushValuesACK:
//case Command.ReadSensorPushValuesACK:
// receiveFlag += string.Format("{0},{1}", usefulBytes[0], usefulBytes[1]);
- // break;
- //case Command.ReadLightEquipmentAllLoopBrightnessACK:
// break;
//case Command.UpLoadInfraredACK:
// receiveFlag += string.Format("{0},{1}", usefulBytes[0], usefulBytes[1]);
@@ -280,14 +325,14 @@
//case Command.Remote3thACK:
// receiveFlag = string.Format("{0},", (int)command);
// break;
- //case Command.ReadDeviceLoopInfoACK:
- // if (usefulBytes[0] == 1)
- // {
- // receiveFlag += string.Format("{0},{1}", usefulBytes[0], usefulBytes[2]); ;
- // }
- // else
- // receiveFlag += string.Format("{0},{1},{2}", usefulBytes[0], usefulBytes[1], usefulBytes[2]);
- // break;
+ case Command.ReadDeviceLoopInfoACK:
+ if (usefulBytes[0] == 1)
+ {
+ receiveFlag += string.Format("{0},{1}", usefulBytes[0], usefulBytes[2]); ;
+ }
+ else
+ receiveFlag += string.Format("{0},{1},{2}", usefulBytes[0], usefulBytes[1], usefulBytes[2]);
+ break;
//case Command.SetDeviceLoopInfoACK:
//case Command.InfraredControlACK:
//case Command.SetSecurityByPassACK:
@@ -300,14 +345,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:
@@ -353,9 +398,9 @@
control.run();
}
}
- catch
+ catch (Exception ex)
{
-
+ Console.WriteLine($"control error : {ex.Message}");
}
}
}
@@ -458,9 +503,10 @@
void managerSendCount(object o)
{
add();
- if (CommonPage.IsRemote)
+ if (MainPage.IsRemote)
{
- MqttCommon.MqttRemoteSend(Packet.Bytes);
+ System.Console.WriteLine("杩滅▼鍙戦�佹暟鎹�:" + SendFlag);
+ Mqtt_Cloud.MqttRemoteSend(Packet.Bytes);
Packet.FlagDateTime = DateTime.Now;
Packet.HaveSendCount--;
//杩欓噷鏄噸鍙戜袱娆�
@@ -468,7 +514,8 @@
{
if (Packet.FlagDateTime.AddMilliseconds(1000).Ticks <= System.DateTime.Now.Ticks)
{
- MqttCommon.MqttRemoteSend(Packet.Bytes);
+ Mqtt_Cloud.MqttRemoteSend(Packet.Bytes);
+ System.Console.WriteLine("閲嶅彂杩滅▼鍙戦�佹暟鎹�:" + SendFlag);
Packet.FlagDateTime = DateTime.Now;
Packet.HaveSendCount++;
}
@@ -476,6 +523,19 @@
}鈥� allDone.Set();鈥� }
else
{
+ //Bus socket鏃犳硶鎺у埗锛岄噸鍚満鍒�
+ if (controlLostCount > 10)
+ {
+ BusSocket.Stop();
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(1000);
+ BusSocket.Start(6000);
+ controlLostCount = 0;
+ })
+ { IsBackground = true }.Start();
+ }
+
try
{
MainPage.Log("鍙戦�佹暟鎹�:" + SendFlag);
@@ -485,10 +545,11 @@
//杩欓噷鏄噸鍙戜袱娆�
while (Packet.HaveSendCount < 3)
{
- if (Packet.FlagDateTime.AddMilliseconds(1000).Ticks <= System.DateTime.Now.Ticks)
+ if (Packet.FlagDateTime.AddMilliseconds(1000).Ticks <= DateTime.Now.Ticks)
{
MainPage.Log("閲嶅彂鏁版嵁:" + SendFlag);
BusSocket.AsyncBeginSend(Packet);
+ controlLostCount++;
}
System.Threading.Thread.Sleep(100);
}
@@ -509,7 +570,7 @@
/// </summary>
Packet Packet;
- private void ini(Target target, bool send = true)
+ private void ini(Target target)
{
this.SendFlag = string.Format("{0},{1},{2},", target.SubnetID, target.DeviceID, (int)target.Command + 1);
@@ -525,6 +586,9 @@
break;
case Command.SetLogicLoopColor:
this.sendFlag += string.Format("{0},{1},{2}", target.AddData[0], target.AddData[1], target.AddData[2]);
+ break;
+ case Command.ReadLightAllLoopBrightness:
+ this.SendFlag += "";
break;
//case Command.YIPanelDeviceInof:
// for (int i = 0; i < 4; i++)
@@ -651,12 +715,12 @@
//case Command.Remote3th:
// this.SendFlag = string.Format("{0},", (int)target.Command + 1);
// break;
- //case Command.ReadDeviceLoopInfo:
- // if (target.AddData[0] == 1)//鐗规畩澶勭悊鐏厜绫伙紝DMX妯″潡姣忎竴涓洖璺笉鍥哄畾灏忕被锛屾牴鎹叿浣撹缃潵鍥炲
- // this.sendFlag += string.Format("{0},{1}", target.AddData[0], target.AddData[2]);
- // else
- // this.sendFlag += string.Format("{0},{1},{2}", target.AddData[0], target.AddData[1], target.AddData[2]);
- // break;
+ case Command.ReadDeviceLoopInfo:
+ if (target.AddData[0] == 1)//鐗规畩澶勭悊鐏厜绫伙紝DMX妯″潡姣忎竴涓洖璺笉鍥哄畾灏忕被锛屾牴鎹叿浣撹缃潵鍥炲
+ this.sendFlag += string.Format("{0},{1}", target.AddData[0], target.AddData[2]);
+ else
+ this.sendFlag += string.Format("{0},{1},{2}", target.AddData[0], target.AddData[1], target.AddData[2]);
+ break;
//case Command.SetDeviceLoopInfo:
//case Command.InfraredControl:
//case Command.SetSecurityByPass:
@@ -670,12 +734,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:
@@ -708,12 +772,10 @@
//return;
break;
}
- if (send)
- {
- System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
- thread.IsBackground = true;
- thread.Start(Packet);
- }
+
+ System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
+ thread.IsBackground = true;
+ thread.Start(Packet);
}
/// <summary>
@@ -721,7 +783,7 @@
/// </summary>
/// <param name="target">鍙戦�佸璞�</param>
/// <param name="sendCount">閲嶅彂娆℃暟</param>
- public void Send(Target target, int sendCount, bool isWait)
+ void Send(Target target, int sendCount, bool isWait)
{
try
{
@@ -741,5 +803,29 @@
}
}
+ /// <summary>
+ /// 璇诲彇缃戝叧IP
+ /// </summary>
+ void ReadGatewayIP()
+ {
+ try
+ {
+ var sendJob = new JObject {{ "command", "search" } };
+ var SearchGateway = JsonConvert.SerializeObject(sendJob);
+ var SearchGatewayPayload = Encoding.ASCII.GetBytes(SearchGateway);
+ Packet = new Packet(SearchGatewayPayload, new System.Net.IPEndPoint(System.Net.IPAddress.Parse("224.0.168.188"), 6688));
+ System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
+ thread.IsBackground = true;
+ thread.Start(Packet);
+
+ wait();
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"Send bus data error {ex.Message}");
+ }
+ }
+
+
}
}
--
Gitblit v1.8.0