合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -73,7 +73,10 @@


        private FrameLayout itemView=new FrameLayout();

        /// <summary>
        /// floorBtn
        /// </summary>
        private Button floorBtn;
        #endregion

        #region ◆ 接口____________________________
@@ -452,7 +455,7 @@
            };
            topFrameLayout.AddChidren(floor);

            var floorBtn = new Button
            floorBtn = new Button
            {
                X=floor.Right,
                Width=Application.GetRealWidth(500),
@@ -492,18 +495,8 @@
            }
            AddChidren(residecneName);

            EventHandler<MouseEventArgs> selectFloor = (send, e) =>
              {
                  var floorFL = new Phone.Device.Category.SelectFloor();
                  AddChidren(floorFL);
                  floorFL.Init(35,153);
                  floorFL.FloorAction = (floorName) =>
                  {
                      floorBtn.Text = floorName;
                  };
              };
            floor.MouseUpEventHandler += selectFloor;
            floorBtn.MouseUpEventHandler += selectFloor;
            floor.MouseUpEventHandler += SelectFloor;
            floorBtn.MouseUpEventHandler += SelectFloor;
            //切换住宅
            residecneName.MouseLongEventHandler += (send, e) =>
            {
@@ -684,7 +677,7 @@
                {
                    //Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
                    Room.CurrentRoom = Room.Lists[0];
                    foreach (var room in Room.Lists)
                    foreach (var room in Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
                    {
                        var roomBackView = new FrameLayout()
                        {
@@ -729,7 +722,10 @@
                            //{
                            //    Show();
                            //};

                            if(room.IsLove)
                            {
                                return;
                            }
                            var editRoom = new Device.Room.EditRoom();
                            HomePage.Instance.AddChidren(editRoom);
                            HomePage.Instance.PageIndex += 1;
@@ -859,7 +855,9 @@
        #endregion

        #region ◆ 刷新____________________________

        /// <summary>
        /// RefreshBodyView
        /// </summary>
        public void RefreshBodyView()
        {
            if (Room.CanInitAllRoom == false)
@@ -877,6 +875,23 @@
            }
        }

        /// <summary>
        /// SelectFloor
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="mouseEventArgs"></param>
        public void SelectFloor(object sender,MouseEventArgs mouseEventArgs)
        {
            var floorFL = new Phone.Device.Category.SelectFloor();
            AddChidren(floorFL);
            floorFL.Init(35, 153);
            floorFL.FloorAction = (floorName) =>
            {
                floorBtn.Text = floorName;
                Show();
            };
        }

        #endregion

        #region ◆ 检测是否绑定了网关________________