From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 16:32:35 +0800
Subject: [PATCH] 上传合并后的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
index b2414b7..b721d1b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
@@ -82,8 +82,8 @@
 
             //鍥炬爣
             var picGwImage = new FrameLayout();
-            picGwImage.Width = Application.GetMinRealAverage(861);
-            picGwImage.Height = Application.GetMinRealAverage(245);
+            picGwImage.Width = this.GetPictrueRealSize(861);
+            picGwImage.Height = this.GetPictrueRealSize(245);
             picGwImage.Y = Application.GetRealWidth(223);
             picGwImage.Gravity = Gravity.CenterHorizontal;
             picGwImage.BackgroundImagePath = "Gateway/WirelessApGatewaySearching.png";
@@ -91,7 +91,7 @@
             var btnFailIcon = new PicViewControl(66, 66);
             btnFailIcon.UnSelectedImagePath = "Item/FailIcon.png";
             btnFailIcon.Gravity = Gravity.CenterHorizontal;
-            btnFailIcon.Y = Application.GetMinRealAverage(110);
+            btnFailIcon.Y = this.GetPictrueRealSize(110);
             picGwImage.AddChidren(btnFailIcon);
             //鎼滅储澶辫触
             var btnFailView = new NormalViewControl(300, 60, true);
@@ -144,7 +144,7 @@
             bodyFrameLayout.AddChidren(btnMsg5);
 
             //閲嶈瘯
-            var frameback = new FrameLayoutControl();
+            var frameback = new FrameLayoutStatuControl();
             frameback.UseClickStatu = false;
             frameback.Y = Application.GetRealHeight(1259);
             frameback.Gravity = Gravity.CenterHorizontal;
@@ -196,8 +196,8 @@
         {
             //鍥炬爣
             var btnGwImage = new FrameLayout();
-            btnGwImage.Width = Application.GetMinRealAverage(861);
-            btnGwImage.Height = Application.GetMinRealAverage(245);
+            btnGwImage.Width = this.GetPictrueRealSize(861);
+            btnGwImage.Height = this.GetPictrueRealSize(245);
             btnGwImage.Y = Application.GetRealHeight(360);
             btnGwImage.Gravity = Gravity.CenterHorizontal;
             btnGwImage.BackgroundImagePath = "Gateway/WirelessApGatewaySearching.png";
@@ -212,11 +212,11 @@
             bodyFrameLayout.AddChidren(btnMsg);
 
             //棣栨牸鐨刋杞�
-            int firstPoint = Application.GetMinRealAverage(275);
+            int firstPoint = this.GetPictrueRealSize(275);
             //涓�鏍肩殑瀹藉害
-            int width = Application.GetMinRealAverage(22);
+            int width = this.GetPictrueRealSize(22);
             //闂磋窛澶у皬
-            int space = Application.GetMinRealAverage(12);
+            int space = this.GetPictrueRealSize(12);
 
             //鐢熸垚鏍煎瓙鍧愭爣
             var listPoint = new List<int>();
@@ -229,7 +229,7 @@
             var btnRound = new PicViewControl(width, width, false);
             btnRound.Radius = (uint)width / 2;
             btnRound.BackgroundColor = UserCenterColor.Current.ConcetionRoundColor;
-            btnRound.Y = Application.GetMinRealAverage(135);
+            btnRound.Y = this.GetPictrueRealSize(135);
             btnRound.X = listPoint[0];
             btnGwImage.AddChidren(btnRound);
 

--
Gitblit v1.8.0