合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

@@ -18,13 +18,12 @@

        private Button floorBtn;

        private FrameLayout itemView;
        public FrameLayout itemView;

        #endregion


        public Action action;


        public override void RemoveFromParent()
        {
@@ -39,7 +38,7 @@
        {
            AddTop();

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

        #region Add____________________________________
@@ -55,7 +54,7 @@
            top.SetTopTitle(R.MyInternationalizationString.RoomList);
            top.backButton.MouseUpEventHandler += (sender, e) =>
            {
                RemoveFromParent();
                CommonPage.Instance.CloseLeftMenu();
            };

            floorBtn = new Button()
@@ -94,15 +93,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 +115,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);