代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

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

            backgroundFL.Animate = Animate.DownToUp;

            var topView = new FrameLayout
            {
                Height = Application.GetRealHeight(138)
@@ -58,7 +56,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.GXCTextGrayColor,
                TextID = R.MyInternationalizationString.Cancel,
                TextSize = 16
                TextSize = 14
            };
            topView.AddChidren(cancle);

@@ -79,7 +77,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.GXCTextSelectedColor2,
                TextID = R.MyInternationalizationString.Confrim,
                TextSize = 16
                TextSize = 14
            };
            topView.AddChidren(confrim);

@@ -96,6 +94,10 @@
            }
            foreach (var room in Shared.Common.Room.Lists)
            {
                if(room.IsLove)
                {
                    continue;
                }
                roomList.Add(room.Name);
                roomIdList.Add(room.Id);
            }
@@ -103,6 +105,7 @@
            if (floorList.Count == 0)
            {
                pickView.setNPicker(roomList, null, null);
                currentId = roomIdList[0];
                pickView.OnSelectChangeEvent += (l1, l2, l3) =>
                {
                    currentId = roomIdList[l1];
@@ -111,6 +114,7 @@
            else
            {
                pickView.setNPicker(floorList, roomList, null);
                currentId = roomIdList[0];
                pickView.OnSelectChangeEvent += (l1, l2, l3) =>
                {
                    currentId = roomIdList[l2];