代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -48,18 +48,20 @@
                Height = Application.GetRealHeight(80),
                Gravity = Gravity.CenterVertical,
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft
                TextAlignment = TextAlignment.CenterLeft,
                TextSize=CommonFormResouce.TextSize
            };
            AddChidren(TipBtn);

            NameText = new Button
            {
                X = Application.GetRealWidth(350),
                Width = Application.GetRealWidth(600),
                X = Application.GetRealWidth(300),
                Width = Application.GetRealWidth(650),
                Height = Application.GetRealHeight(80),
                Gravity = Gravity.CenterVertical,
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
                TextAlignment = TextAlignment.CenterLeft
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CommonFormResouce.TextSize
            };
            AddChidren(NameText);