合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs

@@ -27,7 +27,6 @@

        public override void RemoveFromParent()
        {
            //更新界面
            //action?.Invoke();
            base.RemoveFromParent();
        }
@@ -77,8 +76,11 @@
            };

            floorBtn.Text = Config.Instance.Home.GetCurrentFloorName;
            top.topView.AddChidren(floorBtn);
            top.topView.AddChidren(selectFloorBtn);
            if(Config.Instance.Home.FloorDics.Count>0)
            {
                top.topView.AddChidren(floorBtn);
                top.topView.AddChidren(selectFloorBtn);
            }
            selectFloorBtn.MouseUpEventHandler += SelectedFloor_MouseUpEventHandler;
            floorBtn.MouseUpEventHandler += SelectedFloor_MouseUpEventHandler;
        }
@@ -174,7 +176,7 @@
        }

        /// <summary>
        /// 
        /// ShowUnallocatedRoom_MouseUpEvent
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="mouseEventArgs"></param>