代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -419,7 +419,8 @@
                Gravity = Gravity.CenterVertical,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.GXCTextColor,
                Text = Config.Instance.Home.GetCurrentFloorName
                Text = Config.Instance.Home.GetCurrentFloorName,
                IsBold=true
            };
            if (Config.Instance.Home.FloorDics.Count > 0)
            {
@@ -626,10 +627,10 @@
                    Height = Application.GetRealHeight(478),
                };
                AddChidren(roomPageView);
                //与屏幕边框的边距
                roomPageView.TCBJ = Application.GetRealWidth(181);
                //突出边距
                roomPageView.TCBJ = Application.GetRealWidth(112);
                //两个page之间的间距
                roomPageView.JMBJ = Application.GetRealWidth(0);
                roomPageView.JMBJ = Application.GetRealWidth(69);

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