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/PanelTwoButtonDirectionForm.cs |  113 +++++++++++++++++++-------------------------------------
 1 files changed, 38 insertions(+), 75 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs
index 12bf833..adb6ccf 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs
@@ -7,60 +7,53 @@
     /// <summary>
     /// 浜屾寜閿潰鏉跨殑娣诲姞姝ラ鐣岄潰
     /// </summary>
-    public class PanelTwoButtonDirectionForm : EditorCommonForm
+    public class PanelTwoButtonDirectionForm : DirectionCommonForm
     {
         #region 鈻� 鍒濆鍖朹____________________________
 
-        /// <summary>
-        /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
-        /// </summary>
-        public void ShowForm()
-        {
-            //璁剧疆澶撮儴淇℃伅
-            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));
-
-            //鍒濆鍖栦腑閮ㄤ俊鎭�
-            this.InitMiddleFrame();
-        }
-
-        /// <summary>
-        /// 鍒濆鍖栦腑閮ㄤ俊鎭�
-        /// </summary>
-        private void InitMiddleFrame()
+        /// <summary>
+        /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+        /// </summary>
+        public void ShowForm()
         {
-            //娓呯┖bodyFrame
-            this.ClearBodyFrame();
-
-            //鍥剧墖
-            var framePic = new FrameLayout();
-            framePic.Width = Application.GetMinRealAverage(835);
-            framePic.Height = Application.GetMinRealAverage(711);
-            framePic.Gravity = Gravity.CenterHorizontal;
-            framePic.Y = Application.GetRealHeight(144);
-            bodyFrameLayout.AddChidren(framePic);
-            var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);
-            btnPic.UnSelectedImagePath = "Instruct/PanelTwoButton.png";
+            //璁剧疆澶撮儴淇℃伅
+            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));
+
+            //鍒濆鍖栦腑閮ㄤ俊鎭�
+            this.InitMiddleFrame();
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+        /// </summary>
+        private void InitMiddleFrame()
+        {
+            //鍥剧墖
+            var framePic = new FrameLayout();
+            framePic.Width = this.GetPictrueRealSize(835);
+            framePic.Height = this.GetPictrueRealSize(711);
+            framePic.Gravity = Gravity.CenterHorizontal;
+            framePic.Y = Application.GetRealHeight(144);
+            bodyFrameLayout.AddChidren(framePic);
+            var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);
+            btnPic.UnSelectedImagePath = "Instruct/PanelTwoButton.png";
             framePic.AddChidren(btnPic);
 
             //鎸夐敭鑳屽厜鐏棯鐑�
-            var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(360), Application.GetMinRealAverage(45), false);
-            btnGreanLinght.X = Application.GetMinRealAverage(442);
-            btnGreanLinght.Y = Application.GetMinRealAverage(257);
+            var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(360), this.GetPictrueRealSize(45), false);
+            btnGreanLinght.X = this.GetPictrueRealSize(442);
+            btnGreanLinght.Y = this.GetPictrueRealSize(257);
             btnGreanLinght.TextAlignment = TextAlignment.Center;
             btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnGreanLinght.TextSize = 10;
             btnGreanLinght.TextID = R.MyInternationalizationString.uPanelBackLightLighting;
             framePic.AddChidren(btnGreanLinght);
 
-            //浠绘剰鎸夐敭闀挎寜5绉�
-            string textMsg = Language.StringByID(R.MyInternationalizationString.uLongClickEachPanelSomeSecond);
-            if (textMsg.Contains("{0}") == true)
-            {
-                textMsg = string.Format(textMsg, "5");
-            }
-            var btnSecond = new NormalViewControl(Application.GetMinRealAverage(400), Application.GetMinRealAverage(45), false);
-            btnSecond.X = Application.GetMinRealAverage(441);
-            btnSecond.Y = Application.GetMinRealAverage(583);
+            //闀挎寜姝ゆ寜閿�
+            string textMsg = Language.StringByID(R.MyInternationalizationString.uLongPressThisButton);
+            var btnSecond = new NormalViewControl(this.GetPictrueRealSize(400), this.GetPictrueRealSize(45), false);
+            btnSecond.X = this.GetPictrueRealSize(441);
+            btnSecond.Y = this.GetPictrueRealSize(526);
             btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnSecond.TextSize = 10;
             btnSecond.Text = textMsg;
@@ -73,8 +66,8 @@
             var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
             msg1.Y = Application.GetRealHeight(1037);
             msg1.Text = msgArry[0];
-            msg1.TextColor = UserCenterColor.Current.TextGrayColor3;
-            msg1.TextAlignment = TextAlignment.Center;
+            msg1.TextColor = UserCenterColor.Current.TextGrayColor3;
+            msg1.TextAlignment = TextAlignment.Center;
             bodyFrameLayout.AddChidren(msg1);
             var msg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
             msg2.Y = msg1.Bottom;
@@ -82,39 +75,9 @@
             {
                 msg2.Text = msgArry[1];
             }
-            msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
-            msg2.TextAlignment = TextAlignment.Center;
+            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