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/WirelessApDirection2Form.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs
index 74d326b..f61552e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs
@@ -69,8 +69,7 @@
framePic.BackgroundImagePath = "Gateway/WirelessGatewaySearching.png";
bodyFrameLayout.AddChidren(framePic);
- //璺宠浆鍒扮Щ鍔ㄨ澶嘩LAN璁剧疆
- //閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+ //鎵嬫満鍘昏缃繛鎺ョ綉鍏崇儹鐐箋0}鍗砲dlZigbeeGW-xxxx,瀵嗙爜hdl123456{0}鍙煡鐪嬬綉鍏宠儗闈㈡爣绛炬煡鐪嬬儹鐐瑰悕瀛楀拰瀵嗙爜
string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg2).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
int yy = framePic.Bottom + Application.GetRealHeight(213);
foreach (var msg in ArryMsg)
@@ -109,8 +108,8 @@
var btnHelp = this.AddHelpControl();
btnHelp.ButtonClickEvent += (sender, e) =>
{
- var form = new DeviceDirection.DeviceDirectionHelpForm();
- form.AddForm("WirelessUdp");
+ var form = new AddGatewayHelpForm();
+ form.AddForm("Ap");
};
}
--
Gitblit v1.8.0