合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs

@@ -96,13 +96,18 @@
            };



            //获取楼层

            this.curFloorId = Config.Instance.Home.CurrentFloorId;



            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            if (dicFloor.Count == 0)

            {

                return;

            }

            //楼层初始ID

            foreach (var floorId in dicFloor.Keys)

            {

                this.curFloorId = floorId;

                break;

            }



            //楼层图标

            var btnIconContr = new MostRightIconControl(69, 69);

            btnIconContr.UnSelectedImagePath = "Item/Drop_Down.png";

@@ -120,9 +125,9 @@
            {

                //楼层菜单

                var floors = new Category.SelectFloorForm();

                floors.CurFloorId = this.curFloorId;

                AddChidren(floors);

                floors.changeFloor = false;

                floors.CurFloorId = curFloorId;

                floors.CurFloorId = this.curFloorId;

                floors.Init(599, 161, Direction.Right);

                floors.FloorAction += (floorId) =>

                {

@@ -156,6 +161,11 @@
        /// </summary>

        public void RefreshListRoom()

        {

            if (Config.Instance.Home.FloorDics.Count == 0)

            {

                //来回切换备份,会出现问题,楼层id没清除

                this.curFloorId = string.Empty;

            }

            //保险起见,这里要关闭未分配界面

            this.CloseUnallocatedRoomForm();



@@ -219,7 +229,6 @@
                    {

                        return;

                    }

                    string oldFloorId = Config.Instance.Home.CurrentFloorId;

                    CommonPage.Instance.CloseLeftMenu();



                    HdlThreadLogic.Current.RunThread(() =>

@@ -231,10 +240,11 @@
                            //点击的是收藏房间的话,不变更当前楼层id

                            if (room.FloorId != string.Empty)

                            {

                                Config.Instance.Home.CurrentFloorId = room.FloorId;

                                if (oldFloorId != room.FloorId)

                                if (Config.Instance.Home.CurrentFloorId != room.FloorId)

                                {

                                    //楼层都切换的话,刷新整个主页

                                    Config.Instance.Home.CurrentFloorId = room.FloorId;

                                    HdlRoomLogic.Current.NowMainPageRoom = room;

                                    UserPage.Instance.ReFreshControl();

                                    return;

                                }

@@ -288,7 +298,7 @@
            frameBack.AddChidren(btnIcon, ChidrenBindMode.BindEvent);



            //未分配

            var btnName = new NormalViewControl(141, 84, true);

            var btnName = new NormalViewControl(250, 84, true);

            btnName.X = this.GetPictrueRealSize(244);

            btnName.Y = this.GetPictrueRealSize(131);

            btnName.IsBold = true;