From 4ce5177289b1d34e467de9d8790836559cc5a09e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 18:06:28 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 26cc142..b198905 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -32,7 +32,7 @@
var titleName = new Button
{
- TextSize = 16,
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(176),
@@ -117,6 +117,8 @@
Y = blancolor.Bottom + Application.GetRealHeight(50),
TextID =MyInternationalizationString.createtimetext,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
+
};
middle.AddChidren(titleText);
@@ -196,7 +198,10 @@
///瀹屾垚鐐瑰嚮浜嬩欢
btnsave.MouseUpEventHandler += (sender, e) =>
{
-
+ if (timevalue == 0)
+ {
+ return;
+ }
if (selectde != ""|| timevalue==5)
{
Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
--
Gitblit v1.8.0