黄学彪
2020-03-06 a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -142,8 +142,10 @@
                List<CommonDevice> list = Common.LocalDevice.Current.GetDeviceByGatewayID(gatewayId);
                foreach (var device in list)
                {
                    //删除设备,不删除房间信息
                    Common.LocalDevice.Current.DeleteMemmoryDevice(device, false);
                    //删除一般设备
                    Common.LocalDevice.Current.DeleteMemmoryDevice(device, true);
                    //删除Ota设备
                    Common.LocalDevice.Current.DeleteMemmoryOtaDevice(device.DeviceAddr);
                }
                //删除网关文件
                this.DeleteGatewayFile(gatewayId);
@@ -759,18 +761,21 @@
            {
                //删除设备文件
                Common.LocalDevice.Current.DeleteMemmoryDevice(device, true);
                //删除Ota设备
                Common.LocalDevice.Current.DeleteMemmoryOtaDevice(device.DeviceAddr);
            }
            //如果是主网关
            if (this.IsMainGateway(zbGatewayID) == 1)
            {
                foreach (var room in Shared.Common.Room.Lists)
                var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
                foreach (var room in listAllRoom)
                {
                    //删除场景文件
                    foreach (var scene in room.SceneUIFilePathList)
                    foreach (var sceneId in room.ListSceneId)
                    {
                        if (Global.IsExistsByHomeId(scene) == true)
                        if (Global.IsExistsByHomeId($"Scene_{sceneId}.json") == true)
                        {
                            Global.DeleteFilebyHomeId(scene);
                            Global.DeleteFilebyHomeId($"Scene_{sceneId}.json");
                        }
                    }
                }