From 7e42cc13a14b7de31c9f5d5c61cdf24f3246335d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 31 三月 2023 11:36:45 +0800
Subject: [PATCH] 1
---
Crabtree/SmartHome/HDL/Operation/Control.cs | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/Control.cs b/Crabtree/SmartHome/HDL/Operation/Control.cs
index c8a7a12..0b0b1b2 100644
--- a/Crabtree/SmartHome/HDL/Operation/Control.cs
+++ b/Crabtree/SmartHome/HDL/Operation/Control.cs
@@ -371,41 +371,64 @@
void managerSendCount (object o)
{
add ();
- if (Shared.SimpleControl.CommonPage.IsRemote && !isLocal) {
- System.Console.WriteLine ("杩滅▼鍙戦�佹暟鎹�:" + SendFlag);
- SmartHome.MqttCommon.MqttRemoteSend (Packet.Bytes);
- Packet.FlagDateTime = DateTime.Now;
+ try {
+ System.Console.WriteLine ("鍙戦�佹暟鎹�:" + SendFlag);
+ BusSocket.AsyncBeginSend (Packet);
Packet.HaveSendCount--;
+
//杩欓噷鏄噸鍙戜袱娆�
while (Packet.HaveSendCount < 3) {
if (Packet.FlagDateTime.AddMilliseconds (1000).Ticks <= System.DateTime.Now.Ticks) {
- SmartHome.MqttCommon.MqttRemoteSend (Packet.Bytes);
- System.Console.WriteLine ("閲嶅彂杩滅▼鍙戦�佹暟鎹�:" + SendFlag);
- Packet.FlagDateTime = DateTime.Now;
- Packet.HaveSendCount++;
+ //System.Console.WriteLine ("閲嶅彂鏁版嵁:" + SendFlag);
+ BusSocket.AsyncBeginSend (Packet);
}
System.Threading.Thread.Sleep (100);
- }鈥� allDone.Set ();鈥� } else {
- try {
- System.Console.WriteLine ("鍙戦�佹暟鎹�:" + SendFlag);
- BusSocket.AsyncBeginSend (Packet);
- Packet.HaveSendCount--;
+ }
- //杩欓噷鏄噸鍙戜袱娆�
- while (Packet.HaveSendCount < 3) {
- if (Packet.FlagDateTime.AddMilliseconds (1000).Ticks <= System.DateTime.Now.Ticks) {
- System.Console.WriteLine ("閲嶅彂鏁版嵁:" + SendFlag);
- BusSocket.AsyncBeginSend (Packet);
- }
- System.Threading.Thread.Sleep (100);
- }
-
- } catch (Exception ex) {
- Console.WriteLine ("managerSendCount:" + ex.ToString ());
- } finally {
- allDone.Set ();
+ } catch (Exception ex) {
+ Console.WriteLine ("managerSendCount:" + ex.ToString ());
+ } finally {
+ allDone.Set ();
+ if (Packet.HaveSendCount == 3 && IsCanShowTip) {
+ //MainPage.AddTip (Language.StringByID (SimpleControl.R.MyInternationalizationString.OperationFailed));
}
}
+ return;
+ //if (Shared.SimpleControl.CommonPage.IsRemote && !isLocal) {
+ // System.Console.WriteLine ("杩滅▼鍙戦�佹暟鎹�:" + SendFlag);
+ // SmartHome.MqttCommon.MqttRemoteSend (Packet.Bytes);
+ // Packet.FlagDateTime = DateTime.Now;
+ // Packet.HaveSendCount--;
+ // //杩欓噷鏄噸鍙戜袱娆�
+ // while (Packet.HaveSendCount < 3) {
+ // if (Packet.FlagDateTime.AddMilliseconds (1000).Ticks <= System.DateTime.Now.Ticks) {
+ // SmartHome.MqttCommon.MqttRemoteSend (Packet.Bytes);
+ // System.Console.WriteLine ("閲嶅彂杩滅▼鍙戦�佹暟鎹�:" + SendFlag);
+ // Packet.FlagDateTime = DateTime.Now;
+ // Packet.HaveSendCount++;
+ // }
+ // System.Threading.Thread.Sleep (100);
+ // }鈥� // allDone.Set ();鈥� //} else {
+ // try {
+ // System.Console.WriteLine ("鍙戦�佹暟鎹�:" + SendFlag);
+ // BusSocket.AsyncBeginSend (Packet);
+ // Packet.HaveSendCount--;
+
+ // //杩欓噷鏄噸鍙戜袱娆�
+ // while (Packet.HaveSendCount < 3) {
+ // if (Packet.FlagDateTime.AddMilliseconds (1000).Ticks <= System.DateTime.Now.Ticks) {
+ // System.Console.WriteLine ("閲嶅彂鏁版嵁:" + SendFlag);
+ // BusSocket.AsyncBeginSend (Packet);
+ // }
+ // System.Threading.Thread.Sleep (100);
+ // }
+
+ // } catch (Exception ex) {
+ // Console.WriteLine ("managerSendCount:" + ex.ToString ());
+ // } finally {
+ // allDone.Set ();
+ // }
+ //}
}
/// <summary>
/// 褰撳墠鏁版嵁鍖�
--
Gitblit v1.8.0