2019.12.11-2

gxc

2019-12-11 1ec6794e808b9627276255ca3846326c9316034a

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -426,9 +426,14 @@
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Item/Floor.png"
            };
            if (Config.Instance.Home.FloorDics.Count > 0)
            {
                topFrameLayout.AddChidren(floor);
            }

            floorBtn = new Button
            {
                X = floor.Right,
                Width = Application.GetRealWidth(500),
                Height = Application.GetRealHeight(100),
                Gravity = Gravity.CenterVertical,
@@ -436,11 +441,8 @@
                TextColor = ZigbeeColor.Current.GXCTextColor,
                Text = Config.Instance.Home.GetCurrentFloorName
            };

            if(Config.Instance.Home.FloorDics.Count>0)
            if (Config.Instance.Home.FloorDics.Count > 0)
            {
                topFrameLayout.AddChidren(floor);
                floorBtn.X = floor.Right;
                topFrameLayout.AddChidren(floorBtn);
            }

@@ -643,10 +645,10 @@
                    Height = Application.GetRealHeight(478),
                };
                AddChidren(roomPageView);
                //与屏幕边框的边距
                roomPageView.RowPadding = Application.GetRealWidth(181);
                //突出边距
                roomPageView.TCBJ = Application.GetRealWidth(127);
                //两个page之间的间距
                roomPageView.PagePadding = Application.GetRealWidth(69);
                roomPageView.JMBJ = Application.GetRealWidth(69);

                //当前房间
                //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;