From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/Category/AdjustTargetAddDelayTimeForm.cs | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/Category/AdjustTargetAddDelayTimeForm.cs b/ZigbeeApp20200414/Shared/Phone/Category/AdjustTargetAddDelayTimeForm.cs
index 5f1d3e6..c88d512 100755
--- a/ZigbeeApp20200414/Shared/Phone/Category/AdjustTargetAddDelayTimeForm.cs
+++ b/ZigbeeApp20200414/Shared/Phone/Category/AdjustTargetAddDelayTimeForm.cs
@@ -39,6 +39,11 @@
private void InitMiddleFrame(int i_delayTime)
{
int selectTime = i_delayTime;
+ if (selectTime == 0)
+ {
+ //榛樿1绉�
+ selectTime = 1;
+ }
//鍥炬爣绗竴灞傚簳鑹�
var frameFirstBack = new FrameLayout();
@@ -110,8 +115,13 @@
var listTemp2 = new List<string>() { "00" + strSecond };
listSecond.Add(listTemp2);
+ int firstIndex = selectTime / 60;
+ int secondIndex = selectTime % 60;
+ //鍥犱负0鍒嗙殑鏃跺�欙紝瀹冩槸浠�1绉掑紑濮嬬殑锛屾墍浠ュ畠鐨勭储寮曢渶瑕�-1
+ if (firstIndex == 0) { secondIndex--; }
+
pickView.setPicker(listfirst, listSecond);
- pickView.setCurrentItems(selectTime / 60, selectTime % 60, 0);
+ pickView.setCurrentItems(firstIndex, secondIndex, 0);
pickView.OnSelectChangeEvent += (value1, value2, value3) =>
{
int minute = Convert.ToInt32(listfirst[value1].Substring(0, 2));
--
Gitblit v1.8.0