From 7e863a33397f317ffc3ffd9288496d0e4f16aa66 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 12 十二月 2019 14:58:20 +0800
Subject: [PATCH] 合并了新代码

---
 ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
index 93d702f..9b01d9d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
+++ b/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;
                 }

--
Gitblit v1.8.0