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/Device/Direction/SensorInfraredDirectionForm.cs |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs
index 9063711..2b3b497 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs
@@ -30,8 +30,8 @@
         {
             //鍥剧墖
             var framePic = new FrameLayout();
-            framePic.Width = Application.GetMinRealAverage(988);
-            framePic.Height = Application.GetMinRealAverage(775);
+            framePic.Width = this.GetPictrueRealSize(988);
+            framePic.Height = this.GetPictrueRealSize(775);
             framePic.Gravity = Gravity.CenterHorizontal;
             framePic.Y = Application.GetRealHeight(78);
             bodyFrameLayout.AddChidren(framePic);
@@ -40,9 +40,9 @@
             framePic.AddChidren(btnPic);
 
             //鎸囩ず鐏�
-            var btnLinght = new NormalViewControl(Application.GetMinRealAverage(200), Application.GetMinRealAverage(45), false);
-            btnLinght.X = Application.GetMinRealAverage(173);
-            btnLinght.Y = Application.GetMinRealAverage(266);
+            var btnLinght = new NormalViewControl(this.GetPictrueRealSize(200), this.GetPictrueRealSize(45), false);
+            btnLinght.X = this.GetPictrueRealSize(173);
+            btnLinght.Y = this.GetPictrueRealSize(266);
             btnLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnLinght.TextSize = 10;
             btnLinght.TextID = R.MyInternationalizationString.uPilotLamp;
@@ -54,9 +54,9 @@
             {
                 textMsg = string.Format(textMsg, "5");
             }
-            var btnSecond = new NormalViewControl(Application.GetMinRealAverage(550), Application.GetMinRealAverage(45), false);
-            btnSecond.X = Application.GetMinRealAverage(435);
-            btnSecond.Y = Application.GetMinRealAverage(120);
+            var btnSecond = new NormalViewControl(this.GetPictrueRealSize(550), this.GetPictrueRealSize(45), false);
+            btnSecond.X = this.GetPictrueRealSize(435);
+            btnSecond.Y = this.GetPictrueRealSize(120);
             btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnSecond.TextAlignment = TextAlignment.Center;
             btnSecond.TextSize = 10;
@@ -64,9 +64,9 @@
             framePic.AddChidren(btnSecond);
 
             //缁胯壊鎸囩ず鐏棯鐑�
-            var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(550), Application.GetMinRealAverage(45), false);
-            btnGreanLinght.X = Application.GetMinRealAverage(435);
-            btnGreanLinght.Y = Application.GetMinRealAverage(400);
+            var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(550), this.GetPictrueRealSize(45), false);
+            btnGreanLinght.X = this.GetPictrueRealSize(435);
+            btnGreanLinght.Y = this.GetPictrueRealSize(400);
             btnGreanLinght.TextAlignment = TextAlignment.Center;
             btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnGreanLinght.TextSize = 10;
@@ -74,9 +74,9 @@
             framePic.AddChidren(btnGreanLinght);
 
             //閫嗘椂閽堟嫥寮�鐢垫睜鍚庣洊
-            var btnBattery = new NormalViewControl(Application.GetMinRealAverage(550), Application.GetMinRealAverage(50), false);
-            btnBattery.X = Application.GetMinRealAverage(455);
-            btnBattery.Y = Application.GetMinRealAverage(622);
+            var btnBattery = new NormalViewControl(this.GetPictrueRealSize(550), this.GetPictrueRealSize(50), false);
+            btnBattery.X = this.GetPictrueRealSize(455);
+            btnBattery.Y = this.GetPictrueRealSize(622);
             btnBattery.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnBattery.TextSize = 12;
             btnBattery.TextID = R.MyInternationalizationString.uUnscrewTheBatteryAnticlockwise;

--
Gitblit v1.8.0