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 | 60 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
index 6a599e5..ed63141 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -78,8 +78,10 @@
};
#if DEBUG
- //Text = "18926269190@189.cn"
- etAccount.Text = "721343314@qq.com";
+ etAccount.Text = "18926269190@189.cn";
+ //etAccount.Text = "721343314@qq.com";
+ //etAccount.Text = "crabtreel12019@gmail.com";
+ //etAccount.Text = "2791308028@qq.com";
#endif
accountView.AddChidren (etAccount);
@@ -139,8 +141,8 @@
Button btnShowPassword = new Button () {
X = etPasswrod.Right,
Y = etPasswrod.Y + Application.GetRealHeight (12),
- Width = Application.GetRealWidth (73),
- Height = Application.GetRealHeight (60),
+ Width = Application.GetMinRealAverage (73),
+ Height = Application.GetMinRealAverage (60),
UnSelectedImagePath = "CrabtreeAdd/HidePW.png",
SelectedImagePath = "CrabtreeAdd/ShowPW.png",
BorderColor = SkinStyle.Current.Transparent,
@@ -260,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);
});
@@ -284,7 +286,7 @@
} catch (Exception ex) {
MainPage.FailureToServer ();
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -447,6 +449,7 @@
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,
@@ -457,7 +460,7 @@
Name = revertData.Contact,
Guid = revertData.Guid,
MD5PWD = revertData.MD5PWD,
-
+
};
//var se = new service.hdlcontrol.com_push.WebServicePush ();
@@ -475,7 +478,8 @@
// //褰撲綇瀹呬负绌烘椂鍏堟彁绀虹敤鎴锋柊寤轰綇瀹�
//} else {
var revertRoomData = mResidenceRes.PageData;
-
+ UserConfig.Instance.HomeLists = revertRoomData;
+
if (UserConfig.Instance.CurrentRegion == null) {
if (revertRoomData != null && revertRoomData.Count > 0) {
var bFind = false;
@@ -496,7 +500,13 @@
} else {
//2020-01-11
var findRoom = revertRoomData.Find ((obj) => obj.Id == UserConfig.Instance.CurrentRegion.Id);
- if (findRoom == null) {
+ 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) {
@@ -506,19 +516,29 @@
break;
}
}
+ //if (!bFind) {
+ // UserConfig.Instance.CurrentRegion = revertRoomData [0];
+ //}
if (!bFind) {
- UserConfig.Instance.CurrentRegion = revertRoomData [0];
+ 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 ();
+ //}else {
+ // //鍒锋柊浣忓畢 瑙ｅ喅瀛愯处鍙烽棶棰�
+ // UserConfig.Instance.CurrentRegion = findRoom;
+ // Room.InitAllRoom ();
+ //}
}
- }
+
+ }
////鍘熸柟妗�
//GetAllBindGatewarysPagger (revertRoomData);
////鑾峰彇褰撳墠浣忓畢缃戝叧鏂规
@@ -595,18 +615,16 @@
{
UserConfig.Instance.SaveUserConfig ();
MainPage.LoginUser.LastTime = DateTime.Now;
- //MainPage.IsOtherDevicesLogin = false;
-
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 (false,true);
- EquipmentPublicClass.CheckLinkRemote (2);
+ UserMiddle.Init (false, true);
+ EquipmentPublicClass.CheckLinkRemote (UserConfig.Instance.internetStatus);
});
} else {
--
Gitblit v1.8.0