Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 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);
@@ -250,7 +250,7 @@
                        //网关绑定在当前账号下的其他住宅里\r\n请解除绑定后再试(IP地址)

                        if (result == 0) { continue; }

                        //我觉得这里需要获取一下新网关的设备列表

                        await Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);

                        Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);



                        Application.RunOnMainThread(() =>

                        {

@@ -259,8 +259,8 @@
                                //搜索得到无线网关

                                if (mode != GatewayBindMode.Binded)

                                {

                                    var form = new GatewayInfoAddForm();

                                    this.AddFromAndRemoveNowForm(form, realWay);

                                    //var form = new GatewayInfoAddForm();

                                    //this.AddFromAndRemoveNowForm(form, realWay);

                                }

                            }

                        });