合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

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

@@ -80,7 +80,7 @@

            var titleName = new Button
            {
                TextSize = 16,
                TextSize = 17,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
@@ -165,7 +165,8 @@
                Text = Language.StringByID(MyInternationalizationString.type),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width = Application.GetRealWidth(265)
                Width = Application.GetRealWidth(265),
                TextSize = 14,
            };
            typeRowlayout.AddChidren(btnTypeTextTitle);

@@ -179,6 +180,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextID=MyInternationalizationString.immediateexecution,
                TextSize = 14,
            };
            typeRowlayout.AddChidren(btnimmediateexecution);

@@ -223,7 +225,8 @@
                Text = Language.StringByID(MyInternationalizationString.moment),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Width=Application.GetRealWidth(265)
                Width=Application.GetRealWidth(265),
                TextSize = 14,
            };
            rowSelectedTimeType.AddChidren(btnTimeText);
            
@@ -236,6 +239,7 @@
                Width = Application.GetRealWidth(630),
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextSize = 14,
            };
            rowSelectedTimeType.AddChidren(btnTimeTpye);

@@ -380,7 +384,8 @@
                    Text = Language.StringByID(MyInternationalizationString.Advancedelay),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Width = Application.GetRealWidth(265)
                    Width = Application.GetRealWidth(265),
                    TextSize = 14,
                };
                rowDelayType.AddChidren(btnDelayTimeText);

@@ -394,6 +399,7 @@
                    TextAlignment = TextAlignment.CenterRight,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                    Text = textvalue,
                    TextSize = 14,
                };
                rowDelayType.AddChidren(btnDelayTime);

@@ -517,6 +523,7 @@
                BackgroundColor =ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.Save,
                TextColor= ZigbeeColor.Current.LogicBtnSaveTextColor,
                TextSize = 16,
            };
            fra.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += (sender, e) =>
@@ -627,6 +634,7 @@
                Width = Application.GetRealWidth(200),
                X = Application.GetRealWidth(80),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = 14,
            };
            timetype.AddChidren(Btncancel);
            Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -654,6 +662,7 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
                TextSize = 14,

            };
            timetype.AddChidren(Btncomplete);
@@ -685,6 +694,7 @@
                TextID = MyInternationalizationString.sunrise,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            sunriseRow.AddChidren(btnsunrisetext);

@@ -718,6 +728,7 @@
                TextID = MyInternationalizationString.sunset,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            sunsetRow.AddChidren(btnsunsettext);

@@ -753,6 +764,7 @@
                TextID = MyInternationalizationString.noon,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            noonRow.AddChidren(btnnoontext);

@@ -785,6 +797,7 @@
                TextID = MyInternationalizationString.logiccustom,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                TextSize = 14,
            };
            logiccustomRow.AddChidren(btnlogiccustomtext);