From 33470790ac0069c7734fb1a5b8b07350950c6dfe Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 24 十一月 2020 15:51:31 +0800
Subject: [PATCH] 20201124，整理mqtt订阅
---
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp_Bus.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
similarity index 96%
rename from HDL_ON/DAL/DriverLayer/Control_Udp_Bus.cs
rename to HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 3d1360a..75dc09e 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp_Bus.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -10,9 +10,13 @@
namespace HDL_ON
{
- public class Control_Udp_Bus
+ public class Control_Udp
{
+ public Control_Udp()
+ {
+ MainPage.Log($"control bus udp 琚垱寤猴紝鏃堕棿锛歿DateTime.Now}");
+ }
/// <summary>
/// 閫氳ID
/// </summary>
@@ -26,7 +30,7 @@
/// <summary>
/// 鎵�鏈夊涓�绔彛鐨勬帶鍒堕兘浼氭斁鍒拌繖涓泦鍚堥噷
/// </summary>
- List<Control_Udp_Bus> controlList = new List<Control_Udp_Bus>(50);
+ static List<Control_Udp> controlList = new List<Control_Udp>(50);
public System.Net.IPEndPoint EndPoint
{
@@ -46,11 +50,10 @@
/// <summary>
/// 鍙戦�佹暟鎹紝涓嶉渶瑕佺瓑寰呭洖澶�
- /// ps:鍏佽涓存椂鍏紑锛屼粎渚泃v鍙戦�乥us鍛戒护浣跨敤锛屽悗鏈熼渶瑕佹洿鏂板埌A鍗忚鏁版嵁鏍煎紡鎺у埗
/// </summary>
public void ControlBytesSend(Command command, byte subnetID, byte deviceID, byte[] gatewayBytes, int sendCount = 3)
{
- var control = new Control_Udp_Bus();
+ var control = new Control_Udp();
control.Send(new Target()
{
IPEndPoint = EndPoint ,
@@ -97,8 +100,8 @@
return;
}
- Control.ins.OpenTcpServer();
- var sendStr = UserInfo.Current.accountString;
+ Control.Ins.OpenTcpServer();
+ var sendStr = UserInfo.Current.AccountString;
if (usefullBytes.Length == 0)
{
SendRemark(sendStr);
@@ -133,14 +136,11 @@
/// </summary>
void SendRemark(string sendStr)
{
- //if (System.Globalization.CultureInfo.InstalledUICulture.EnglishName.ToUpper().StartsWith("CZECH"))
- // Encoding.GetEncoding(1250);
-
byte[] sendBytes = new byte[20];
byte[] b1 = Encoding.GetEncoding("gb2312").GetBytes(sendStr);
Array.Copy(b1, 0, sendBytes, 0, 20 < b1.Length ? 20 : b1.Length);
- var control = new Control_Udp_Bus();
+ var control = new Control_Udp();
control.Send(new Target()
{
IPEndPoint = EndPoint,
@@ -581,7 +581,6 @@
}
}
- //System.MainPage.WriteLog ("++++++++"+controlList.Count.ToString ());
}
controlList.Add(this);
}
@@ -634,7 +633,6 @@
allDone.WaitOne();
}
-
/// <summary>
/// 璁╁綋鍓嶇嚎绋嬬户缁墽琛�
/// </summary>
@@ -644,8 +642,7 @@
Packet.HaveSendCount = 4;
}
-
- //鏁版嵁閲嶅彂澶勭悊
+ //鏁版嵁鍙戦�佸鐞�
void managerSendCount(object o)
{
add();
@@ -694,8 +691,11 @@
/// 褰撳墠鏁版嵁鍖�
/// </summary>
Packet Packet;
-
- private void ini(Target target)
+ /// <summary>
+ /// 璁板綍鍙戦�佹暟鎹寘
+ /// </summary>
+ /// <param name="target"></param>
+ private void signPacket(Target target)
{
this.SendFlag = string.Format("{0},{1},{2},", target.SubnetID, target.DeviceID, (int)target.Command + 1);
@@ -732,13 +732,10 @@
break;
}
- System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
- thread.IsBackground = true;
- thread.Start(Packet);
}
/// <summary>
- /// 鍙戦�丅us鏁版嵁锛屽彂閫佷簡涓嶉渶瑕佺瓑寰�
+ /// 鍙戦�佹暟鎹�
/// </summary>
/// <param name="target">鍙戦�佸璞�</param>
/// <param name="sendCount">閲嶅彂娆℃暟</param>
@@ -749,7 +746,11 @@
Packet = new Packet(target.SendBytes, target.IPEndPoint);
Packet.HaveSendCount = 3 - sendCount;
- ini(target);
+ signPacket(target);
+
+ System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(managerSendCount));
+ thread.IsBackground = true;
+ thread.Start(Packet);
if (isWait)
{
@@ -769,9 +770,7 @@
{
try
{
- var sendJob = new JObject {
- {"id",msg_id.ToString() } ,{"time_stamp",(DateTime.Now.Ticks / 10000).ToString()}
- };
+ var sendJob = new JObject { { "id", msg_id.ToString() }, { "time_stamp", (DateTime.Now.Ticks / 10000).ToString() } };
var bodyString = JsonConvert.SerializeObject(sendJob);
var bodyBytes = Encoding.ASCII.GetBytes(bodyString);
var sendBytes = A_Protocal_Common.apc.ConvertSendBodyData(CommunicationTopic.SearchLoaclGateway, bodyString);
--
Gitblit v1.8.0