全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -56,8 +56,20 @@
            row2.AddRightArrow();

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

            {

                var form = new SearchWirelessMenuControl();

                form.AddForm();

                var menuContr = new BottomMenuSelectForm();

                menuContr.AddForm(2);

                //UDP模式(推荐)

                menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.uUdpModeRecommend), () =>

                {

                    var form = new WirelessUdpDirectionForm();

                    form.AddForm();

                });

                //AP模式

                menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.uApMode), () =>

                {

                    var form = new WirelessApDirection1Form();

                    form.AddForm();

                });

            };
        }



@@ -115,6 +127,8 @@
                {

                    //关闭界面

                    this.CloseForm();

                    var form = new WirelessApDirection1Form();

                    form.AddForm();

                };



                var frameBack2 = new FrameLayoutControl();