合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

 ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs

@@ -32,7 +32,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -130,6 +130,8 @@
                Text = Language.StringByID(MyInternationalizationString.logicathomegarrison),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,

            };
            athomedefenceRowLayout.AddChidren(btnathomedefence);
            var athomedefenceSelected = new SelectedButton(789);
@@ -174,6 +176,7 @@
                Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,

            };
            leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
@@ -223,6 +226,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextID = MyInternationalizationString.withdrawal,
                TextSize = 15,

            };
            withdrawalRowLayout.AddChidren(btnwithdrawal);
@@ -267,6 +271,7 @@
                TextID = MyInternationalizationString.urgentwithdrawal,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            urgentwithdrawalRowLayout.AddChidren(btnurgentwithdrawal);