From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码

---
 ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
index 972c622..9b7b4dc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
@@ -126,7 +126,7 @@
                 {
 
                     Width = Application.GetRealWidth(450),
-                    Height = Application.GetRealHeight(780),
+                    Height = Application.GetRealWidth(780),
                     X = Application.GetRealWidth(1080 - 468 - 35),
                     Y = Application.GetRealHeight(184),
                     BackgroundImagePath = "Item/SelectFloor_Right.png",
@@ -166,8 +166,8 @@
 
                     var btnfoolricon = new Button
                     {
-                        Width = Application.GetMinRealAverage(81),
-                        Height = Application.GetMinRealAverage(81),
+                        Width = Application.GetRealWidth(81),
+                        Height = Application.GetRealWidth(81),
                         UnSelectedImagePath = "Floor/Floor.png",
                         Gravity = Gravity.CenterVertical,
                     };
@@ -312,8 +312,8 @@
 
                 var sceneIconBtn = new Button
                 {
-                    Width = Application.GetMinRealAverage(81),
-                    Height = Application.GetMinRealAverage(81),
+                    Width = Application.GetRealWidth(81),
+                    Height = Application.GetRealWidth(81),
                     X = Application.GetRealWidth(58),
                     Y = Application.GetRealHeight(55),
                     UnSelectedImagePath = "ZigeeLogic/scene.png",
@@ -343,8 +343,8 @@
 
                 var selectedBtn = new Button
                 {
-                    Width = Application.GetMinRealAverage(60),
-                    Height = Application.GetMinRealAverage(60),
+                    Width = Application.GetRealWidth(60),
+                    Height = Application.GetRealWidth(60),
                     X = Application.GetRealWidth(789),
                     UnSelectedImagePath = "ZigeeLogic/selected.png",
                     Visible = false,

--
Gitblit v1.8.0