Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -401,24 +401,11 @@
                this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uPleaseInputRoomName));

                return false;

            }

            if (string.IsNullOrEmpty(this.floorKeys) == true)

            if (Shared.Common.Room.Lists.Find((obj) => obj.Name == this.newRoom.Name) != null)

            {

                if (Shared.Common.Room.Lists.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)

                {

                    this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));

                    return false;

                }

                this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));

                return false;

            }

            else

            {

                var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.floorKeys);

                if (listRoom.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)

                {

                    this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));

                    return false;

                }

            }



            if (newRoom.BackgroundImageType == 1 || newRoom.BackgroundImageType == 2)

            {

                this.newRoom.MoveBackGroundIamageFileToDirectory(newRoom.BackgroundImage, newRoom.BackgroundImage);