From b4bb337bdce4d09473a45610e09350056326c87a Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 12 八月 2020 11:30:36 +0800 Subject: [PATCH] 2020-08-12 1.去掉加密相关代码,解决客户反馈Google Play上架不了。 --- Crabtree/SmartHome/HDL/Operation/Control.cs | 66 ++++++++++++++++---------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Crabtree/SmartHome/HDL/Operation/Control.cs b/Crabtree/SmartHome/HDL/Operation/Control.cs index d7b97c1..0b0b1b2 100644 --- a/Crabtree/SmartHome/HDL/Operation/Control.cs +++ b/Crabtree/SmartHome/HDL/Operation/Control.cs @@ -394,41 +394,41 @@ } } 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--; + //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); - } + // //杩欓噷鏄噸鍙戜袱娆� + // 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 (); + // } + //} } /// <summary> /// 褰撳墠鏁版嵁鍖� -- Gitblit v1.8.0