合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs

@@ -70,8 +70,10 @@
            };
            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)
                {
@@ -87,15 +89,9 @@
                    changeHomeFL.Height = this.GetPictrueRealSize(150 * (houseCount + 1));
                    scrolView.Height = this.GetPictrueRealSize(150 * houseCount);
                }

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

                {

                    AddFloor(scrolView, house);

                }
            }
        }
@@ -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 = UserCenter.HdlResidenceLogic.Current.GetHouseByFilePath((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString());
            RemoveView();
            HouseAction?.Invoke(home.Id);
            frow.ButtonClickEvent += (sender, e) =>
            {

                RemoveView();

                HouseAction?.Invoke(house.Id);

            };
        }

        /// <summary>