From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs
index d49c5b9..30231b7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFangyueEnvironmentDirectionForm.cs
@@ -46,7 +46,7 @@
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);
//鎸変綇姝ゆ寜閿�
@@ -55,12 +55,13 @@
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)鎸夐敭锛屾墍鏈夋寜閿�
- //鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
- string[] msgArry = Language.StringByID(R.MyInternationalizationString.uAddFangyueEnvironmentPanelMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+ //鎸変綇闈㈡澘鍔熻兘鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑�
+ //杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄
+ //鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
+ string[] msgArry = Language.StringByID(R.MyInternationalizationString.AddFreshAirPanelMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
msg1.Y = Application.GetRealHeight(1037);
@@ -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