合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

 ZigbeeApp/Shared/Phone/Device/Category/SelectHouse.cs

@@ -34,27 +34,24 @@
                X = Application.GetRealWidth(35),
                Y = Application.GetRealHeight(256),
                Width = Application.GetMinRealAverage(449),
                Height = Application.GetMinRealAverage(475),
                UnSelectedImagePath = "Item/SelectHouse.png"
                Height = Application.GetMinRealAverage(773),
                UnSelectedImagePath = "Floor/SelectFloor_Left_4.png"
            };
            dialog.AddChidren(bg);

            var changeHomeFL = new FrameLayout()
            {
                X = Application.GetRealWidth(35),
                Y = Application.GetRealHeight(256),
                Height = Application.GetMinRealAverage(449),
                Width = Application.GetMinRealAverage(475),
                Radius = CommonPage.BigFormRadius,
                //BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
                Y = Application.GetRealHeight(256+23),
                Width = Application.GetMinRealAverage(449),
                Height = Application.GetMinRealAverage(773 - 23)
            };
            dialog.AddChidren(changeHomeFL);

            var changeHomeBtn = new Button()
            {
                X = Application.GetRealWidth(80),
                Y=Application.GetRealHeight(20),
                Width = Application.GetRealWidth(350),
                Width = Application.GetMinRealAverage(350),
                Height = Application.GetMinRealAverage(150),
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                TextID = R.MyInternationalizationString.ChangeHome,
@@ -67,13 +64,30 @@
            var scrolView = new VerticalScrolViewLayout()
            {
                Y = changeHomeBtn.Bottom,
                Height = Application.GetMinRealAverage(300),
                Width = Application.GetMinRealAverage(449),
                Height = Application.GetMinRealAverage(600),
                VerticalScrollBarEnabled = false
            };
            changeHomeFL.AddChidren(scrolView);

            var houseCount = Config.Instance.HomeFilePathList.Count;
            if (Config.Instance.HomeFilePathList.Count > 0)
            {
                if (houseCount > 5)
                {
                    bg.UnSelectedImagePath = $"Floor/SelectFloor_Left_5.png";
                    bg.Height = Application.GetMinRealAverage(150 * 6 + 23);
                    changeHomeFL.Height = Application.GetMinRealAverage(150 * 6);
                    scrolView.Height = Application.GetMinRealAverage(150 * 5);
                }
                else
                {
                    bg.UnSelectedImagePath = $"Floor/SelectFloor_Left_{houseCount}.png";
                    bg.Height = Application.GetMinRealAverage(150 * (houseCount + 1) + 23);
                    changeHomeFL.Height = Application.GetMinRealAverage(150 * (houseCount + 1));
                    scrolView.Height = Application.GetMinRealAverage(150 * houseCount);
                }

                foreach (var housePath in Config.Instance.HomeFilePathList)
                {
                    var home = House.GetHouseByFilePath(housePath);
@@ -93,6 +107,8 @@
        private void AddFloor(VerticalScrolViewLayout verticalScrolView, House house)
        {
            var frow = new CommonForm.LeftIconButtonRow(449, 150);
            frow.Width = Application.GetMinRealAverage(449);
            frow.Height = Application.GetMinRealAverage(150);
            frow.Tag = house.FileName;
            frow.Init("Item/House.png", "Item/HouseSelected.png", house.Name);
            verticalScrolView.AddChidren(frow);