From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs |   64 +++++++------------------------
 1 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs
index f121f5b..2b3b497 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorInfraredDirectionForm.cs
@@ -7,7 +7,7 @@
     /// <summary>
     /// 绾㈠浼犳劅鍣ㄧ殑娣诲姞姝ラ鐣岄潰
     /// </summary>
-    public class SensorInfraredDirectionForm : EditorCommonForm
+    public class SensorInfraredDirectionForm : DirectionCommonForm
     {
         #region 鈻� 鍒濆鍖朹____________________________
 
@@ -28,13 +28,10 @@
         /// </summary>
         private void InitMiddleFrame()
         {
-            //娓呯┖bodyFrame
-            this.ClearBodyFrame();
-
             //鍥剧墖
             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);
@@ -43,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;
@@ -57,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;
@@ -67,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;
@@ -77,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;
@@ -104,37 +101,6 @@
             msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
             msg2.TextAlignment = TextAlignment.Center;
             bodyFrameLayout.AddChidren(msg2);
-
-            //鏌ョ湅甯姪
-            var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
-            btnHelp.Y = Application.GetRealHeight(1388);
-            btnHelp.TextSize = 12;
-            btnHelp.TextAlignment = TextAlignment.Center;
-            btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
-            btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
-            btnHelp.ButtonClickEvent += (sender, e) =>
-            {
-                var form = new DeviceDirectionHelpForm();
-                form.AddForm(string.Empty);
-            };
-            bodyFrameLayout.AddChidren(btnHelp);
-            //搴曠嚎
-            int lineWidth = btnHelp.GetRealWidthByText(12);
-            var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
-            btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
-            btnLine.Gravity = Gravity.CenterHorizontal;
-            btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
-            bodyFrameLayout.AddChidren(btnLine);
-
-            //涓嬩竴姝�
-            var btnNext = new BottomClickButton();
-            btnNext.TextID = R.MyInternationalizationString.uNextway;
-            bodyFrameLayout.AddChidren(btnNext);
-            btnNext.ButtonClickEvent += (sender, e) =>
-            {
-                var form = new Device.DeviceSearchForm();
-                form.AddForm(this.FormID);
-            };
         }
 
         #endregion

--
Gitblit v1.8.0