合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

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

@@ -59,7 +59,7 @@

            //智能网关正在配置网络中
            var btnMsg1 = new NormalViewControl(bodyFrameLayout.Width, false);

            btnMsg1.TextID = R.MyInternationalizationString.uGatewaySetting;

            btnMsg1.TextID = R.MyInternationalizationString.uGatewaySearching;

            btnMsg1.Y = Application.GetRealHeight(1036);
            btnMsg1.TextAlignment = TextAlignment.Center;
            bodyFrameLayout.AddChidren(btnMsg1);
@@ -259,8 +259,8 @@
                                //搜索得到无线网关

                                if (mode != GatewayBindMode.Binded)

                                {

                                    var form = new GatewayInfoAddForm();

                                    this.AddFromAndRemoveNowForm(form, realWay);

                                    //var form = new GatewayInfoAddForm();

                                    //this.AddFromAndRemoveNowForm(form, realWay);

                                }

                            }

                        });