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/UserCenter/Device/Direction/PanelFangyueTwoButtonDirectionForm.cs |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueTwoButtonDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueTwoButtonDirectionForm.cs
index 838d5ea..c34dadd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueTwoButtonDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueTwoButtonDirectionForm.cs
@@ -30,8 +30,8 @@
         {
             //鍥剧墖
             var framePic = new FrameLayout();
-            framePic.Width = Application.GetMinRealAverage(835);
-            framePic.Height = Application.GetMinRealAverage(711);
+            framePic.Width = this.GetPictrueRealSize(835);
+            framePic.Height = this.GetPictrueRealSize(711);
             framePic.Gravity = Gravity.CenterHorizontal;
             framePic.Y = Application.GetRealHeight(115);
             bodyFrameLayout.AddChidren(framePic);
@@ -40,22 +40,22 @@
             framePic.AddChidren(btnPic);
 
             //鎸夐敭鎸囩ず鐏寒璧�
-            var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(455), Application.GetMinRealAverage(45), false);
-            btnGreanLinght.X = Application.GetMinRealAverage(374);
-            btnGreanLinght.Y = Application.GetMinRealAverage(258);
+            var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(455), this.GetPictrueRealSize(45), false);
+            btnGreanLinght.X = this.GetPictrueRealSize(374);
+            btnGreanLinght.Y = this.GetPictrueRealSize(258);
             btnGreanLinght.TextAlignment = TextAlignment.Center;
             btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnGreanLinght.TextSize = 10;
-            btnGreanLinght.TextID = R.MyInternationalizationString.uPanelBackLightLighting;
+            btnGreanLinght.TextID = R.MyInternationalizationString.uKeyIndicatorLightsUp;
             framePic.AddChidren(btnGreanLinght);
 
             //鎸変綇姝ゆ寜閿�
-            var btnPress = new NormalViewControl(Application.GetMinRealAverage(230), Application.GetMinRealAverage(45), false);
-            btnPress.X = Application.GetMinRealAverage(144);
-            btnPress.Y = Application.GetMinRealAverage(275);
+            var btnPress = new NormalViewControl(this.GetPictrueRealSize(230), this.GetPictrueRealSize(45), false);
+            btnPress.X = this.GetPictrueRealSize(144);
+            btnPress.Y = this.GetPictrueRealSize(279);
             btnPress.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnPress.TextSize = 10;
-            btnPress.TextID = R.MyInternationalizationString.uKeyIndicatorLightsUp;
+            btnPress.TextID = R.MyInternationalizationString.uPressAndHoldThisKey;
             framePic.AddChidren(btnPress);
 
             //鎸変綇闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿寚绀虹伅

--
Gitblit v1.8.0