代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

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

@@ -50,6 +51,7 @@
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
                PlaceholderTextColor=ZigbeeColor.Current.GXCPlaceHolderTextColor2,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize=CommonFormResouce.TextSize
            };
            AddChidren(NameText);