合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

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

@@ -84,8 +84,8 @@

            floorBtn = new Button()
            {
                X = Application.GetRealWidth(750),
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(650),
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterVertical,
                TextAlignment = TextAlignment.CenterRight,
@@ -147,15 +147,33 @@
            };
            AddChidren(bodyFrameLayout);

            var roomScrolView = new VerticalScrolViewLayout { };
            bodyFrameLayout.AddChidren(roomScrolView);
            try
            {
                var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId);
                if (roomList == null || roomList.Count == 0)
                if (Common.Room.Lists.Count <= 1)
                {
                    return;
                }
                var roomScrolView = new VerticalScrolViewLayout { };
                bodyFrameLayout.AddChidren(roomScrolView);
                var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId);
                if (roomList == null || roomList.Count == 0)
                {
                    itemView = new FrameLayout()
                    {
                        Height = Application.GetRealHeight(354 + 58)
                    };
                    roomScrolView.AddChidren(itemView);

                    var roomView = new RoomNoNameMainView(34, 58);
                    itemView.AddChidren(roomView);
                    roomView.Init();

                    roomView.Icon.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
                    roomView.RoomNameButton.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
                    roomView.iconFL.MouseUpEventHandler += ShowUnallocatedRoom_MouseUpEvent;
                }
                else
                {
                for (int i = 0; i < roomList.Count + 1; i++)
                {
                    int xx = 43 + i % 2 * (20 + 487);
@@ -213,6 +231,8 @@
                    }
                }
            }
                
            }
            catch (Exception ex)
            {
                string tt=ex.Message;