Evoyo.Home1.1.0120111601_Release

黄学彪

2020-11-19 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a

 ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs

@@ -1220,7 +1220,7 @@
                dicRealRoom[gateway.GwId] = gateway.RoomId;

            }

            //获取全部物理设备所属房间的记录

            var dicDeviceRoom = Common.LocalDevice.Current.GetAllRealDeviceRoomData();

            var dicDeviceRoom = HdlRoomLogic.Current.GetAllRealDeviceRoomData();

            foreach (var strMac in dicDeviceRoom.Keys)

            {

                dicRealRoom[strMac] = dicDeviceRoom[strMac];

@@ -1353,7 +1353,7 @@
            //更改物理设备所在的房间

            if (this.modelData.dicDeviceTemplateRealRoom.ContainsKey(targetMac) == true)

            {

                Common.LocalDevice.Current.SaveRealDeviceRoomId(listDevice, this.modelData.dicDeviceTemplateRealRoom[targetMac], false);

                HdlRoomLogic.Current.SaveRealDeviceRoomId(listDevice, this.modelData.dicDeviceTemplateRealRoom[targetMac], false);

            }



            //记录缓存

@@ -1496,7 +1496,7 @@
            //变更网关房间

            if (this.modelData.dicDeviceTemplateRealRoom.ContainsKey(targetGwid) == true)

            {

                HdlGatewayLogic.Current.ChangedGatewayRoom(sourceGwid, this.modelData.dicDeviceTemplateRealRoom[targetGwid]);

                HdlRoomLogic.Current.ChangedGatewayRoom(sourceGwid, this.modelData.dicDeviceTemplateRealRoom[targetGwid]);

            }

            //变更网关名字

            //if (this.modelData.dicGatewayInfo.ContainsKey(targetGwid) == true)