合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs

@@ -85,9 +85,9 @@
            {
                X = Application.GetRealWidth(446),
                Y = Application.GetRealHeight(330),
                Height = Application.GetRealHeight(81 / 2),
                Height = Application.GetRealHeight(76 / 2),
                Width = Application.GetRealWidth(407),
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
                TextSize = 10,
                TextAlignment = TextAlignment.CenterLeft,
            };
@@ -97,9 +97,9 @@
            {
                X = Application.GetRealWidth(446),
                Y = btnPicTip1.Bottom,
                Height = Application.GetRealHeight(81 / 2),
                Height = Application.GetRealHeight(76 / 2),
                Width = Application.GetRealWidth(207),
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
                TextSize = 10,
                TextAlignment = TextAlignment.CenterLeft,
            };
@@ -109,9 +109,9 @@
            {
                X = Application.GetRealWidth(294),
                Y = Application.GetRealHeight(1089),
                Height = Application.GetRealHeight(173 / 2),
                Height = Application.GetRealHeight(100 / 2),
                Width = Application.GetRealWidth(488),
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
                Gravity = Gravity.CenterHorizontal,
                TextSize = 14,
            };
@@ -120,10 +120,10 @@
            var btnPicTip4 = new Button
            {
                X = Application.GetRealWidth(397),
                Y = btnPicTip3.Bottom,
                Y = btnPicTip3.Y + Application.GetRealHeight(50),
                Width = Application.GetRealWidth(288),
                Height = Application.GetRealHeight(173 / 2),
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                Height = Application.GetRealHeight(100 / 2),
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
                Gravity = Gravity.CenterHorizontal,
                TextSize = 14,
            };
@@ -135,7 +135,7 @@
                Y = Application.GetRealHeight(1388),
                Height = Application.GetRealHeight(49),
                Width = Application.GetRealWidth(685),
                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                Gravity = Gravity.CenterHorizontal,
                TextSize = 12,
            };
@@ -151,7 +151,8 @@
                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                Gravity = Gravity.CenterHorizontal,
                Radius = (uint)Application.GetRealHeight(127 / 2),
                TextSize = 20,
                TextSize = 16,
                IsBold =true,
                Enable = false,
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect,
            };