From be95e839f40eb3ddf64706b60cba6dfcf4fad5e5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 03 四月 2020 14:31:44 +0800
Subject: [PATCH] 2020-04-03 1.去掉登录前ping百度域名的网络监测。
---
Crabtree/SmartHome/HDL/Operation/Control.cs | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/Control.cs b/Crabtree/SmartHome/HDL/Operation/Control.cs
index 6001877..070dcf9 100644
--- a/Crabtree/SmartHome/HDL/Operation/Control.cs
+++ b/Crabtree/SmartHome/HDL/Operation/Control.cs
@@ -63,7 +63,7 @@
AddData = gatewayBytes,
}, sendCount, false);
CommonPage.FindGateway = false;
- System.Console.WriteLine (command.ToString () + "::" + CommonPage.EndPoint.ToString ());
+ Utlis.WriteLine (command.ToString () + "::" + CommonPage.EndPoint.ToString ());
}
/// <summary>
@@ -287,7 +287,7 @@
default:
break;
}
- //System.Console.WriteLine ("鎺ユ敹鍒版暟鎹細" + receiveFlag);
+ //Utlis.WriteLine ("鎺ユ敹鍒版暟鎹細" + receiveFlag);
for (int i = 0; i < controlList.Count; i++) {
try {
@@ -302,7 +302,7 @@
}
}
} catch (Exception ex) {
- Console.WriteLine ("ManagerReceive鎶涘嚭寮傚父锛�" + ex.ToString ());
+ Utlis.WriteLine ("ManagerReceive鎶涘嚭寮傚父锛�" + ex.ToString ());
}
}
@@ -325,7 +325,7 @@
}
}
- //System.Console.WriteLine ("++++++++"+controlList.Count.ToString ());
+ //Utlis.WriteLine ("++++++++"+controlList.Count.ToString ());
}
controlList.Add (this);
}
@@ -389,47 +389,59 @@
add ();
if (CommonPage.IsRemote && !isLocal) {
if (!SmartHome.MqttCommon.IsGatewayOnline) {
- System.Console.WriteLine ($"缃戝叧涓嶅湪绾� 鍙栨秷鍙戦��:"+ SendFlag);
+ System.Threading.Thread.Sleep (500);
+ Utlis.WriteLine ($"缃戝叧涓嶅湪绾� 鍙栨秷鍙戦��:" + SendFlag);
Packet.HaveSendCount = 3;
allDone.Set ();
return;
}
if (IsEnterBackground) {
- System.Console.WriteLine ("宸茶繘鍏ュ悗鍙� 鍙栨秷鍙戦��");
+ System.Threading.Thread.Sleep (500);
+ Utlis.WriteLine ("宸茶繘鍏ュ悗鍙� 鍙栨秷鍙戦��");
Packet.HaveSendCount = 3;
allDone.Set ();
return;
}
- System.Console.WriteLine ("杩滅▼鍙戦�佹暟鎹�:" + SendFlag);
+ Utlis.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++;
+ if (Packet.HaveSendCount < 2) {
+ if (Packet.FlagDateTime.AddMilliseconds (2000).Ticks <= System.DateTime.Now.Ticks) {
+ SmartHome.MqttCommon.MqttRemoteSend (Packet.Bytes);
+ Utlis.WriteLine ("閲嶅彂杩滅▼鍙戦�佹暟鎹�:" + SendFlag);
+ Packet.FlagDateTime = DateTime.Now;
+ Packet.HaveSendCount++;
+ }
+ } else {
+ if (Packet.FlagDateTime.AddMilliseconds (5000).Ticks <= System.DateTime.Now.Ticks) {
+ Utlis.WriteLine ("杩滅▼鍙戦�佹暟鎹�: 绛夊緟5s瓒呮椂");
+ Packet.FlagDateTime = DateTime.Now;
+ Packet.HaveSendCount++;
+ }
}
System.Threading.Thread.Sleep (100);
}鈥� allDone.Set ();鈥� } else {
try {
- System.Console.WriteLine ("鍙戦�佹暟鎹�:" + SendFlag);
+ Utlis.WriteLine ("鍙戦�佹暟鎹�:" + SendFlag);
BusSocket.AsyncBeginSend (Packet);
+
+ Packet.FlagDateTime = DateTime.Now;
Packet.HaveSendCount--;
//杩欓噷鏄噸鍙戜袱娆�
while (Packet.HaveSendCount < 3 && BusSocket.IsRunning) {
if (Packet.FlagDateTime.AddMilliseconds (1000).Ticks <= System.DateTime.Now.Ticks) {
- System.Console.WriteLine ("閲嶅彂鏁版嵁:" + SendFlag);
+ Utlis.WriteLine ("閲嶅彂鏁版嵁:" + SendFlag);
BusSocket.AsyncBeginSend (Packet);
}
System.Threading.Thread.Sleep (100);
}
} catch (Exception ex) {
- Console.WriteLine ("managerSendCount:" + ex.ToString ());
+ Utlis.WriteLine ("managerSendCount:" + ex.ToString ());
} finally {
allDone.Set ();
}
--
Gitblit v1.8.0