From a9ce331dccd25eee1d0b9193f7853c6e4a07b792 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 14 四月 2020 15:43:57 +0800
Subject: [PATCH] 2020-04-14 1.去掉登录之前ping域名检测，解决客户反馈登录失败的问题 2.替换新的控件库，去掉高德地图。 3.修复创建不了住宅问题。 4.修复增加登陆获取住宅列表时当前住宅判空处理。 5.去掉温度按钮自定义字体。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs | 7 ++++---
1 files changed, 4 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..782834f 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -75,7 +75,7 @@
TextColor = SkinStyle.Current.TextColor1,
//Text = account,
#if DEBUG
- Text = "18926269190@189.cn"
+ Text = "crabtreel12019@gmail.com"
#endif
};
accountView.AddChidren (etAccount);
@@ -244,7 +244,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 +287,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