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/AirSwitchCloudContrDirectionForm.cs | 64 +++++++------------------------
1 files changed, 15 insertions(+), 49 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs
index ba4dff8..eaf94e5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 绌烘皵寮�鍏崇殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class AirSwitchCloudContrDirectionForm : EditorCommonForm
+ public class AirSwitchCloudContrDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,13 +28,10 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
- framePic.Width = Application.GetMinRealAverage(858);
- framePic.Height = Application.GetMinRealAverage(850);
+ framePic.Width = this.GetPictrueRealSize(858);
+ framePic.Height = this.GetPictrueRealSize(850);
framePic.Gravity = Gravity.CenterHorizontal;
framePic.Y = Application.GetRealHeight(58);
bodyFrameLayout.AddChidren(framePic);
@@ -43,36 +40,36 @@
framePic.AddChidren(btnPic);
//鎸囩ず鐏�
- var btnLinght = new NormalViewControl(Application.GetMinRealAverage(100), Application.GetMinRealAverage(40), false);
- btnLinght.X = Application.GetMinRealAverage(487);
- btnLinght.Y = Application.GetMinRealAverage(202);
+ var btnLinght = new NormalViewControl(this.GetPictrueRealSize(100), this.GetPictrueRealSize(40), false);
+ btnLinght.X = this.GetPictrueRealSize(487);
+ btnLinght.Y = this.GetPictrueRealSize(202);
btnLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
btnLinght.TextSize = 8.45f;
btnLinght.TextID = R.MyInternationalizationString.uPilotLamp;
framePic.AddChidren(btnLinght);
//宸ヤ綔
- var btnWork = new NormalViewControl(Application.GetMinRealAverage(60), Application.GetMinRealAverage(40), false);
- btnWork.X = Application.GetMinRealAverage(628);
- btnWork.Y = Application.GetMinRealAverage(113);
+ var btnWork = new NormalViewControl(this.GetPictrueRealSize(70), this.GetPictrueRealSize(40), false);
+ btnWork.X = this.GetPictrueRealSize(628);
+ btnWork.Y = this.GetPictrueRealSize(113);
btnWork.TextColor = UserCenterColor.Current.TextGrayColor3;
btnWork.TextSize = 8.45f;
btnWork.TextID = R.MyInternationalizationString.uWork;
framePic.AddChidren(btnWork);
//閰嶅
- var btnPair = new NormalViewControl(Application.GetMinRealAverage(60), Application.GetMinRealAverage(40), false);
- btnPair.X = Application.GetMinRealAverage(628);
- btnPair.Y = Application.GetMinRealAverage(217);
+ var btnPair = new NormalViewControl(this.GetPictrueRealSize(70), this.GetPictrueRealSize(40), false);
+ btnPair.X = this.GetPictrueRealSize(628);
+ btnPair.Y = this.GetPictrueRealSize(217);
btnPair.TextColor = UserCenterColor.Current.TextGrayColor3;
btnPair.TextSize = 8.45f;
btnPair.TextID = R.MyInternationalizationString.uPair;
framePic.AddChidren(btnPair);
//绾㈣壊鎸囩ず鐏棯鐑�
- var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(455), Application.GetMinRealAverage(45), false);
- btnGreanLinght.X = Application.GetMinRealAverage(397);
- btnGreanLinght.Y = Application.GetMinRealAverage(295);
+ var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(455), this.GetPictrueRealSize(45), false);
+ btnGreanLinght.X = this.GetPictrueRealSize(397);
+ btnGreanLinght.Y = this.GetPictrueRealSize(295);
btnGreanLinght.TextAlignment = TextAlignment.Center;
btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
btnGreanLinght.TextSize = 10;
@@ -108,37 +105,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