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/User/UserMiddle.cs |   54 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index 6299a4e..d3d72c7 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -26,7 +26,7 @@
 
         //public static Button LinkStatusTip = new Button () {
         //    Height = Application.GetRealHeight (36),
-        //    Width = Application.GetRealWidth (640),
+        //    Width = Application.GetRealWidth (Application.DesignWidth),
         //    BackgroundColor = SkinStyle.Current.LinkStatusTipColor
         //};
 
@@ -34,33 +34,33 @@
             IsShowPoint = false,
         };
         public static FrameLayout FavoriteBodyView = new FrameLayout () {
-            Width = Application.GetRealWidth (640),
-            Height = Application.GetRealHeight (1136)
+            //Width = Application.GetRealWidth (Application.DesignWidth),
+            //Height = Application.GetRealHeight (Application.DesignHeight)
         };
         public static UserRoom FavoriteRoom = new UserRoom () {
-            Width = Application.GetRealWidth (640),
-            Height = Application.GetRealHeight (1136 - 90)
+            //Width = Application.GetRealWidth (Application.DesignWidth),
+            Height = Application.GetRealHeight (Application.DesignHeight - userMenuItemHeight)
         };
 
         public static PageLayout DevicePageView = new PageLayout () {
             IsShowPoint = false,
         };
         public static FrameLayout DeviceBodyView = new FrameLayout () {
-            Width = Application.GetRealWidth (640),
-            Height = Application.GetRealHeight (1136)
+            //Width = Application.GetRealWidth (Application.DesignWidth),
+            Height = Application.GetRealHeight (Application.DesignHeight)
         };
         public static VerticalScrolViewLayout DeviceView = new VerticalScrolViewLayout () {
             Y = Application.GetRealHeight (126),
-            Width = Application.GetRealWidth (640),
-            Height = Application.GetRealHeight (1136 - 126 - 90),
+            //Width = Application.GetRealWidth (Application.DesignWidth),
+            Height = Application.GetRealHeight (Application.DesignHeight - 126 - userMenuItemHeight),
         };
 
         public static PageLayout RoomPageView = new PageLayout () {
             IsShowPoint = false,
         };
         public static FrameLayout RoomBodyView = new FrameLayout () {
-            Width = Application.GetRealWidth (640),
-            Height = Application.GetRealHeight (1136)
+            Width = Application.GetRealWidth (Application.DesignWidth),
+            Height = Application.GetRealHeight (Application.DesignHeight)
         };
 
         public static PageLayout SettingPageView = new PageLayout () {
@@ -68,18 +68,18 @@
         };
         public static FrameLayout SettingBodyView = new FrameLayout () {
             BackgroundColor = SkinStyle.Current.MainColor,
-            Height = Application.GetRealHeight (1136)
+            Height = Application.GetRealHeight (Application.DesignHeight)
         };
         public static VerticalScrolViewLayout SettingView = new VerticalScrolViewLayout () {
             Y = Application.GetRealHeight (126),
-            Width = Application.GetRealWidth (640),
-            Height = Application.GetRealHeight (1136 - 126 - 90 - 90),
+            Width = Application.GetRealWidth (Application.DesignWidth),
+            Height = Application.GetRealHeight (Application.DesignHeight - 126 - userMenuItemHeight - 90),
             BackgroundColor = SkinStyle.Current.ViewColor,
             //ScrollEnabled = true
         };
         public static Button btnVersion = new Button () {
-            Y = Application.GetRealHeight (1136 - 90 - 90),
-            Width = Application.GetRealWidth (640),
+            Y = Application.GetRealHeight (Application.DesignHeight - userMenuItemHeight - 90),
+            Width = Application.GetRealWidth (Application.DesignWidth),
             Height = Application.GetRealHeight (90),
             Text = Language.StringByID (R.MyInternationalizationString.Version) + " : " + MainPage.RequestVersion,
             TextColor = SkinStyle.Current.TextColor1,
@@ -88,8 +88,8 @@
         };
 
         public static FrameLayout UserMenuItem = new FrameLayout () {
-            Y = Application.GetRealHeight (Application.DesignHeight - 90),
-            Height = Application.GetRealHeight (95),
+            Y = Application.GetRealHeight (Application.DesignHeight - userMenuItemHeight),
+            Height = Application.GetMinRealAverage (userMenuItemHeight+5),
             BackgroundColor = SkinStyle.Current.MainColor
         };
 
@@ -102,8 +102,8 @@
 
         public static Button btnLinkStatus = new Button () {
             Y = Application.GetRealHeight (10),
-            Width = Application.GetRealWidth (131),
-            Height = Application.GetRealHeight (80),
+            Width = Application.GetMinRealAverage (131),
+            Height = Application.GetMinRealAverage (80),
             UnSelectedImagePath = MainPage.WiFiStatus,
         };
 
@@ -269,9 +269,11 @@
                                     //2020-01-14 鐧诲綍鎴愬姛鍚庯紝鍒锋柊涓�娆″綋鍓嶄綇瀹呯綉鍏�
                                     GetNowHomeGatewayAfterLoginSuccess ();
                                 } else if (!string.IsNullOrEmpty (revertObj.StateCode)) {
-                                    MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30);
-                                    MainPage.LoginUser.SaveUserInfo ();
-                                    new AccountLogin ().Show ();
+                                    if (revertObj.StateCode != ErrorCode.NetworkError && revertObj.StateCode != "Data Exception") {
+                                        MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30);
+                                        MainPage.LoginUser.SaveUserInfo ();
+                                        new AccountLogin ().Show ();
+                                    }
                                 }
                             });
                         }
@@ -359,8 +361,8 @@
             //IO.FileUtils.SaveEquipmentMessage (mCurtainModel1, mCurtainModel1.LoopID.ToString ());
             ////var mCurtainModel2 = new CurtainModel () { LoopID = 2, DeviceID = 9, SubnetID = 42, Name = "绐楀笜2" };
             ////IO.FileUtils.SaveEquipmentMessage (mCurtainModel2, mCurtainModel2.LoopID.ToString ());
-            ////var mCurtainModel3 = new CurtainModel () { LoopID = 1, DeviceID = 2, SubnetID = 42, Name = "绐楀笜3" };
-            ////IO.FileUtils.SaveEquipmentMessage (mCurtainModel3, mCurtainModel3.LoopID.ToString ());
+            //var mCurtainModel3 = new CurtainModel () { LoopID = 1, DeviceID = 2, SubnetID = 42, Name = "绐楀笜3" };
+            //IO.FileUtils.SaveEquipmentMessage (mCurtainModel3, mCurtainModel3.LoopID.ToString ());
 
             //var mCurtainRoller = new CurtainRoller () { LoopID = 1, DeviceID = 88, SubnetID = 42, Name = "绐楀笜CurtainRoller" };
             //IO.FileUtils.SaveEquipmentMessage (mCurtainRoller, mCurtainRoller.LoopID.ToString ());
@@ -369,7 +371,7 @@
             //IO.FileUtils.SaveEquipmentMessage (mCurtainTrietex, mCurtainTrietex.LoopID.ToString ());
 
 
-            
+
 
             //var s1 = new LightEnergySocket () { LoopID = 1, DeviceID = 1, SubnetID = 44, Name = "EnergySocket" };
             //IO.FileUtils.SaveEquipmentMessage (s1, s1.LoopID.ToString ());

--
Gitblit v1.8.0