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

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs

@@ -193,7 +193,7 @@
                    frameContr.CollectEvent += (collect) =>

                    {

                        //如果当前是收藏房间,则需要刷新主页

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

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

                        {

                            this.dataHadChanged = true;

                        }

@@ -536,7 +536,7 @@
                selectZone.ZoneAction += (selectRoom) =>
                {
                    //变更了当前房间的东西,主页需要刷新
                    if (HdlRoomLogic.Current.CurrentRoom.Id == selectRoom.Id)

                    if (HdlRoomLogic.Current.NowMainPageRoom.Id == selectRoom.Id)

                    {

                        this.dataHadChanged = true;

                    }