Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 ZigbeeApp/Shared/Phone/Device/Room/AddRoomScene.cs

@@ -468,9 +468,9 @@
                Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                localPic.Show();
                localPic.action = () =>
                localPic.action = (imgPath) =>
                {
                    backGround.UnSelectedImagePath = ImagePath;
                    backGround.UnSelectedImagePath = imgPath;
                    IconType = 0;
                };