合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

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

@@ -40,6 +40,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.addtime,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -253,6 +254,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Tag = "0",
                TextSize = 14,
            };
            timeendrow.AddChidren(btnendtime);

@@ -485,7 +487,7 @@
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                           Language.StringByID(MyInternationalizationString.completeNext),
                                          Language.StringByID(MyInternationalizationString.complete));
                                          Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    return;
                }
@@ -493,7 +495,7 @@
                {
                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                          Language.StringByID(MyInternationalizationString.sametime),
                                         Language.StringByID(MyInternationalizationString.complete));
                                         Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();
                    return;
                }