合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

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

@@ -7,21 +7,14 @@
    public class SelectZone
    {
        public Action<Common.Room> ZoneAction;

        private UIPickerView pickView;

        private List<string> floorList = new List<string> { };
        private List<string> roomList = new List<string> { };
        private List<string> roomIdList = new List<string> { };
        /// <summary>
        /// curRoom
        /// </summary>
        private Common.Room curRoom;

        public SelectZone()
        {
        }

        /// <summary>
        /// 标题
        /// </summary>
        public string title = Language.StringByID(R.MyInternationalizationString.BelongZone);
        /// <summary>
        /// Init
        /// </summary>
@@ -37,10 +30,11 @@
            {
                foreach (var floor in Config.Instance.Home.FloorDics)
                {
                    floorIds.Add(floor.Key);
                    floorNames.Add(floor.Value);
                    if (Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key).Count > 0)
                    {
                        floorIds.Add(floor.Key);
                        floorNames.Add(floor.Value);

                        roomNames.Add(Common.Room.CurrentRoom.GetRoomNamesByFloorId(floor.Key));
                        rooms.Add(Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key));
                    }
@@ -49,8 +43,7 @@
                {
                    curRoom = rooms[index1][index2];
                    ZoneAction?.Invoke(curRoom);
                    //RemoveFromParent();
                }, 0, 0, Language.StringByID(R.MyInternationalizationString.BelongFloor),
                }, 0, 0, title,
               Language.StringByID(R.MyInternationalizationString.Confrim),
               Language.StringByID(R.MyInternationalizationString.Cancel));
            }
@@ -70,47 +63,10 @@
                {
                    curRoom = rs[index1];
                    ZoneAction?.Invoke(curRoom);
                    //RemoveFromParent();
                }, 0, Language.StringByID(R.MyInternationalizationString.AddTo),
                }, 0, title,
               Language.StringByID(R.MyInternationalizationString.Confrim),
               Language.StringByID(R.MyInternationalizationString.Cancel));
            }

            foreach (var floor in Config.Instance.Home.FloorDics)
            {
                floorList.Add(floor.Value);
            }
            foreach (var room in Shared.Common.Room.Lists)
            {
                if(room.IsLove)
                {
                    continue;
                }
                roomList.Add(room.Name);
                roomIdList.Add(room.Id);
            }

        }

        /// <summary>
        /// Close
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="mouseEventArgs"></param>
        private void Close(object sender, MouseEventArgs mouseEventArgs)
        {
            //RemoveFromParent();
        }

        /// <summary>
        /// Confrim_MouseEvent
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="mouseEventArgs"></param>
        private void Confrim_MouseEvent(object sender, MouseEventArgs mouseEventArgs)
        {
            //ZoneAction?.Invoke(curRoom);
            //RemoveFromParent();
        }
    }
}