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/AirConditionerZbGatewayDirectionForm.cs | 71 ++++++-----------------------------
1 files changed, 13 insertions(+), 58 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs
index 4392984..80f3eee 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 绌鸿皟鐨勬坊鍔犳楠ょ晫闈�
/// </summary>
- public class AirConditionerZbGatewayDirectionForm : EditorCommonForm
+ public class AirConditionerZbGatewayDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,28 +28,24 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
- framePic.Width = Application.GetMinRealAverage(893);
- framePic.Height = Application.GetMinRealAverage(852);
+ framePic.Width = this.GetPictrueRealSize(842);
+ framePic.Height = this.GetPictrueRealSize(764);
framePic.Gravity = Gravity.CenterHorizontal;
- framePic.Y = Application.GetRealHeight(75);
+ framePic.Y = Application.GetRealHeight(78);
bodyFrameLayout.AddChidren(framePic);
var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);
btnPic.UnSelectedImagePath = "Instruct/AirConditionerZbGateway.png";
framePic.AddChidren(btnPic);
- //缁胯壊鎸囩ず鐏棯鐑�
- var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(475), Application.GetMinRealAverage(45), false);
- btnGreanLinght.X = Application.GetMinRealAverage(415);
- btnGreanLinght.Y = Application.GetMinRealAverage(272);
+ //DATA缁胯壊鎸囩ず鐏棯鐑�
+ var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(512), this.GetPictrueRealSize(45), false);
+ btnGreanLinght.Y = this.GetPictrueRealSize(352);
btnGreanLinght.TextAlignment = TextAlignment.Center;
btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
btnGreanLinght.TextSize = 10;
- btnGreanLinght.TextID = R.MyInternationalizationString.uGreanPilotLampLinght;
+ btnGreanLinght.TextID = R.MyInternationalizationString.uDataGreanPilotLampLinght;
framePic.AddChidren(btnGreanLinght);
//闀挎寜5绉�
@@ -58,17 +54,16 @@
{
textMsg = string.Format(textMsg, "5");
}
- var btnSecond = new NormalViewControl(Application.GetMinRealAverage(360), Application.GetMinRealAverage(45), false);
- btnSecond.X = Application.GetMinRealAverage(573);
- btnSecond.Y = Application.GetMinRealAverage(718);
+ var btnSecond = new NormalViewControl(this.GetPictrueRealSize(167), this.GetPictrueRealSize(45), false);
+ btnSecond.Y = this.GetPictrueRealSize(629);
btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;
btnSecond.TextSize = 10;
btnSecond.Text = textMsg;
+ btnSecond.TextAlignment = TextAlignment.Center;
framePic.AddChidren(btnSecond);
- //闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏�
- //鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵��
- //缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
+ //闀挎寜缂栫▼鎸夐敭5绉�,DATA缁胯壊LED闂儊,
+ //棰戠巼涓轰寒0.5绉�,鐏�0.5绉�
string[] msgArry = Language.StringByID(R.MyInternationalizationString.uAddAirConditionerZbGatewayMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
@@ -86,46 +81,6 @@
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg2);
- var msg3 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
- msg3.Y = msg2.Bottom;
- if (msgArry.Length > 2)
- {
- msg3.Text = msgArry[2];
- }
- 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