From dfa6733793434bdcfd394f978ae72f1628b2260f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 22 四月 2020 16:50:03 +0800
Subject: [PATCH] 合并代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs |   72 ++++++++++++++++++++++++------------
 1 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
old mode 100755
new mode 100644
index 72394ac..52eb782
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
@@ -75,20 +75,20 @@
             {
                 RemoveFromParent();
             };
-            this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 200 - 58);
+            this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 300);
             this.btnBack.MouseUpEventHandler += eHandlerBack;
             this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
             this.MidFrameLayout(this);
 
             var btnAddFrameLayout = new FrameLayout
             {
-                X = Application.GetRealWidth(830),
+                X = Application.GetRealWidth(619),
             };
             this.titleFrameLayout.AddChidren(btnAddFrameLayout);
 
             btnFloorText = new Button
             {
-                Width = Application.GetRealWidth(110),
+                Width = Application.GetRealWidth(300 - 69 - 58),
                 X = Application.GetRealWidth(15),
                 Text = Language.StringByID(R.MyInternationalizationString.FirstFloor),
                 TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
@@ -98,26 +98,36 @@
             };
             btnAddFrameLayout.AddChidren(btnFloorText);
 
+            var btnBindDownFrameLayout = new FrameLayout
+            {
+                Width = Application.GetMinReal(69 + 58),
+                X = Application.GetRealWidth(300 - 69 - 58),
+            };
+            btnAddFrameLayout.AddChidren(btnBindDownFrameLayout);
+
             var btnBindDown = new Button
             {
                 Height = Application.GetMinReal(69),
                 Width = Application.GetMinReal(69),
-                X = Application.GetRealWidth(200 - 77),
                 UnSelectedImagePath = "BindPic/BindDown.png",
                 Gravity = Gravity.CenterVertical,
             };
-            btnAddFrameLayout.AddChidren(btnBindDown);
-            btnBindDown.MouseDownEventHandler += (sender, e) =>
+            btnBindDownFrameLayout.AddChidren(btnBindDown);
+
+            EventHandler<MouseEventArgs> eHandlerBindDown = (sender, e) =>
             {
                 SideslipFramelayout();
             };
+            btnBindDown.MouseDownEventHandler += eHandlerBindDown;
+            btnBindDownFrameLayout.MouseDownEventHandler += eHandlerBindDown;
+
             if (Common.Config.Instance.Home.FloorDics.Count == 0)
             {
                 btnAddFrameLayout.Width = 0;
             }
             else
             {
-                btnAddFrameLayout.Width = Application.GetRealWidth(200);
+                btnAddFrameLayout.Width = Application.GetRealWidth(300);
             }
             MidFrameLayoutContent(btnFloorText);
         }
@@ -362,18 +372,7 @@
 
                         var dev = new AddedDeviceBindResponseAllData();
                         dev = await currentKey.AddDeviceBindAsync(addBindeDev);
-                        if (dev.addedDeviceBindResponseData == null)
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                CommonPage.Loading.Hide();
-                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
-                            });
-                            btnFinifh.Enable = true;
-                            btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                            return;
-                        }
-                        else
+                        if (dev != null && dev.addedDeviceBindResponseData != null)
                         {
                             if (dev.addedDeviceBindResponseData.Result == 0)
                             {
@@ -433,6 +432,17 @@
                                 btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                 return;
                             }
+                        }
+                        else
+                        {
+                            Application.RunOnMainThread(() =>
+                            {
+                                CommonPage.Loading.Hide();
+                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+                            });
+                            btnFinifh.Enable = true;
+                            btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                            return;
                         }
                     }
                 }
@@ -761,7 +771,6 @@
 
             var sidelipFrameLayout = new FrameLayout()
             {
-                Height = Application.GetMinReal(783),
                 Width = Application.GetMinReal(449),
                 Y = Application.GetRealHeight(161),
                 X = Application.GetRealWidth(596),
@@ -786,17 +795,19 @@
             var sidelipVerticalScrolViewLayout = new VerticalScrolViewLayout()
             {
                 Height = Application.GetRealHeight(600),
-                Y = btnSelectFloor.Bottom,
+                Y = btnSelectFloor.Bottom + Application.GetRealHeight(45),
             };
             sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);
 
             Button oldbutton = null;
             Button oldbuttonText = null;
+            int count = 0;
             foreach (var floorId in dicFloor.Keys)
             {
+                count++;
                 var rowFrameLayout = new RowLayout()
                 {
-                    Height = Application.GetRealHeight(150),
+                    Height = Application.GetRealHeight(152),
                     LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
                     X = Application.GetRealWidth(81),
                 };
@@ -806,7 +817,7 @@
                 {
                     Width = Application.GetMinReal(81),
                     Height = Application.GetMinReal(81),
-                    Y = Application.GetRealHeight(55),
+                    Gravity = Gravity.CenterVertical,
                     UnSelectedImagePath = "Floor/Floor.png",
                     SelectedImagePath = "Floor/FloorSelected.png",
                 };
@@ -817,7 +828,7 @@
                     Width = Application.GetRealWidth(311),
                     Height = Application.GetRealHeight(58),
                     X = Application.GetRealWidth(92),
-                    Y = Application.GetRealHeight(69),
+                    Gravity = Gravity.CenterVertical,
                     TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                     TextSize = 14,
                     TextAlignment = TextAlignment.CenterLeft,
@@ -898,6 +909,19 @@
                 rowFrameLayout.MouseUpEventHandler += hander;
                 btnMethodText.MouseUpEventHandler += hander;
             }
+
+            if (count == 0)
+            {
+                sidelipFrameLayout.Height = 0;
+            }
+            else if (count <= 4 && count > 0)
+            {
+                sidelipFrameLayout.Height = Application.GetRealHeight(180) + count * Application.GetRealHeight(150);
+            }
+            else
+            {
+                sidelipFrameLayout.Height = Application.GetMinReal(780);
+            }
         }
 
         /// <summary>

--
Gitblit v1.8.0