合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs

@@ -4,7 +4,7 @@

namespace Shared.Phone.Category
{
    public class SelectHouseForm : FrameLayout
    public class SelectHouseForm : UserCenter.FrameLayoutBase
    {
        public Action<string> HouseAction;

@@ -33,8 +33,8 @@
            {
                X = Application.GetRealWidth(35),
                Y = Application.GetRealHeight(256),
                Width = Application.GetMinRealAverage(449),
                Height = Application.GetMinRealAverage(773),
                Width = this.GetPictrueRealSize(449),
                Height = this.GetPictrueRealSize(773),
                UnSelectedImagePath = "Floor/SelectFloor_Left_4.png"
            };
            dialog.AddChidren(bg);
@@ -43,16 +43,16 @@
            {
                X = Application.GetRealWidth(35),
                Y = Application.GetRealHeight(256+23),
                Width = Application.GetMinRealAverage(449),
                Height = Application.GetMinRealAverage(773 - 23)
                Width = this.GetPictrueRealSize(449),
                Height = this.GetPictrueRealSize(773 - 23)
            };
            dialog.AddChidren(changeHomeFL);

            var changeHomeBtn = new Button()
            {
                X = Application.GetRealWidth(80),
                Width = Application.GetMinRealAverage(350),
                Height = Application.GetMinRealAverage(150),
                Width = this.GetPictrueRealSize(350),
                Height = this.GetPictrueRealSize(150),
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                TextID = R.MyInternationalizationString.ChangeHome,
                TextAlignment = TextAlignment.CenterLeft,
@@ -64,38 +64,34 @@
            var scrolView = new VerticalScrolViewLayout()
            {
                Y = changeHomeBtn.Bottom,
                Width = Application.GetMinRealAverage(449),
                Height = Application.GetMinRealAverage(600),
                Width = this.GetPictrueRealSize(449),
                Height = this.GetPictrueRealSize(600),
                VerticalScrollBarEnabled = false
            };
            changeHomeFL.AddChidren(scrolView);

            var houseCount = Config.Instance.HomeFilePathList.Count;
            if (Config.Instance.HomeFilePathList.Count > 0)
            //获取本地全部的住宅对象
            var listHouse = UserCenter.HdlResidenceLogic.Current.GetLocalResidenceList();
            var houseCount = listHouse.Count;
            if (houseCount > 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);
                    bg.Height = this.GetPictrueRealSize(150 * 6 + 23);
                    changeHomeFL.Height = this.GetPictrueRealSize(150 * 6);
                    scrolView.Height = this.GetPictrueRealSize(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);
                    bg.Height = this.GetPictrueRealSize(150 * (houseCount + 1) + 23);
                    changeHomeFL.Height = this.GetPictrueRealSize(150 * (houseCount + 1));
                    scrolView.Height = this.GetPictrueRealSize(150 * houseCount);
                }

                foreach (var housePath in Config.Instance.HomeFilePathList)
                {
                    var home = House.GetHouseByFilePath(housePath);
                    if (home == null)
                    {
                        continue;
                    }
                    AddFloor(scrolView, home);
                foreach (var house in listHouse)

                {

                    AddFloor(scrolView, house);

                }
            }
        }
@@ -107,8 +103,8 @@
        private void AddFloor(VerticalScrolViewLayout verticalScrolView, House house)
        {
            var frow = new Device.CommonForm.LeftIconButtonRow(449, 150);
            frow.Width = Application.GetMinRealAverage(449);
            frow.Height = Application.GetMinRealAverage(150);
            frow.Width = this.GetPictrueRealSize(449);
            frow.Height = this.GetPictrueRealSize(150);
            frow.Tag = house.FileName;
            frow.Init("Item/House.png", "Item/HouseSelected.png", house.Name);
            verticalScrolView.AddChidren(frow);
@@ -117,20 +113,11 @@
                frow.IsSelected = true;
            }

            frow.ButtonClickEvent += SelectFloor_MouseUpEvent;
        }

        /// <summary>
        /// SelectFloor_MouseUpEvent
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="mouseEventArgs"></param>
        private void SelectFloor_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
        {
            (sender as Device.CommonForm.LeftIconButtonRow).IsSelected = true;
            var home = House.GetHouseByFilePath((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString());
            RemoveView();
            HouseAction?.Invoke(home.Id);
            frow.ButtonClickEvent += (sender, e) =>
            {

                RemoveView();

                HouseAction?.Invoke(house.Id);

            };
        }

        /// <summary>