合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

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

            floorBtn = new Button
            {
@@ -437,13 +441,10 @@
                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);
                topFrameLayout.AddChidren(floorBtn);
            }


            var messageBtn = new Button()
            {
@@ -645,7 +646,7 @@
                };
                AddChidren(roomPageView);
                //与屏幕边框的边距
                roomPageView.TCBJ = Application.GetRealWidth(181);
                roomPageView.TCBJ = Application.GetRealWidth(112);
                //两个page之间的间距
                roomPageView.JMBJ = Application.GetRealWidth(69);

@@ -911,7 +912,7 @@
            {
                Y = noFunction.Bottom,
                Height = Application.GetRealHeight(200),
                Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
                Text = Language.StringByID(R.MyInternationalizationString.NoFunction_Tip).Replace("{\\r\\n}", "\r\n"),
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
                IsMoreLines = true
            };
@@ -1631,7 +1632,7 @@
            {
                Y = noScene.Bottom,
                Height = Application.GetRealHeight(200),
                Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
                Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n"),
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
                IsMoreLines = true
            };