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/UI/SimpleControl/Phone/Register/AccountLogin.cs | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
index bb6eed1..dd9080a 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 = "18926269190@189.cn";
//etAccount.Text = "721343314@qq.com";
+ //etAccount.Text = "crabtreel12019@gmail.com";
+ etAccount.Text = "2791308028@qq.com";
#endif
accountView.AddChidren (etAccount);
@@ -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 ();
@@ -498,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) {
@@ -508,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);
////鑾峰彇褰撳墠浣忓畢缃戝叧鏂规
@@ -605,8 +623,8 @@
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