JLChen
2020-12-16 d724f7f21c5cc8c5dd5aa0cf7345a62a662eb2bf
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
@@ -437,7 +437,7 @@
                    }.Show(bodyView);
                    return;
                }
                foreach (var tempRoom in DB_ResidenceData.residenceData.Rooms)
                foreach (var tempRoom in SpatialInfo.CurrentSpatial.RoomList)
                {
                    if (room.roomName == tempRoom.roomName)
                    {
@@ -445,7 +445,7 @@
                        return;
                    }
                }
                var addResult = SpatialInfo.CurrentSpatial.AddRoom(room);//检查room是否为云端返回的最新数据
                var addResult = SpatialInfo.CurrentSpatial.AddRoom(room,out room);//检查room是否为云端返回的最新数据
                if (addResult == StateCode.SUCCESS)
                {
                    var deviceIds = new List<string>();
@@ -453,14 +453,17 @@
                    {
                        deviceIds.Add(f.deviceId);
                    }
                    var bindResult = FunctionList.List.FunctionsBindRooms(new List<string>() { room.roomId }, deviceIds);
                    if (bindResult == StateCode.SUCCESS)
                    if (deviceIds.Count > 0)
                    {
                        room.GetRoomFunctions(true);
                    }
                    else
                    {
                        //Utlis.ShowTip(Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code);
                        var bindResult = FunctionList.List.FunctionsBindRooms(new List<string>() { room.roomId }, deviceIds);
                        if (bindResult == StateCode.SUCCESS)
                        {
                            foreach (var f in roomFunctions)
                            {
                                f.roomIds.Add(room.roomId);
                            }
                            room.GetRoomFunctions(true);
                        }
                    }
                    backAction(room);
                    RemoveFromParent();
@@ -503,7 +506,7 @@
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                List<string> roomNameList = new List<string>();
                foreach (var temp in DB_ResidenceData.residenceData.Rooms)
                foreach (var temp in SpatialInfo.CurrentSpatial.RoomList)
                {
                    roomNameList.Add(temp.roomName);
                }