From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySelectNetworkForm.cs | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySelectNetworkForm.cs
index 8b40176..96be439 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySelectNetworkForm.cs
@@ -39,12 +39,12 @@
frameBack.BackgroundColor = UserCenterColor.Current.White;
bodyFrameLayout.AddChidren(frameBack);
- //璇烽�夋嫨缃戠粶
+ //璇疯緭鍏IFI鍜屽瘑鐮�
var btnTitle = new NormalViewControl(600, 64, true);
btnTitle.X = ControlCommonResourse.XXLeft;
- btnTitle.Y = Application.GetRealHeight(30);
+ btnTitle.Y = Application.GetRealHeight(32);
btnTitle.TextSize = 15;
- btnTitle.TextID = R.MyInternationalizationString.uPleaseSelectNetwork;
+ btnTitle.TextID = R.MyInternationalizationString.uPleaseInputWifiAndPassword;
frameBack.AddChidren(btnTitle);
//WIFI
@@ -90,6 +90,31 @@
btnMsg.TextColor = UserCenterColor.Current.ErrorColor;
bodyFrameLayout.AddChidren(btnMsg);
+ //鍙戦�佸眬鍩熺綉璐﹀彿銆佸瘑鐮�
+ var btnMsgTitle = new NormalViewControl(500, 60, true);
+ btnMsgTitle.TextID = R.MyInternationalizationString.uSendLanAccountAndPassword;
+ btnMsgTitle.X = ControlCommonResourse.XXLeft;
+ btnMsgTitle.Y = frameBack.Bottom + Application.GetRealHeight(369);
+ btnMsgTitle.IsBold = true;
+ bodyFrameLayout.AddChidren(btnMsgTitle);
+
+ //1.濉啓璺敱鍣ㄧ殑璐﹀彿鍜屽瘑鐮�
+ //2.鐐瑰嚮涓嬩竴姝ワ紝灏嗚矾鐢卞櫒璐﹀彿鍜屽瘑鐮佸彂閫佽嚦缃戝叧
+ //3.缃戝叧鎺ユ敹鎴愬姛锛岀櫧鍏夐棯鐑�
+ string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddMiniGatewayMsg2).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+ int yy = btnMsgTitle.Bottom + Application.GetRealHeight(23);
+ foreach (var msg in ArryMsg)
+ {
+ var btnTip = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+ btnTip.Text = msg;
+ btnTip.Y = yy;
+ btnTip.X = btnMsgTitle.X;
+ btnTip.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnTip.TextSize = 12;
+ bodyFrameLayout.AddChidren(btnTip);
+ yy = btnTip.Bottom;
+ }
+
//鏌ョ湅甯姪
var btnHelp = this.AddHelpControl();
btnHelp.ButtonClickEvent += (sender, e) =>
--
Gitblit v1.8.0