合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -81,7 +81,6 @@
            var btnAddFrameLayout = new FrameLayout
            {
                X = Application.GetRealWidth(830),
                Width = Application.GetRealWidth(200),
            };
            this.titleFrameLayout.AddChidren(btnAddFrameLayout);

@@ -91,7 +90,8 @@
                X = Application.GetRealWidth(15),
                Text = Language.StringByID(R.MyInternationalizationString.FirstFloor),
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextSize = 15,
                TextSize = 14,
                IsBold = true,
                TextAlignment = TextAlignment.CenterRight,
            };
            btnAddFrameLayout.AddChidren(btnFloorText);
@@ -115,6 +115,14 @@
            {
                SideslipFramelayout();
            };
            if (Common.Config.Instance.Home.FloorDics.Count == 0)
            {
                btnAddFrameLayout.Width = 0;
            }
            else
            {
                btnAddFrameLayout.Width = Application.GetRealWidth(200);
            }
            MidFrameLayoutContent(btnFloorText);
        }

@@ -162,6 +170,7 @@
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                TextSize = 16,
                IsBold = true,
            };
            bottomFrameLayout.AddChidren(btnChooseKeyMode);
            #endregion
@@ -532,6 +541,7 @@
            int curIndex = 0;
            foreach (var device in curTypeDeviceList)
            {
                curIndex++;
                if (device.CommonDevice != null && device.CommonDevice.IsOnline == 0)
                {
                    continue;
@@ -563,6 +573,7 @@
                    TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
                    TextAlignment = TextAlignment.CenterLeft,
                    Tag = device.CommonDevice?.DeviceEpointName,
                    TextSize = 15,
                };
                rowLayout.AddChidren(btnBindName);

@@ -589,7 +600,7 @@
                };
                rowLayout.AddChidren(line2);

                if (curIndex == curRoom.DeviceUIList.Count - 1)
                if (curIndex == curTypeDeviceList.Count)
                {
                    line2.Visible = false;
                }
@@ -651,8 +662,6 @@
                        btnChoose.Visible = true;
                    }
                }

                curIndex++;
            }
            if (targetList.Count == 0)
            {
@@ -697,7 +706,7 @@
                Height = Application.GetRealHeight(58),
                X = Application.GetRealWidth(81),
                Y = Application.GetRealHeight(81),
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextSize = 14,
                TextAlignment = TextAlignment.CenterLeft,
                TextID = R.MyInternationalizationString.SelectFloor,
@@ -729,7 +738,7 @@
                    Height = Application.GetRealHeight(81),
                    Y = Application.GetRealHeight(55),
                    UnSelectedImagePath = "Floor/Floor.png",
                    SelectedImagePath = "Floor/FloorSelected.png",
                    SelectedImagePath = "Floor/FloorSelected.png", 
                };
                rowFrameLayout.AddChidren(btnAllMethod);

@@ -749,6 +758,7 @@
                if (currentKey.currentSelectFloorId == floorId)
                {
                    btnAllMethod.IsSelected = true;
                    btnAllMethod.IsBold = true;
                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                }

@@ -777,6 +787,7 @@
                        oldbuttonText = btnMethodText;
                        btnMethodText.IsSelected = true;
                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                        oldbuttonText.IsBold = true;
                    }

                    //获取楼层对应的房间