合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -84,6 +84,7 @@
                Height = Application.GetRealHeight(80),
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize=14
            };
            AddChidren(NameBtn);

@@ -124,17 +125,18 @@
                Width = Application.GetRealWidth(200),
                Gravity = Gravity.CenterHorizontal,
                Text = $"{(int)(SeekBar.Progress * 1.0 / MaxLevel * 100)} %",
                TextColor = ZigbeeColor.Current.GXCTextGrayColor
                TextColor = ZigbeeColor.Current.GXCTextGrayColor,
                TextSize=12
            };
            AddChidren(SeekBarTitle);

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