合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection1Form.cs

@@ -40,8 +40,7 @@
            framePic.BackgroundImagePath = "Gateway/WirelessApDirection.png";

            bodyFrameLayout.AddChidren(framePic);



            //长按网关HID/WCFG按键5秒

            //系统灯常亮60秒后则进入配网状态

            //请先长按HID/WCFG按键大概5秒{0}直到系统指示灯常亮{0}网关进入AP模式热点

            string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg1).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);

            int yy = framePic.Bottom + Application.GetRealHeight(291);

            foreach (var msg in ArryMsg)

@@ -59,8 +58,8 @@
            var btnHelp = this.AddHelpControl();

            btnHelp.ButtonClickEvent += (sender, e) =>

            {

                var form = new DeviceDirection.DeviceDirectionHelpForm();

                form.AddForm("WirelessUdp");

                var form = new AddGatewayHelpForm();

                form.AddForm("Ap");

            };



            //下一步