From 2774f5981a93cc6cc6aec22a6409f26889e925b4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 03 七月 2020 16:36:56 +0800
Subject: [PATCH] 2020-07-03 1.修复修改红外TV模块修改备注出错问题。 2.如果搜索红外模块备注为空默认显示TV+回路号备注。 3.上传红外码指令，直接回路备注数据。4.网关配频模式时，开启自动搜索设备线程，定时3秒发送一次E548命令。
---
Crabtree/SmartHome/HDL/Operation/BusSocket.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/BusSocket.cs b/Crabtree/SmartHome/HDL/Operation/BusSocket.cs
index 9d1a284..5508ac5 100644
--- a/Crabtree/SmartHome/HDL/Operation/BusSocket.cs
+++ b/Crabtree/SmartHome/HDL/Operation/BusSocket.cs
@@ -50,7 +50,8 @@
asyncBeginReceive ();
- Console.WriteLine ("BusSocket鍚姩鎴愬姛锛�");
+ Utlis.WriteLine ("BusSocket鍚姩鎴愬姛锛�");
+ Control.IsEnterBackground = false;
}
/// <summary>
@@ -69,8 +70,9 @@
catch { }
busSocket = null;
- Console.WriteLine("BusSocket鍏抽棴鎴愬姛!");
- }
+ Utlis.WriteLine("BusSocket鍏抽棴鎴愬姛!");
+ Control.IsEnterBackground = true;
+ }
/// <summary>
/// 褰撳墠鐨凷ocket鏄惁杩愯
@@ -158,14 +160,15 @@
}
tempPacket.FlagDateTime = System.DateTime.Now;
tempPacket.HaveSendCount++;
-
+ byte [] messageSend;
//2020-01-14 澧炲姞鏈湴閫氳鍔犲瘑
if (UserConfig.Instance.IsLocalEncrypt) {
- var messageSend = Shared.Securitys.EncryptionService.AesEncryptPayload (tempPacket.Bytes, UserConfig.Instance.LocalEncryptKey);
- tempPacket.Bytes = messageSend;
+ messageSend = Shared.Securitys.EncryptionService.AesEncryptPayload (tempPacket.Bytes, UserConfig.Instance.LocalEncryptKey);
+ } else {
+ messageSend = tempPacket.Bytes;
}
- busSocket.BeginSendTo(tempPacket.Bytes, 0, tempPacket.Bytes.Length, SocketFlags.None, tempPacket.RemoteEndPoint, new AsyncCallback(asyncEndSend), tempPacket);
+ busSocket.BeginSendTo(messageSend, 0, messageSend.Length, SocketFlags.None, tempPacket.RemoteEndPoint, new AsyncCallback(asyncEndSend), tempPacket);
}
catch {
--
Gitblit v1.8.0