Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs

@@ -150,7 +150,7 @@
                {

                    //取消收藏

                    HdlSceneLogic.Current.DeleteLoveScene(i_scene);

                    if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)

                    if (HdlRoomLogic.Current.NowMainPageRoom.IsLove == true)

                    {

                        //如果当前房间是我的喜爱的话,回调卡片被删除的事件

                        this.CardNeedRemoveEvent?.Invoke();