修改了 sokect

黄学彪

2020-07-09 5428935270159bfc42c2934ed7fb1091554fc9a4

 ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs

@@ -80,7 +80,8 @@
            };
            backgroundFL.AddChidren(floorLayout);

            var floorCount = Config.Instance.Home.FloorDics.Count;
            var dicFloor = UserCenter.HdlRoomLogic.Current.GetFloorSortList();
            int floorCount = dicFloor.Count;

            if (floorCount > 0)
            {
@@ -109,9 +110,9 @@
                    floorLayout.Height = this.GetPictrueRealSize(150 * floorCount);
                }

                foreach (var floor in Config.Instance.Home.FloorDics)
                foreach (var floor in dicFloor.Keys)
                {
                    AddFloor(floorLayout, floor);
                    AddFloor(floorLayout, floor, dicFloor[floor]);
                }
            }
        }
@@ -120,50 +121,41 @@
        /// AddFloor
        /// </summary>
        /// <param name="verticalScrolView"></param>
        private void AddFloor(VerticalScrolViewLayout verticalScrolView, KeyValuePair<string, string> floor,bool isLast=false)
        private void AddFloor(VerticalScrolViewLayout verticalScrolView, string floorId, string floorName)
        {
            var frow = new Device.CommonForm.LeftIconButtonRow(449, 150);
            frow.Width = this.GetPictrueRealSize(449);
            frow.Height = this.GetPictrueRealSize(150);
            frow.Tag = floor.Key;
            frow.Init("Floor/Floor.png", "Floor/FloorSelected.png", floor.Value);
            frow.Init("Floor/Floor.png", "Floor/FloorSelected.png", floorName);
            verticalScrolView.AddChidren(frow);

            if (string.IsNullOrEmpty(CurFloorId))
            {
                if (Config.Instance.Home.CurrentFloorId == floor.Key)
                if (Config.Instance.Home.CurrentFloorId == floorId)
                {
                    frow.IsSelected = true;
                }
            }
            else
            {
                if (CurFloorId == floor.Key)
                if (CurFloorId == floorId)
                {
                    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)
            frow.ButtonClickEvent += (sender, e) =>
        {
            (sender as Device.CommonForm.LeftIconButtonRow).IsSelected = true;
                frow.IsSelected = true;
            if (changeFloor)
            {
                Config.Instance.Home.CurrentFloorId = (sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString();
                    Config.Instance.Home.CurrentFloorId = floorId;
                Config.Instance.Home.Save(false);
                UserCenter.HdlRoomLogic.Current.RefreshRoomListView();
            }
            RemoveView();
            FloorAction?.Invoke((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString());

                FloorAction?.Invoke(floorId);
            };
        }

        /// <summary>