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/Guide/GuideAddResidence.cs |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
index 2bda578..ebd897b 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
@@ -538,6 +538,26 @@
         }
 
         /// <summary>
+        /// 鍚姩鏈湴妯″紡
+        /// </summary>
+        void EnableLocalMode () {
+            MainPage.AddTip ("Enable local mode.");
+            Utlis.ShowAppLinkStatus (AppLinkStatus.WiFiOffline);
+            CommonPage.IsRemote = false;
+            SmartHome.MqttCommon.DisConnectRemoteMqttClient ("EnableLocalMode");
+        }
+
+        /// <summary>
+        /// 鍚姩杩滅▼妯″紡
+        /// </summary>
+        void EnableRemoteMode ()
+        {
+            MainPage.AddTip ("Restore remote mode.");
+            Utlis.ShowAppLinkStatus (AppLinkStatus.CloudUnlink);
+            CommonPage.IsRemote = true;
+        }
+
+        /// <summary>
         ///  璺宠浆缃戝叧鎼滅储椤甸潰
         /// </summary>
         /// <param name="home"></param>
@@ -545,9 +565,12 @@
             try {
                 //杩滅▼杩炴帴鐨勬椂鍊欑姝� 鎼滅储缃戝叧鍜屾坊鍔犺澶�
                 if (CommonPage.IsRemote) {
-                    //褰撳墠澶勪簬杩滅▼杩炴帴妯″紡锛屾棤娉曡繘鍏ユ悳绱㈢綉鍏抽〉闈€�傝鍏堝垏鎹㈠洖鏈湴杩炴帴妯″紡銆�
-                    new Alert ("", "Currently in remote connection mode, unable to enter the search gateway page. Please switch back to local connection mode first.", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
-                    return;
+                    ////褰撳墠澶勪簬杩滅▼杩炴帴妯″紡锛屾棤娉曡繘鍏ユ悳绱㈢綉鍏抽〉闈€�傝鍏堝垏鎹㈠洖鏈湴杩炴帴妯″紡銆�
+                    //new Alert ("", "Currently in remote connection mode, unable to enter the search gateway page. Please switch back to local connection mode first.", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+                    //return;
+
+                    //2020-06-29 鍚姩鏈湴閫氫俊妯″紡
+                    EnableLocalMode ();
                 }
 
 

--
Gitblit v1.8.0