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/AccountView.cs |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs
index c4b8c7a..7384b09 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs
@@ -60,7 +60,7 @@
             Button btnUserIcon = new Button () {
                 X = Application.GetRealWidth (27),
                 Width = Application.GetRealWidth (96),
-                Height = Application.GetRealHeight (96),
+                Height = Application.GetRealWidth (96),
                 Gravity = Gravity.CenterVertical,
                 Radius = 5,
                 BorderColor = SkinStyle.Current.Transparent,
@@ -270,7 +270,13 @@
                             var webPush = new WebServicePush ();
                             webPush.DeleteToken_Push (UserConfig.Instance.tokenID);
                         });
-                        CommonPage.IsRemote = false;
+                        //2020-02-17 閫�鍑虹櫥褰曪紝鏂紑杩滅▼杩炴帴
+                        if (CommonPage.IsRemote) {
+                            Utlis.ShowAppLinkStatus (AppLinkStatus.WiFiOffline);
+                            CommonPage.IsRemote = false;
+                            SmartHome.MqttCommon.DisConnectRemoteMqttClient ("Logout");
+                        }
+                        //CommonPage.IsRemote = false;
                     };
 
                     btnNo.MouseUpEventHandler += (sdd, ff) => {
@@ -284,7 +290,13 @@
                             var webPush = new WebServicePush ();
                             webPush.DeleteToken_Push (UserConfig.Instance.tokenID);
                         });
-                        CommonPage.IsRemote = false;
+                        //CommonPage.IsRemote = false;
+                        //2020-02-17 閫�鍑虹櫥褰曪紝鏂紑杩滅▼杩炴帴
+                        if (CommonPage.IsRemote) {
+                            Utlis.ShowAppLinkStatus (AppLinkStatus.WiFiOffline);
+                            CommonPage.IsRemote = false;
+                            SmartHome.MqttCommon.DisConnectRemoteMqttClient ("Logout");
+                        }
                     };
 
                     alertDialog.Show ();

--
Gitblit v1.8.0