From 73e6bfcd3eed1b4aa714af538891a3a62864b516 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 05 十二月 2019 14:34:59 +0800
Subject: [PATCH] 2019-12-05-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 26cc142..63dae7a 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -19,7 +19,6 @@
public void Show(int isInt=0, bool edit=false)
{
-
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
var topRowLayout = new RowLayout
@@ -32,7 +31,7 @@
var titleName = new Button
{
- TextSize = 16,
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(176),
@@ -117,6 +116,8 @@
Y = blancolor.Bottom + Application.GetRealHeight(50),
TextID =MyInternationalizationString.createtimetext,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
+
};
middle.AddChidren(titleText);
@@ -127,8 +128,8 @@
BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
};
middle.AddChidren(PickerViewfra);
-
-
+ PickerViewfra.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+
var mUIPickerView = new UIPickerView
{
@@ -163,10 +164,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 = "";
@@ -196,7 +207,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