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

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

@@ -398,6 +398,11 @@


            //当前房间

            var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();

            if (HdlRoomLogic.Current.NowMainPageRoom == null)

            {

                //设置第一个为初始房间

                HdlRoomLogic.Current.NowMainPageRoom = listRoom[0];

            }

            var curIndex = 0;

            for (int i = 0; i < listRoom.Count; i++)

            {

@@ -405,7 +410,7 @@
                roomPageView.AddChidren(roomView);

                roomView.Init(listRoom[i]);



                if (listRoom[i].Id == HdlRoomLogic.Current.CurrentRoom.Id)

                if (listRoom[i].Id == HdlRoomLogic.Current.NowMainPageRoom.Id)

                {

                    //当前房间,则显示那些数据出来

                    roomView.HideName(false);

@@ -470,7 +475,7 @@
                btnRoomRightShadow.Visible = true;

                btnRoomBottomShadow.Visible = true;

                //切换当前房间

                HdlRoomLogic.Current.CurrentRoom = listRoom[curIndex];

                HdlRoomLogic.Current.NowMainPageRoom = listRoom[curIndex];

                //刷新设备桌布控件

                this.isRoomChanging = false;

                this.RefreshBodyView();

@@ -532,7 +537,7 @@
            this.dicDeviceCardControl.Clear();



            var listDevice = new List<CommonDevice>();

            foreach (var mainkeys in HdlRoomLogic.Current.CurrentRoom.ListDevice)

            foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)

            {

                var device = LocalDevice.Current.GetDevice(mainkeys);

                //判断该设备能否显示在主页

@@ -640,7 +645,7 @@
                    cardContr.X = XX;

                    cardContr.Y = YY;

                    listDeviceBackContr.AddChidren(cardContr);

                    cardContr.InitControl(device);

                    cardContr.InitControl(device, HdlRoomLogic.Current.NowMainPageRoom);

                    //卡片需要被移除的事件

                    cardContr.CardNeedRemoveEvent += () =>

                    {

@@ -787,7 +792,7 @@
            this.dicDeviceCardControl.Clear();



            var listScene = new List<SceneUI>();

            foreach (int sceneId in HdlRoomLogic.Current.CurrentRoom.ListSceneId)

            foreach (int sceneId in HdlRoomLogic.Current.NowMainPageRoom.ListSceneId)

            {

                var sceneUi = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);

                if (sceneUi == null)

@@ -1162,7 +1167,7 @@
            floorFL.FloorAction = (floorId) =>

            {

                btnFloor.Text = Config.Instance.Home.GetFloorNameById(floorId);

                HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();

                HdlRoomLogic.Current.NowMainPageRoom = HdlRoomLogic.Current.GetLoveRoom();

                this.ShowForm();

            };

        }