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/PanelFangyueEnvironmentDirectionForm.cs | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs
index 0cda559..29a8dfa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs
@@ -30,8 +30,8 @@
{
//鍥剧墖
var framePic = new FrameLayout();
- framePic.Width = Application.GetMinRealAverage(835);
- framePic.Height = Application.GetMinRealAverage(708);
+ framePic.Width = this.GetPictrueRealSize(835);
+ framePic.Height = this.GetPictrueRealSize(708);
framePic.Gravity = Gravity.CenterHorizontal;
framePic.Y = Application.GetRealHeight(115);
bodyFrameLayout.AddChidren(framePic);
@@ -40,26 +40,27 @@
framePic.AddChidren(btnPic);
//鎸夐敭鎸囩ず鐏寒璧�
- var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(455), Application.GetMinRealAverage(45), false);
- btnGreanLinght.X = Application.GetMinRealAverage(374);
- btnGreanLinght.Y = Application.GetMinRealAverage(319);
+ var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(455), this.GetPictrueRealSize(45), false);
+ btnGreanLinght.X = this.GetPictrueRealSize(374);
+ btnGreanLinght.Y = this.GetPictrueRealSize(319);
btnGreanLinght.TextAlignment = TextAlignment.Center;
btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
btnGreanLinght.TextSize = 10;
- btnGreanLinght.TextID = R.MyInternationalizationString.uPanelBackLightLighting;
+ btnGreanLinght.TextID = R.MyInternationalizationString.uKeyIndicatorLightsUp;
framePic.AddChidren(btnGreanLinght);
//鎸変綇姝ゆ寜閿�
- var btnPress = new NormalViewControl(Application.GetMinRealAverage(230), Application.GetMinRealAverage(45), false);
- btnPress.X = Application.GetMinRealAverage(409);
- btnPress.Y = Application.GetMinRealAverage(584);
+ var btnPress = new NormalViewControl(this.GetPictrueRealSize(230), this.GetPictrueRealSize(45), false);
+ btnPress.X = this.GetPictrueRealSize(409);
+ btnPress.Y = this.GetPictrueRealSize(584);
btnPress.TextColor = UserCenterColor.Current.TextGrayColor3;
btnPress.TextSize = 10;
- btnPress.TextID = R.MyInternationalizationString.uKeyIndicatorLightsUp;
+ btnPress.TextID = R.MyInternationalizationString.uPressAndHoldThisKey;
framePic.AddChidren(btnPress);
- //鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿�
- //鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+ //鎸変綇闈㈡澘鍔熻兘鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑�
+ //杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄
+ //鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
string[] msgArry = Language.StringByID(R.MyInternationalizationString.uAddFangyueEnvironmentPanelMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
@@ -68,6 +69,7 @@
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;
if (msgArry.Length > 1)
@@ -77,6 +79,16 @@
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