From 0e1c6c25b1b0961d324811ff2132717a80f99efe Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 26 四月 2020 14:15:05 +0800
Subject: [PATCH] 2020-04-26 1.添加住宅和修改住宅时，改为子线程操作。 2.远程连接模式时，禁用搜索网关和添加设备。3.修复切换住宅时，提示远程连接Loading不关闭问题。
---
Crabtree/SmartHome/HDL/Operation/Packet.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/Packet.cs b/Crabtree/SmartHome/HDL/Operation/Packet.cs
index 923327a..0779834 100644
--- a/Crabtree/SmartHome/HDL/Operation/Packet.cs
+++ b/Crabtree/SmartHome/HDL/Operation/Packet.cs
@@ -59,6 +59,10 @@
{
//鍔犲瘑妫�娴�
EncryptionDetection ();
+
+ //var mes2 = System.Text.Encoding.ASCII.GetString (Bytes, 0, Bytes.Length);
+ //Utlis.WriteLine ($"============>GetBytes 锛歿mes2}");
+
//瀵逛簬鎿嶄綔鏁版嵁搴撶殑鏃堕棿姣旇緝闀跨殑锛屽彲浠ュ垱寤哄彟涓�涓嚎绋嬪鐞�
if (!"HDLMIRACLE".Equals (System.Text.Encoding.ASCII.GetString (Bytes, 4, 10))) {
return;
@@ -77,7 +81,8 @@
//涓嶆槸瑕佹帴鏀剁殑鎸囦护灏辫繑鍥�
if (!((targetSubnetID == Global.LocalSubnetID && targetDeviceID == Global.LocalDeviceID) || (targetSubnetID == 0xff && targetDeviceID == 0xff))) {
- return;
+ //Utlis.WriteLine ($"============>targetSubnetID return");
+ return;
}
byte [] usefulBytes = null;
if (this.Bytes [16] == 0xFF) {
@@ -93,7 +98,7 @@
try {
ReceiveEvent (subnetID, deviceID, command, usefulBytes);
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
}
}
--
Gitblit v1.8.0