上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs

@@ -102,20 +102,20 @@
            {
                RemoveFromParent();
            };
            this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 200 - 58);
            this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 300);
            this.btnBack.MouseUpEventHandler += eHandlerBack;
            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
            this.MidFrameLayout(this);

            var btnAddFrameLayout = new FrameLayout
            {
                X = Application.GetRealWidth(830),
                X = Application.GetRealWidth(619),
            };
            this.titleFrameLayout.AddChidren(btnAddFrameLayout);

            btnFloorText = new Button
            {
                Width = Application.GetRealWidth(110),
                Width = Application.GetRealWidth(300 - 69 - 58),
                X = Application.GetRealWidth(15),
                Text = Language.StringByID(R.MyInternationalizationString.FirstFloor),
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
@@ -125,32 +125,40 @@
            };
            btnAddFrameLayout.AddChidren(btnFloorText);

            var btnBindDownFrameLayout = new FrameLayout
            {
                Width = Application.GetMinReal(69 + 58),
                X = Application.GetRealWidth(300 - 69 - 58),
            };
            btnAddFrameLayout.AddChidren(btnBindDownFrameLayout);

            var btnBindDown = new Button
            {
                Height = Application.GetMinReal(69),
                Width = Application.GetMinReal(69),
                X = Application.GetRealWidth(200 - 77),
                UnSelectedImagePath = "BindPic/BindDown.png",
                Gravity = Gravity.CenterVertical,
            };
            btnAddFrameLayout.AddChidren(btnBindDown);
            btnBindDownFrameLayout.AddChidren(btnBindDown);

            if (Common.Config.Instance.Home.FloorDics.Count == 0)
            {
                btnBindDown.Visible = false;
            }

            btnBindDown.MouseDownEventHandler += (sender, e) =>
            EventHandler<MouseEventArgs> eHandlerBindDown = (sender, e) =>
            {
                SideslipFramelayout();
            };
            btnBindDown.MouseDownEventHandler += eHandlerBindDown;
            btnBindDownFrameLayout.MouseDownEventHandler += eHandlerBindDown;
            if (Common.Config.Instance.Home.FloorDics.Count == 0)
            {
                btnAddFrameLayout.Width = 0;
            }
            else
            {
                btnAddFrameLayout.Width = Application.GetRealWidth(200);
                btnAddFrameLayout.Width = Application.GetRealWidth(300);
            }
            MidFrameLayoutContent(btnFloorText);
        }
@@ -226,8 +234,8 @@
                }
            }
            else
            {

                // 获取楼层对应对房间

            {
                // 获取楼层对应对房间
                var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
                foreach (var room in listAllRoom)
                {
@@ -445,7 +453,7 @@
        /// <returns></returns>
        List<CommonDevice> GetALlDispalyRoomDeviceList()
        {
            currentKeyAllRoomDeviceList.Clear();

            currentKeyAllRoomDeviceList.Clear();
            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
            switch (curDeviceBindType)
            {
@@ -484,7 +492,7 @@
                        if (r.IsLove == true)
                        {
                            continue;
                        }

                        }
                        foreach (var deviceKeys in r.ListDevice)
                        {
                            var device = LocalDevice.Current.GetDevice(deviceKeys);
@@ -540,9 +548,9 @@
            switch (curDeviceBindType)
            {
                case "AddSwitch":
                    foreach (var deviceKeys in curRoom.ListDevice)

                    {

                        var device = LocalDevice.Current.GetDevice(deviceKeys);

                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                        if (device != null)
                        {
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
@@ -553,10 +561,10 @@
                        }
                    }
                    break;
                case "AddDimmer":

                    foreach (var deviceKeys in curRoom.ListDevice)

                    {

                        var device = LocalDevice.Current.GetDevice(deviceKeys);

                case "AddDimmer":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                        if (device != null)
                        {
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
@@ -567,10 +575,10 @@
                        }
                    }
                    break;
                case "AddCurtain":

                    foreach (var deviceKeys in curRoom.ListDevice)

                    {

                        var device = LocalDevice.Current.GetDevice(deviceKeys);

                case "AddCurtain":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                        if (device != null)
                        {
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
@@ -733,7 +741,6 @@

            var sidelipFrameLayout = new FrameLayout()
            {
                Height = Application.GetMinReal(783),
                Width = Application.GetMinReal(449),
                Y = Application.GetRealHeight(161),
                X = Application.GetRealWidth(596),
@@ -758,17 +765,19 @@
            var sidelipVerticalScrolViewLayout = new VerticalScrolViewLayout()
            {
                Height = Application.GetRealHeight(600),
                Y = btnSelectFloor.Bottom,
                Y = btnSelectFloor.Bottom + Application.GetRealHeight(45),
            };
            sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);

            Button oldbutton = null;
            Button oldbuttonText = null;
            int count = 0;
            foreach (var floorId in dicFloor.Keys)
            {
                count++;
                var rowFrameLayout = new RowLayout()
                {
                    Height = Application.GetRealHeight(150),
                    Height = Application.GetRealHeight(152),
                    LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
                    X = Application.GetRealWidth(81),
                };
@@ -778,7 +787,7 @@
                {
                    Width = Application.GetMinReal(81),
                    Height = Application.GetMinReal(81),
                    Y = Application.GetRealHeight(55),
                    Gravity = Gravity.CenterVertical,
                    UnSelectedImagePath = "Floor/Floor.png",
                    SelectedImagePath = "Floor/FloorSelected.png",
                };
@@ -789,7 +798,7 @@
                    Width = Application.GetRealWidth(311),
                    Height = Application.GetRealHeight(58),
                    X = Application.GetRealWidth(92),
                    Y = Application.GetRealHeight(69),
                    Gravity = Gravity.CenterVertical,
                    TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                    TextSize = 14,
                    TextAlignment = TextAlignment.CenterLeft,
@@ -830,9 +839,9 @@
                        btnMethodText.IsSelected = true;
                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                        oldbuttonText.IsBold = true;
                    }



                    //获取楼层对应的房间

                    }

                    //获取楼层对应的房间
                    var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
                    foreach (var room in listAllRoom)
                    {
@@ -860,6 +869,19 @@
                rowFrameLayout.MouseUpEventHandler += hander;
                btnMethodText.MouseUpEventHandler += hander;
            }

            if (count == 0)
            {
                sidelipFrameLayout.Height = 0;
            }
            else if (count <= 4 && count > 0)
            {
                sidelipFrameLayout.Height = Application.GetRealHeight(180) + count * Application.GetRealHeight(150);
            }
            else
            {
                sidelipFrameLayout.Height = Application.GetMinReal(780);
            }
        }
    }
}