From 7e863a33397f317ffc3ffd9288496d0e4f16aa66 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 12 十二月 2019 14:58:20 +0800
Subject: [PATCH] 合并了新代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs |   33 ++++++++++++++++-----------------
 1 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs
index 9cbc6b4..f6735f4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpDirectionForm.cs
@@ -40,24 +40,23 @@
             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;
@@ -79,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");
             };
 
             //涓嬩竴姝�

--
Gitblit v1.8.0