From 3e4e108d0c6317edb18bbf9c41419fd6d6a0eebb Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 17:53:10 +0800
Subject: [PATCH] 2019-11-28-2
---
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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..061560a
--- 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;
@@ -35,7 +32,7 @@
var titleName = new Button
{
- TextSize = 16,
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(176),
@@ -120,6 +117,8 @@
Y = blancolor.Bottom + Application.GetRealHeight(50),
TextID =MyInternationalizationString.createtimetext,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
+
};
middle.AddChidren(titleText);
@@ -130,8 +129,8 @@
BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
};
middle.AddChidren(PickerViewfra);
-
-
+ PickerViewfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+
var mUIPickerView = new UIPickerView
{
@@ -166,10 +165,20 @@
{
timevalue = int.Parse(Common.Logic.CurrentLogic.Actions[isInt]["DelayTime"].ToString());
- var minutevalue1 = timevalue / 60;
- var secondvalue1 = timevalue % 60;
- //鏇存柊鏈�鏂扮姸鎬�
- mUIPickerView.setCurrentItems(minutevalue1, secondvalue1, 0);
+ if (timevalue > 3600)
+ {
+ //鏇存柊鏈�鏂扮姸鎬�
+ mUIPickerView.setCurrentItems(60, timevalue - 3600, 0);
+ }
+ else
+ {
+
+ var minutevalue1 = timevalue / 60;
+ var secondvalue1 = timevalue % 60;
+ //鏇存柊鏈�鏂扮姸鎬�
+ mUIPickerView.setCurrentItems(minutevalue1, secondvalue1, 0);
+ }
+
value = timevalue;
}
string selectde = "";
@@ -199,7 +208,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