From 3ee2d0d1a8ebe8f53fb3a1e31cc547e39645c335 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 23 七月 2020 16:23:43 +0800
Subject: [PATCH] 2020-07-23 1.移动网络也支持检测。 2.设置菜单页面，增加滑动效果，解决不显示Help按钮问题。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
index 72ab748..62fe530 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -75,7 +75,9 @@
TextColor = SkinStyle.Current.TextColor1,
//Text = account,
#if DEBUG
- Text = "18926269190@189.cn"
+ //Text = "crabtreel12019@gmail.com"
+ Text = "paanghal@gmail.com"
+
#endif
};
accountView.AddChidren (etAccount);
@@ -244,7 +246,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);
});
@@ -287,7 +289,8 @@
if (revertObj2.StateCode == "SUCCESS") {
var responseDataObj2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoRes>> (revertObj2.ResponseData.ToString ());
var revertRoomData = responseDataObj2;
- if (revertRoomData.Find ((obj) => obj.RegionID == UserConfig.Instance.CurrentRegion.RegionID) == null) {
+ //2020-04-10 澧炲姞鍒ょ┖澶勭悊
+ if (UserConfig.Instance.CurrentRegion == null || revertRoomData.Find ((obj) => obj.RegionID == UserConfig.Instance.CurrentRegion.RegionID) == null) {
UserConfig.Instance.CurrentRegion = revertRoomData [0];
UserConfig.Instance.GatewayMAC = revertRoomData [0].MAC;
IO.FileUtils.DeleteAllFile ();
--
Gitblit v1.8.0