From 642fcdaeb496d9a8f3154e17fd76005be3fcf197 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 03 十二月 2019 12:00:24 +0800
Subject: [PATCH] 2019.12.3

---
 ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 9d9c77d..09560c1 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);
 
@@ -127,8 +129,8 @@
                 BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
             };
             middle.AddChidren(PickerViewfra);
-
-
+            PickerViewfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+            
 
             var mUIPickerView = new UIPickerView
             {
@@ -163,10 +165,18 @@
             {
                 
                 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 = "";

--
Gitblit v1.8.0