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 |   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