From 454ac814944cf956ff02b84b70ba2ec68e5e5ea1 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 15 一月 2020 19:38:47 +0800
Subject: [PATCH] 2020-01-15 1.优化MQTT连接。 2.增加本地通信加密。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs | 112 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 71 insertions(+), 41 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
index 1ddb314..e231673 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -74,12 +74,14 @@
TextAlignment = TextAlignment.CenterLeft,
Radius = (uint)Application.GetRealHeight (0),
TextColor = SkinStyle.Current.TextColor1,
- //Text = account,
-#if DEBUG
- Text = "18926269190@189.cn"
- //Text = "721343314@qq.com"
-#endif
+ Text = account,
+
};
+#if DEBUG
+ //Text = "18926269190@189.cn"
+ etAccount.Text = "721343314@qq.com";
+#endif
+
accountView.AddChidren (etAccount);
var userConfigBytes = IO.FileUtils.ReadFile ("AccountListDB");
@@ -92,6 +94,8 @@
accountListDB = new AccountListDB ();
}
var accountList = accountListDB.account;
+
+
var accountListView = new VerticalScrolViewLayout () {
Width = Application.GetRealWidth (500),
@@ -119,11 +123,12 @@
TextAlignment = TextAlignment.CenterLeft,
SecureTextEntry = true,
TextColor = SkinStyle.Current.TextColor1,
-#if DEBUG
- Text = "123456"
-#endif
- //Text = password,
+
+ Text = password,
};
+#if DEBUG
+ etPasswrod.Text = "123456";
+#endif
passwrodView.AddChidren (etPasswrod);
Button btnShowPassword = new Button () {
@@ -156,6 +161,10 @@
NigelLoginPass++;
};
#endif
+ //if (accountList.Count > 0) {
+ // etAccount.Text = accountList [accountList.Count-1];
+ //}
+
etAccount.EditorEnterAction += (obj) => {
Application.HideSoftInput ();
etPasswrod.Foucs = true;
@@ -384,31 +393,31 @@
}
- /// <summary>
- ///
- /// </summary>
- /// <param name="stateCodeStr"></param>
- void ShowGetAllBindGatewarysPaggerErrorInfo (string stateCodeStr)
- {
- string mes = "";
- //2020-01-06 寰呰ˉ鍏�
- if (stateCodeStr == ErrorCode.NetworkError) {
- mes = ErrorCode.NetworkError;
- } else {
- mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr;
+ ///// <summary>
+ /////
+ ///// </summary>
+ ///// <param name="stateCodeStr"></param>
+ //void ShowGetAllBindGatewarysPaggerErrorInfo (string stateCodeStr)
+ //{
+ // string mes = "";
+ // //2020-01-06 寰呰ˉ鍏�
+ // if (stateCodeStr == ErrorCode.NetworkError) {
+ // mes = ErrorCode.NetworkError;
+ // } else {
+ // mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr;
- }
- if (!string.IsNullOrEmpty (mes)) {
- Application.RunOnMainThread (() => {
- new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
- });
- }
+ // }
+ // if (!string.IsNullOrEmpty (mes)) {
+ // Application.RunOnMainThread (() => {
+ // new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ // });
+ // }
- }
+ //}
/// <summary>
- /// 鐧诲綍
+ /// 鐧诲綍 2020-01-11
/// </summary>
/// <param name="account">Account.</param>
/// <param name="password">Password.</param>
@@ -455,10 +464,11 @@
// //褰撲綇瀹呬负绌烘椂鍏堟彁绀虹敤鎴锋柊寤轰綇瀹�
//} else {
var revertRoomData = mResidenceRes.PageData;
- if (revertRoomData.Find ((obj) => obj.Id == UserConfig.Instance.CurrentRegion.Id) == null) {
+
+ if (UserConfig.Instance.CurrentRegion == null) {
if (revertRoomData != null && revertRoomData.Count > 0) {
var bFind = false;
- foreach(var mHome in revertRoomData) {
+ foreach (var mHome in revertRoomData) {
if (UserConfig.Instance.CheckThisHomeGatewaysNotEmpty (mHome)) {
bFind = true;
UserConfig.Instance.CurrentRegion = mHome;
@@ -468,17 +478,36 @@
if (!bFind) {
UserConfig.Instance.CurrentRegion = revertRoomData [0];
}
- //if (UserConfig.Instance.CheckHomeGateways ()) {
- // UserConfig.Instance.GatewayMAC = revertRoomData [0].HomeGateways [0].GatewayUniqueId;
- //}
- //CheckIfNeedGetMasterAccountToken ();
-
+
IO.FileUtils.DeleteAllFile ();
}
- } else {
- Room.InitAllRoom ();
- }
+ } else {
+ //2020-01-11
+ var findRoom = revertRoomData.Find ((obj) => obj.Id == UserConfig.Instance.CurrentRegion.Id);
+ if (findRoom == null) {
+ if (revertRoomData != null && revertRoomData.Count > 0) {
+ var bFind = false;
+ foreach (var mHome in revertRoomData) {
+ if (UserConfig.Instance.CheckThisHomeGatewaysNotEmpty (mHome)) {
+ bFind = true;
+ UserConfig.Instance.CurrentRegion = mHome;
+ break;
+ }
+ }
+ if (!bFind) {
+ UserConfig.Instance.CurrentRegion = revertRoomData [0];
+ }
+
+ IO.FileUtils.DeleteAllFile ();
+ }
+ } else {
+ //鍒锋柊浣忓畢 瑙ｅ喅瀛愯处鍙烽棶棰�
+ UserConfig.Instance.CurrentRegion = findRoom;
+ Room.InitAllRoom ();
+ }
+
+ }
////鍘熸柟妗�
//GetAllBindGatewarysPagger (revertRoomData);
////鑾峰彇褰撳墠浣忓畢缃戝叧鏂规
@@ -555,6 +584,7 @@
{
UserConfig.Instance.SaveUserConfig ();
MainPage.LoginUser.LastTime = DateTime.Now;
+ //MainPage.IsOtherDevicesLogin = false;
if (UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
UserConfig.Instance.HomeLists = revertRoomData;
@@ -564,13 +594,13 @@
A31MusicModel.Refresh ();
Application.RunOnMainThread (() => {
Close ();
- UserMiddle.Init ();
+ UserMiddle.Init (false,true);
EquipmentPublicClass.CheckLinkRemote (2);
});
} else {
Application.RunOnMainThread (() => {
- UserMiddle.Init ();
+ UserMiddle.Init (false, true);
Close ();
});
}
--
Gitblit v1.8.0