From 15c5215e0a16207baace58b81f406acfd84b4de5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 28 八月 2020 16:00:26 +0800
Subject: [PATCH] V2.508281-beta 2020-08-28 1.搜索设备时，如果红外空调备注为空时，默认”AC“+回路号命名。 2.添加场景时，卷帘和开合帘提交改为百分比进度参数。 3.增加房间页面，长按设备名字，弹出修改备注。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
index 47e3832..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 = "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 ();
--
Gitblit v1.8.0