合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs

@@ -189,7 +189,7 @@
                //没有设置过模式

                if (AppResidenceMode == 0)

                {

                    var frame = new TopRightMenuControl(2);

                    var frame = new TopRightMenuControl(2, 2);

                    //创建楼层

                    frame.AddRowMenu(Language.StringByID(R.MyInternationalizationString.uCreatFloor), "Item/CreatFloor.png", "Item/CreatFloorSelected.png", () =>

                    {

@@ -692,6 +692,12 @@
            var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();

            foreach (var gateway in listGateway)

            {

                ZigBee.Device.ZbGateway realWay = null;

                if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, gateway) == false)

                {

                    //错误:网关对象丢失

                    continue;

                }

                var result = HdlGatewayLogic.Current.SetGatewaySite(gateway, longitude, latitude);

                if (result == false)

                {