合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -89,6 +89,7 @@
                Height = Application.GetRealHeight(80),
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize=14
            };
            AddChidren(NameBtn);
            SelectBtn = new Button()
@@ -100,6 +101,17 @@
                Visible = false
            };
            AddChidren(SelectBtn);

            var line1 = new Button()
            {
                X = Application.GetRealWidth(81),
                Y = Application.GetRealHeight(127),
                Width = Application.GetRealWidth(919),
                Height = 1,
                BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor,
            };
            AddChidren(line1);


            ClickButton = new Button
            {
@@ -147,9 +159,9 @@
            line = new Button()
            {
                X = Application.GetRealWidth(81),
                Y = this.Height - 2,
                Y = this.Height - 1,
                Width = Application.GetRealWidth(919),
                Height = 2,
                Height = 1,
                BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor,
            };
            AddChidren(line);