From 3291885285dfd5d4f665c20676307878dc3163bc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 20 十二月 2019 16:28:53 +0800
Subject: [PATCH] 请合并最新代码（优化设备不支持的功能）
---
ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
index 74f0bea..9b01d9d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
@@ -32,7 +32,7 @@
var titleName = new Button
{
- TextSize = 16,
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(176),
@@ -40,6 +40,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.addtime,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -98,6 +99,7 @@
BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
TextID = MyInternationalizationString.Save,
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextSize = 16,
};
fra.AddChidren(btnsave);
#endregion
@@ -129,7 +131,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);
@@ -142,6 +145,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextID = MyInternationalizationString.timeframe,
+ TextSize = 14,
};
typeRowlayout.AddChidren(btnimmediateexecution);
@@ -183,7 +187,8 @@
Text = Language.StringByID(MyInternationalizationString.starttime),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- Width = Application.GetRealWidth(265)
+ Width = Application.GetRealWidth(265),
+ TextSize = 14,
};
timestartrow.AddChidren(btnstarttimetext);
@@ -196,6 +201,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Tag = "0",
+ TextSize = 14,
};
timestartrow.AddChidren(btnstarttime);
@@ -235,6 +241,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Width = Application.GetRealWidth(265),
+ TextSize = 14,
};
timeendrow.AddChidren(btnendtimetext);
@@ -247,6 +254,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Tag = "0",
+ TextSize = 14,
};
timeendrow.AddChidren(btnendtime);
@@ -479,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;
}
@@ -487,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