2019.12.13

gxc

2019-12-13 eb424d24e39bab4a245725f35deab3f234ea0f13

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

@@ -27,7 +27,6 @@

        public override void RemoveFromParent()
        {
            //更新界面
            //action?.Invoke();
            base.RemoveFromParent();
        }
@@ -38,7 +37,7 @@
        {
            AddTop();

            AddBodyView();
            AddBodyView(Config.Instance.Home.CurrentFloorId);
        }

        #region Add____________________________________
@@ -77,8 +76,11 @@
            };

            floorBtn.Text = Config.Instance.Home.GetCurrentFloorName;
            top.topView.AddChidren(floorBtn);
            top.topView.AddChidren(selectFloorBtn);
            if(Config.Instance.Home.FloorDics.Count>0)
            {
                top.topView.AddChidren(floorBtn);
                top.topView.AddChidren(selectFloorBtn);
            }
            selectFloorBtn.MouseUpEventHandler += SelectedFloor_MouseUpEventHandler;
            floorBtn.MouseUpEventHandler += SelectedFloor_MouseUpEventHandler;
        }
@@ -93,16 +95,17 @@
            var floors = new SelectFloor();
            AddChidren(floors);
            floors.Init(599, 161,Direction.Right);
            floors.FloorAction += (floorName) =>
            floors.FloorAction += (floorId) =>
            {
                floorBtn.Text = floorName;
                floorBtn.Text = Config.Instance.Home.GetFloorNameById(floorId);
                AddBodyView(floorId);
            };
        }

        /// <summary>
        /// AddBodyView
        /// </summary>
        public void AddBodyView()
        public void AddBodyView(string floorId)
        {
            bodyFrameLayout = new FrameLayout()
            {
@@ -114,7 +117,7 @@

            var roomScrolView = new VerticalScrolViewLayout { };
            bodyFrameLayout.AddChidren(roomScrolView);
            var roomList = Shared.Common.Room.Lists;
            var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId);
            for (int i = 0; i < roomList.Count+1; i++)
            {
                int xx = 43 + i % 2 * (20 + 487);
@@ -173,15 +176,14 @@
        }

        /// <summary>
        /// 
        /// ShowUnallocatedRoom_MouseUpEvent
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="mouseEventArgs"></param>
        private void ShowUnallocatedRoom_MouseUpEvent(object sender,MouseEventArgs mouseEventArgs)
        {
            var unalloctedRoom = new UnallocatedRoom();
            HomePage.Instance.AddChidren(unalloctedRoom);
            HomePage.Instance.PageIndex += 1;
            AddChidren(unalloctedRoom);
            unalloctedRoom.Show();
        }
    }