From 30d5375178a275abd2019f2e5ce0eab1dfa51e0e Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 16 三月 2020 09:50:03 +0800
Subject: [PATCH] 2020-03-16 1.Android 修改包名为com.hdl.crabtreenew.
---
Crabtree/SmartHome/HDL/Operation/Control.cs | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/Control.cs b/Crabtree/SmartHome/HDL/Operation/Control.cs
index d1cd999..8504650 100644
--- a/Crabtree/SmartHome/HDL/Operation/Control.cs
+++ b/Crabtree/SmartHome/HDL/Operation/Control.cs
@@ -390,7 +390,7 @@
if (CommonPage.IsRemote && !isLocal) {
if (!SmartHome.MqttCommon.IsGatewayOnline) {
System.Threading.Thread.Sleep (500);
- System.Console.WriteLine ($"缃戝叧涓嶅湪绾� 鍙栨秷鍙戦��:"+ SendFlag);
+ System.Console.WriteLine ($"缃戝叧涓嶅湪绾� 鍙栨秷鍙戦��:" + SendFlag);
Packet.HaveSendCount = 3;
allDone.Set ();
return;
@@ -405,20 +405,30 @@
System.Console.WriteLine ("杩滅▼鍙戦�佹暟鎹�:" + SendFlag);
SmartHome.MqttCommon.MqttRemoteSend (Packet.Bytes);
Packet.FlagDateTime = DateTime.Now;
- Packet.HaveSendCount++;
+ Packet.HaveSendCount--;
//杩欓噷鏄噸鍙戜袱娆�
while (Packet.HaveSendCount < 3) {
- if (Packet.FlagDateTime.AddMilliseconds (2000).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);
+ System.Console.WriteLine ("閲嶅彂杩滅▼鍙戦�佹暟鎹�:" + SendFlag);
+ Packet.FlagDateTime = DateTime.Now;
+ Packet.HaveSendCount++;
+ }
+ } else {
+ if (Packet.FlagDateTime.AddMilliseconds (5000).Ticks <= System.DateTime.Now.Ticks) {
+ System.Console.WriteLine ("杩滅▼鍙戦�佹暟鎹�: 绛夊緟5s瓒呮椂");
+ Packet.FlagDateTime = DateTime.Now;
+ Packet.HaveSendCount++;
+ }
}
System.Threading.Thread.Sleep (100);
}鈥� allDone.Set ();鈥� } else {
try {
System.Console.WriteLine ("鍙戦�佹暟鎹�:" + SendFlag);
BusSocket.AsyncBeginSend (Packet);
+
+ Packet.FlagDateTime = DateTime.Now;
Packet.HaveSendCount--;
//杩欓噷鏄噸鍙戜袱娆�
--
Gitblit v1.8.0