From 2562ee38c58a113113a2943ae057c1937ae533cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 七月 2020 13:49:20 +0800
Subject: [PATCH] 2020-07-01 1.去掉读电能操作，去掉kwh状态显示。 2.当前是分享住宅，不允许删除备份。 3.进入搜索网关页面，切换到本地模式。 4.Alexa页面 增加添加设备失败提示。 5.子账号页面，底部增加文字提示。6.Android 默认隐藏底部虚拟按键。
---
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