From a4d525d08da7b6fb985b0069c539c11b06306a9b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:28:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
old mode 100755
new mode 100644
index 1634157..9d9c77d
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -4,9 +4,6 @@
using Shared.Common;
using Shared.Phone;
using Shared.R;
-//if (Application.DeviceType == Device.Android) {
-//}
-//using UIKit;//ios骞冲彴鎵嶆湁锛宎ndroid娌℃湁锛�
using ZigBee.Device;
@@ -199,7 +196,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