From f441a3c49f8b5cedee3e4def6fbb448ef40eb9cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 10 六月 2020 14:46:58 +0800
Subject: [PATCH] Crabtree-ON 2020-06-10 基于最新HDL ON 优化问题,Crabtree-ONAPP部分功能同步修改优化调整 1. 增加大图片大文件上传处理. 2.远程连接交互提示,由原来的Loading修改成顶部Tip提示。 3.灯光全开、全关和场景控制多线程发送,和HDLON同样加锁处理。 4.Android ,判断移动网络失败,网络监测修复方法修改,后台前台切换优化。

---
 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