合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs

@@ -831,8 +831,8 @@
                //克隆一个对象

                roomTemp = nowRoom.CloneRoomClass();

                memberShardInfo.TempRoom = roomTemp;

                //新分享的房间,如果图片是自定义的,则上传图片

                if (roomTemp.BackgroundImageType != 0)

                //新分享的房间,如果图片是自定义的,并且这个图片是存在的,则上传图片

                if (roomTemp.BackgroundImageType != 0 && Common.Global.IsExistsByHomeId(roomTemp.BackgroundImage) == true)

                {

                    //自定义的图片,它存在于本地,但是它是全路径

                    listFile.Add(roomTemp.BackgroundImage);

@@ -850,7 +850,7 @@
                        //删除自定义图片

                        listDelPic.Add(roomTemp.BackgroundImage);

                    }

                    if (nowRoom.BackgroundImageType != 0)

                    if (nowRoom.BackgroundImageType != 0 && Common.Global.IsExistsByHomeId(nowRoom.BackgroundImage) == true)

                    {

                        //自定义的图片,它存在于本地,但是它是全路径

                        listFile.Add(nowRoom.BackgroundImage);

@@ -892,7 +892,7 @@
            //场景

            foreach (var secene in listScene)

            {

                if (secene.IconPathType != 0)

                if (secene.IconPathType != 0 && Common.Global.IsExistsByHomeId(secene.IconPath) == true)

                {

                    //自定义的图片,它存在于本地

                    listFile.Add(secene.IconPath);