From d8545fbd1b36a6766c57c987e5d89862b470fed9 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 九月 2020 09:46:29 +0800
Subject: [PATCH] 2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时，去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持，Alexa 的场景同样增加通用开关的支持。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs | 169 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 114 insertions(+), 55 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
index 1ddb314..ed63141 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -74,12 +74,16 @@
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
+ etAccount.Text = "18926269190@189.cn";
+ //etAccount.Text = "721343314@qq.com";
+ //etAccount.Text = "crabtreel12019@gmail.com";
+ //etAccount.Text = "2791308028@qq.com";
+#endif
+
accountView.AddChidren (etAccount);
var userConfigBytes = IO.FileUtils.ReadFile ("AccountListDB");
@@ -93,6 +97,13 @@
}
var accountList = accountListDB.account;
+ //鑷姩濉啓璐﹀彿
+ if (string.IsNullOrEmpty (account)) {
+ if (accountList.Count > 0) {
+ etAccount.Text = accountList [accountList.Count - 1];
+ }
+
+ }
var accountListView = new VerticalScrolViewLayout () {
Width = Application.GetRealWidth (500),
Height = Application.GetRealHeight (85 * 2),
@@ -119,20 +130,21 @@
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 () {
X = etPasswrod.Right,
Y = etPasswrod.Y + Application.GetRealHeight (12),
- Width = Application.GetRealWidth (73),
- Height = Application.GetRealHeight (60),
- UnSelectedImagePath = "CrabtreeAdd/ShowPW.png",
- SelectedImagePath = "CrabtreeAdd/HidePW.png",
+ Width = Application.GetMinRealAverage (73),
+ Height = Application.GetMinRealAverage (60),
+ UnSelectedImagePath = "CrabtreeAdd/HidePW.png",
+ SelectedImagePath = "CrabtreeAdd/ShowPW.png",
BorderColor = SkinStyle.Current.Transparent,
BorderWidth = 2,
Radius = 1
@@ -156,6 +168,10 @@
NigelLoginPass++;
};
#endif
+ //if (accountList.Count > 0) {
+ // etAccount.Text = accountList [accountList.Count-1];
+ //}
+
etAccount.EditorEnterAction += (obj) => {
Application.HideSoftInput ();
etPasswrod.Foucs = true;
@@ -246,7 +262,7 @@
MainPage.Loading.Start ("Login...");
}
});
- if (UserConfig.Instance.internetStatus == 0 || !SystemRemote.checeInternet ()) {
+ if (UserConfig.Instance.internetStatus == 0) {
Application.RunOnMainThread (() => {
new Tip () { Text = "Network abnormal, unable to connect to the Internet", Direction = AMPopTipDirection.Down, CloseTime = 3 }.Show (btnLogo);
});
@@ -270,7 +286,7 @@
} catch (Exception ex) {
MainPage.FailureToServer ();
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -384,31 +400,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>
@@ -419,14 +435,21 @@
var revertObj = MainPage.RequestHttps (API.Login, requestJson);
if (revertObj.StateCode.ToUpper() == "SUCCESS") {
- if (!accountListDB.account.Contains (account)) {
- accountListDB.account.Add (account);
- accountListDB.SaveAccountListDB ();
+ //if (!accountListDB.account.Contains (account)) {
+ // accountListDB.account.Add (account);
+ // accountListDB.SaveAccountListDB ();
+ //}
+
+ if (accountListDB.account.Contains (account)) {
+ accountListDB.account.Remove (account);
}
+ accountListDB.account.Add (account);
+ accountListDB.SaveAccountListDB ();
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes> (revertObj.ResponseData.ToString ());
var revertData = responseDataObj;
MainPage.LoginUser = new UserInfo {
+ LoginToken = revertData.Token,
ID = revertData.UserId,
MainUserId = revertData.MainUserId,
AccountType = revertData.UserType,
@@ -437,7 +460,7 @@
Name = revertData.Contact,
Guid = revertData.Guid,
MD5PWD = revertData.MD5PWD,
-
+
};
//var se = new service.hdlcontrol.com_push.WebServicePush ();
@@ -455,10 +478,12 @@
// //褰撲綇瀹呬负绌烘椂鍏堟彁绀虹敤鎴锋柊寤轰綇瀹�
//} else {
var revertRoomData = mResidenceRes.PageData;
- if (revertRoomData.Find ((obj) => obj.Id == UserConfig.Instance.CurrentRegion.Id) == null) {
+ UserConfig.Instance.HomeLists = revertRoomData;
+
+ 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 +493,52 @@
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 && UserConfig.Instance.CheckThisHomeGatewaysNotEmpty (findRoom)) {
+ //鍒锋柊浣忓畢 瑙ｅ喅瀛愯处鍙烽棶棰�
+ UserConfig.Instance.CurrentRegion = findRoom;
+ Room.InitAllRoom ();
+ } else {
+
+ //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];
+ //}
+ if (!bFind) {
+ var findRoom2 = revertRoomData.Find ((obj) => obj.IsOthreShare == false);
+ if (findRoom2 != null) {
+ UserConfig.Instance.CurrentRegion = findRoom2;
+ } else {
+ UserConfig.Instance.CurrentRegion = revertRoomData [0];
+ }
+ }
+
+ IO.FileUtils.DeleteAllFile ();
+ }
+ //}else {
+ // //鍒锋柊浣忓畢 瑙ｅ喅瀛愯处鍙烽棶棰�
+ // UserConfig.Instance.CurrentRegion = findRoom;
+ // Room.InitAllRoom ();
+ //}
+ }
+
+
+ }
////鍘熸柟妗�
//GetAllBindGatewarysPagger (revertRoomData);
////鑾峰彇褰撳墠浣忓畢缃戝叧鏂规
@@ -555,22 +615,21 @@
{
UserConfig.Instance.SaveUserConfig ();
MainPage.LoginUser.LastTime = DateTime.Now;
-
if (UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
- UserConfig.Instance.HomeLists = revertRoomData;
+ //UserConfig.Instance.HomeLists = revertRoomData;
MainPage.LoginUser.SaveUserInfo ();
- UserConfig.Instance.SaveUserConfig ();
+ //UserConfig.Instance.SaveUserConfig ();
Scene.Refresh ();
A31MusicModel.Refresh ();
Application.RunOnMainThread (() => {
Close ();
- UserMiddle.Init ();
- EquipmentPublicClass.CheckLinkRemote (2);
+ UserMiddle.Init (false, true);
+ EquipmentPublicClass.CheckLinkRemote (UserConfig.Instance.internetStatus);
});
} else {
Application.RunOnMainThread (() => {
- UserMiddle.Init ();
+ UserMiddle.Init (false, true);
Close ();
});
}
--
Gitblit v1.8.0