From c3e1b733fc45bd9f0b88bfb560cfa87a270b079b Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 09 九月 2020 17:33:58 +0800 Subject: [PATCH] 20200909 --- HDL_ON/DriverLayer/Control_Bus.cs | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/HDL_ON/DriverLayer/Control_Bus.cs b/HDL_ON/DriverLayer/Control_Bus.cs index 8a81269..5d5dc30 100644 --- a/HDL_ON/DriverLayer/Control_Bus.cs +++ b/HDL_ON/DriverLayer/Control_Bus.cs @@ -39,7 +39,6 @@ DeviceID = deviceID, AddData = gatewayBytes, }, sendCount, false); - MainPage.Log(command.ToString() + "::" + CommonPage.EndPoint.ToString()); } public static byte[] ReadGatewayIPAddress() @@ -84,7 +83,6 @@ else { bool isExit = false; - for (int i = 0, len = usefullBytes.Length; i < len; i++) { if (i % 2 == 0) @@ -97,17 +95,16 @@ } } } - if (!isExit) { //涓嶅瓨鍦紝浠h〃娌℃敹鍒版湰鏈虹殑鍙戦�侊紝缁х画鍥炲 SenRemark(sendStr); } - } - } - catch { } + catch (Exception ex) { + Console.WriteLine($"鍥炲bus鎼滅储寮傚父 : {ex.Message}"); + } } /// <summary> @@ -509,9 +506,24 @@ void managerSendCount(object o) { add(); - if (CommonPage.IsRemote) + if (MainPage.IsRemote) { - 鈥� } + System.Console.WriteLine("杩滅▼鍙戦�佹暟鎹�:" + SendFlag); + Mqtt_Cloud.MqttRemoteSend(Packet.Bytes); + Packet.FlagDateTime = DateTime.Now; + Packet.HaveSendCount--; + //杩欓噷鏄噸鍙戜袱娆� + while (Packet.HaveSendCount < 3) + { + if (Packet.FlagDateTime.AddMilliseconds(1000).Ticks <= System.DateTime.Now.Ticks) + { + Mqtt_Cloud.MqttRemoteSend(Packet.Bytes); + System.Console.WriteLine("閲嶅彂杩滅▼鍙戦�佹暟鎹�:" + SendFlag); + Packet.FlagDateTime = DateTime.Now; + Packet.HaveSendCount++; + } + System.Threading.Thread.Sleep(100); + }鈥� allDone.Set();鈥� } else { //Bus socket鏃犳硶鎺у埗锛岄噸鍚満鍒� @@ -801,7 +813,7 @@ { try { - var sendJob = new JObject { { "vendor_code", "HDL" }, { "command", "search" } }; + var sendJob = new JObject {{ "command", "search" } }; var SearchGateway = JsonConvert.SerializeObject(sendJob); var SearchGatewayPayload = Encoding.ASCII.GetBytes(SearchGateway); Packet = new Packet(SearchGatewayPayload, CommonPage.GetGatewayIP_EndPoint); -- Gitblit v1.8.0