Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

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

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

                        if (result == 0) { continue; }

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

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

                        Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);



                        Application.RunOnMainThread(() =>

                        {