From b0505adb3ea1ba3f1812ee1046499410c8ea57f5 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 16:09:46 +0800
Subject: [PATCH] 225552552525
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs
index 56fc6ad..80f3eee 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs
@@ -30,23 +30,22 @@
{
//鍥剧墖
var framePic = new FrameLayout();
- framePic.Width = this.GetPictrueRealSize(893);
- framePic.Height = this.GetPictrueRealSize(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(this.GetPictrueRealSize(475), this.GetPictrueRealSize(45), false);
- btnGreanLinght.X = this.GetPictrueRealSize(415);
- btnGreanLinght.Y = this.GetPictrueRealSize(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绉�
@@ -55,17 +54,16 @@
{
textMsg = string.Format(textMsg, "5");
}
- var btnSecond = new NormalViewControl(this.GetPictrueRealSize(360), this.GetPictrueRealSize(45), false);
- btnSecond.X = this.GetPictrueRealSize(573);
- btnSecond.Y = this.GetPictrueRealSize(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);
@@ -83,15 +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);
}
#endregion
--
Gitblit v1.8.0