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/CurtainAutoOpenDirectionForm.cs | 51 +++++++++------------------------------------------
1 files changed, 9 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs
index 2751f57..17285b3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// Zigbee鏅鸿兘寮�鍚堝笜鐢垫満鐨勬坊鍔犳楠ょ晫闈�
/// </summary>
- public class CurtainAutoOpenDirectionForm : EditorCommonForm
+ public class CurtainAutoOpenDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,13 +28,10 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
- framePic.Width = Application.GetMinRealAverage(873);
- framePic.Height = Application.GetMinRealAverage(665);
+ framePic.Width = this.GetPictrueRealSize(873);
+ framePic.Height = this.GetPictrueRealSize(665);
framePic.Gravity = Gravity.CenterHorizontal;
framePic.Y = Application.GetRealHeight(144);
bodyFrameLayout.AddChidren(framePic);
@@ -43,9 +40,9 @@
framePic.AddChidren(btnPic);
//缁胯壊鎸囩ず鐏紦鎱㈤棯鐑�
- var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(449), Application.GetMinRealAverage(45), false);
- btnGreanLinght.X = Application.GetMinRealAverage(420);
- btnGreanLinght.Y = Application.GetMinRealAverage(343);
+ var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(449), this.GetPictrueRealSize(45), false);
+ btnGreanLinght.X = this.GetPictrueRealSize(420);
+ btnGreanLinght.Y = this.GetPictrueRealSize(343);
btnGreanLinght.TextAlignment = TextAlignment.Center;
btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
btnGreanLinght.TextSize = 9;
@@ -58,9 +55,9 @@
{
textMsg = string.Format(textMsg, "5");
}
- var btnSecond = new NormalViewControl(Application.GetMinRealAverage(400), Application.GetMinRealAverage(45), false);
- btnSecond.X = Application.GetMinRealAverage(478);
- btnSecond.Y = Application.GetMinRealAverage(568);
+ var btnSecond = new NormalViewControl(this.GetPictrueRealSize(400), this.GetPictrueRealSize(45), false);
+ btnSecond.X = this.GetPictrueRealSize(478);
+ btnSecond.Y = this.GetPictrueRealSize(568);
btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;
btnSecond.TextSize = 9;
btnSecond.Text = textMsg;
@@ -95,36 +92,6 @@
msg3.TextColor = UserCenterColor.Current.TextGrayColor3;
msg3.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg3);
- //鏌ョ湅甯姪
- 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