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 | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySelectNetworkForm.cs
index df2c6fd..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 = HdlControlResourse.XXLeft;
- btnTitle.Y = Application.GetRealHeight(30);
+ btnTitle.X = ControlCommonResourse.XXLeft;
+ btnTitle.Y = Application.GetRealHeight(32);
btnTitle.TextSize = 15;
- btnTitle.TextID = R.MyInternationalizationString.uPleaseSelectNetwork;
+ btnTitle.TextID = R.MyInternationalizationString.uPleaseInputWifiAndPassword;
frameBack.AddChidren(btnTitle);
//WIFI
@@ -83,12 +83,37 @@
};
var btnMsg = new NormalViewControl(rowPsw.txtInput.Width, false);
- btnMsg.X = HdlControlResourse.XXLeft;
+ btnMsg.X = ControlCommonResourse.XXLeft;
btnMsg.Y = frameBack.Bottom + Application.GetRealHeight(23);
btnMsg.TextSize = 12;
btnMsg.Height = Application.GetRealHeight(40);
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();
@@ -156,7 +181,7 @@
var frameList = new NormalFrameLayout();
frameList.Y = rowWifi.Bottom;
frameList.Gravity = Gravity.CenterHorizontal;
- frameList.Width = frameTran.Width - HdlControlResourse.XXLeft * 2;
+ frameList.Width = frameTran.Width - ControlCommonResourse.XXLeft * 2;
frameList.Height = this.GetPictrueRealSize(1200);
frameList.Radius = (uint)Application.GetRealWidth(17);
frameList.BackgroundColor = UserCenterColor.Current.White;
@@ -171,12 +196,12 @@
var frameRow = new FrameRowControl();
listView.AddChidren(frameRow);
//wifi鍚嶅瓧
- var btnWifi = new NormalViewControl(frameRow.Width, frameRow.Height - HdlControlResourse.BottomLineHeight, false);
- btnWifi.X = HdlControlResourse.XXLeft;
+ var btnWifi = new NormalViewControl(frameRow.Width, frameRow.Height - ControlCommonResourse.BottomLineHeight, false);
+ btnWifi.X = ControlCommonResourse.XXLeft;
btnWifi.Text = "Application Software" + i;
frameRow.AddChidren(btnWifi, ChidrenBindMode.BindEvent);
//搴曠嚎
- var btnLine = new NormalViewControl(frameRow.Width, HdlControlResourse.BottomLineHeight, false);
+ var btnLine = new NormalViewControl(frameRow.Width, ControlCommonResourse.BottomLineHeight, false);
btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
btnLine.Y = btnWifi.Bottom;
frameRow.AddChidren(btnLine, ChidrenBindMode.BindEvent);
--
Gitblit v1.8.0