From f8b647c263f068babb8efcc19ff4e74026a4bd28 Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期二, 03 十二月 2019 10:44:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc --- ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 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..5803a9a --- 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; @@ -22,7 +19,6 @@ public void Show(int isInt=0, bool edit=false) { - #region 鏈�涓婇潰鐨勫竷灞�浠g爜 var topRowLayout = new RowLayout @@ -35,7 +31,7 @@ var titleName = new Button { - TextSize = 16, + TextSize = 17, TextColor = ZigbeeColor.Current.LogicTextBlackColor, TextAlignment = TextAlignment.CenterLeft, X = Application.GetRealWidth(176), @@ -120,6 +116,8 @@ Y = blancolor.Bottom + Application.GetRealHeight(50), TextID =MyInternationalizationString.createtimetext, TextColor = ZigbeeColor.Current.LogicTextBlackColor, + TextSize = 15, + }; middle.AddChidren(titleText); @@ -130,7 +128,7 @@ BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor, }; middle.AddChidren(PickerViewfra); - + PickerViewfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight); var mUIPickerView = new UIPickerView @@ -164,12 +162,20 @@ 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 = ""; @@ -199,7 +205,10 @@ ///瀹屾垚鐐瑰嚮浜嬩欢 btnsave.MouseUpEventHandler += (sender, e) => { - + if (timevalue == 0) + { + return; + } if (selectde != ""|| timevalue==5) { Dictionary<string, object> actionsInfo = new Dictionary<string, object>(); @@ -235,5 +244,3 @@ } } } - - -- Gitblit v1.8.0