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/Gateway/Add/WirelessApSelectNetworkForm.cs | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
index 7363c66..f133843 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
@@ -36,12 +36,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.TextSize = 15;
- btnTitle.TextID = R.MyInternationalizationString.uPleaseSelectNetwork;
+ btnTitle.TextID = R.MyInternationalizationString.uPleaseInputWifiAndPassword;
frameBack.AddChidren(btnTitle);
//WIFI
@@ -87,6 +87,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.缃戝叧鎺ユ敹鎴愬姛,绯荤粺鎸囩ず鐏疭YS闂儊
+ string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddWirelessApGatewayMsg2).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) =>
@@ -125,7 +150,7 @@
}
this.CloseForm();
- var form = new MiniGatewayDirection3Form();
+ var form = new WirelessApDirection3Form();
form.AddForm();
};
}
--
Gitblit v1.8.0