合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs

@@ -43,6 +43,8 @@
            };
            dialog.AddChidren(backgroundFL);

            backgroundFL.Animate = Animate.DownToUp;

            var topView = new FrameLayout
            {
                Height = Application.GetRealHeight(138)
@@ -97,17 +99,27 @@
                roomList.Add(room.Name);
                roomIdList.Add(room.Id);
            }
            pickView.setNPicker(floorList, roomList, null);

            if (floorList.Count == 0)
            {
                pickView.setNPicker(roomList, null, null);
                pickView.OnSelectChangeEvent += (l1, l2, l3) =>
                {
                    currentId = roomIdList[l1];
                };
            }
            else
            {
                pickView.setNPicker(floorList, roomList, null);
            pickView.OnSelectChangeEvent += (l1, l2, l3) =>
            {
                currentId = roomIdList[l2];
            };
            }

            cancle.MouseUpEventHandler += Close;
            confrim.MouseUpEventHandler += Confrim_MouseEvent;
        }


        /// <summary>
        /// Close
@@ -126,7 +138,10 @@
        /// <param name="mouseEventArgs"></param>
        private void Confrim_MouseEvent(object sender, MouseEventArgs mouseEventArgs)
        {
            if (Shared.Common.Room.CurrentRoom.GetRoomById(currentId) != null)
            {
            ZoneAction?.Invoke(Shared.Common.Room.CurrentRoom.GetRoomById(currentId));
            }
            RemoveFromParent();
        }
    }