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/Gateway/Add/WirelessUdpDirectionForm.cs | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs
index ae7d7b3..e3a4637 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs
@@ -33,42 +33,42 @@
//鍥剧墖
var framePic = new FrameLayout();
- framePic.Width = Application.GetMinRealAverage(852);
- framePic.Height = Application.GetMinRealAverage(478);
+ framePic.Width = this.GetPictrueRealSize(852);
+ framePic.Height = this.GetPictrueRealSize(478);
framePic.Gravity = Gravity.CenterHorizontal;
framePic.Y = Application.GetRealHeight(251);
framePic.BackgroundImagePath = "Gateway/WirelessGatewaySearching.png";
bodyFrameLayout.AddChidren(framePic);
- //璺宠浆鍒扮Щ鍔ㄨ澶�
- var btnMsg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
- btnMsg1.Y = framePic.Bottom + Application.GetRealHeight(248);
- btnMsg1.TextID = R.MyInternationalizationString.uJumpToMobileDevice;
- btnMsg1.TextAlignment = TextAlignment.Center;
- btnMsg1.TextColor = UserCenterColor.Current.TextGrayColor3;
- bodyFrameLayout.AddChidren(btnMsg1);
- //WLAN璁剧疆杩炴帴瀹跺涵WiFi
- var btnMsg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
- btnMsg2.Y = btnMsg1.Bottom;
- btnMsg2.TextID = R.MyInternationalizationString.uWlanConnectHomeWifi;
- btnMsg2.TextAlignment = TextAlignment.Center;
- btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor3;
- bodyFrameLayout.AddChidren(btnMsg2);
+ //璇峰厛鍘昏缃墜鏈鸿繛鎺ュ埌璺敱鍣▄0}鐒跺悗闀挎寜缃戝叧HID/WCFG鎸夐敭澶ф20绉抺0}鐩村埌绯荤粺鎸囩ず鐏揩闂獅0}缃戝叧杩涘叆UDP妯″紡WIFI閰嶇綉
+ string[] strMsg = Language.StringByID(R.MyInternationalizationString.uAddUdpWirelessGatewayMsg2).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+ int YY = framePic.Bottom + Application.GetRealHeight(128);
+ for (int i = 0; i < strMsg.Length; i++)
+ {
+ var btnMsg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+ btnMsg1.Y = YY;
+ btnMsg1.Text = strMsg[i];
+ btnMsg1.TextAlignment = TextAlignment.Center;
+ btnMsg1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ bodyFrameLayout.AddChidren(btnMsg1);
+ YY = btnMsg1.Bottom;
+ }
//鍘昏缃�
var btnSettion = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnSettion.Y = btnMsg2.Bottom + Application.GetRealHeight(12);
+ btnSettion.Y = YY + Application.GetRealHeight(12);
btnSettion.TextSize = 12;
btnSettion.TextAlignment = TextAlignment.Center;
btnSettion.TextColor = 0xff0075ff;
btnSettion.Text = Language.StringByID(R.MyInternationalizationString.uGotoSettion);
btnSettion.ButtonClickEvent += (sender, e) =>
{
+ HdlWifiLogic.Current.OpenAppWifiSettion();
};
bodyFrameLayout.AddChidren(btnSettion);
//搴曠嚎
- int lineWidth = btnSettion.GetRealWidthByText(12);
- var btnLine1 = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
+ int lineWidth = btnSettion.GetRealWidthByText();
+ var btnLine1 = new NormalViewControl(lineWidth, HdlControlResourse.BottomLineHeight, false);
btnLine1.BackgroundColor = 0xff0075ff;
btnLine1.Gravity = Gravity.CenterHorizontal;
btnLine1.Y = btnSettion.Bottom - Application.GetRealHeight(8);
@@ -78,8 +78,8 @@
var btnHelp = this.AddHelpControl();
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("WirelessUdp");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Udp");
};
//涓嬩竴姝�
@@ -89,7 +89,7 @@
btnNext.ButtonClickEvent += (sender, e) =>
{
var form = new WirelessUdpSelectNetworkForm();
- this.AddFromAndRemoveNowForm(form);
+ this.AddFormAndCloseNowForm(form);
};
}
--
Gitblit v1.8.0