合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

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

@@ -31,7 +31,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -96,6 +96,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            middle.AddChidren(btnsave);

@@ -135,6 +136,7 @@
                Text = Language.StringByID(MyInternationalizationString.executeonce),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            onceRow.AddChidren(onceTextBtn);

@@ -181,6 +183,7 @@
                TextID = MyInternationalizationString.everyday,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            everydayRow.AddChidren(everydayTxetBtn);

@@ -225,6 +228,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.weekly,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            weekRow.AddChidren(weekTextBtn);

@@ -274,6 +278,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.monthly,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            monthlyRow.AddChidren(monthlyTextBtn);

@@ -323,6 +328,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextID = MyInternationalizationString.everyyear,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 15,
            };
            yearRow.AddChidren(yearTextBtn);