上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

 ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs

@@ -176,7 +176,7 @@
                SceneBodyTableControl.AddChidren(listSceneView);



                var listScene = HdlSceneLogic.Current.GetUnalloctedScenes();

                if (listScene == null || listScene.Count == 0) { return; }

                if (listScene.Count == 0) { return; }



                foreach (var data in listScene)

                {

@@ -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;

                    }