From ef63c84b3b408fea661f84d3f9ecc237787af250 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 09 十二月 2019 11:10:07 +0800
Subject: [PATCH] 2019-12-09-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 9d9c77d..50afd43 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -17,9 +17,8 @@
Tag = "Logic";
}
- public void Show(int isInt=0, bool edit=false)
+ 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),
@@ -79,7 +78,6 @@
};
this.AddChidren(middle);
-
var blancolor = new FrameLayout
{
Width = Application.GetMinRealAverage(200),
@@ -115,8 +113,10 @@
Height = Application.GetMinRealAverage(60),
X = Application.GetRealWidth(300),
Y = blancolor.Bottom + Application.GetRealHeight(50),
- TextID =MyInternationalizationString.createtimetext,
+ TextID = MyInternationalizationString.createtimetext,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
+
};
middle.AddChidren(titleText);
@@ -127,8 +127,7 @@
BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
};
middle.AddChidren(PickerViewfra);
-
-
+ PickerViewfra.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
var mUIPickerView = new UIPickerView
{
@@ -161,12 +160,22 @@
int value = 0;
if (edit)
{
-
+
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 = "";
@@ -178,7 +187,6 @@
selectde = "yes";
};
-
var btnsave = new Button
{
@@ -200,7 +208,7 @@
{
return;
}
- if (selectde != ""|| timevalue==5)
+ if (selectde != "" || timevalue == 5)
{
Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
actionsInfo.Add("LinkType", 7);
@@ -232,6 +240,7 @@
UserView.HomePage.Instance.PageIndex += 1;
logicCommunalPage.Show(() => { });
};
+
}
}
}
--
Gitblit v1.8.0