From 1b42f39e34492ba8d4ce6336cc913877b9e064cb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:30:05 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index 9727a29..9d37ba1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -107,9 +107,9 @@
var systeMinute = DateTime.Now.Minute;//鑾峰彇鍒嗛挓
int systemHourIndex = 0;
int systeMinuteIndex = 0;
- for (int i = 0; i < timePointView.GethIntList0().Count; i++)
+ for (int i = 0; i < timePointView.GethIntList().Count; i++)
{
- var currhour = timePointView.GethIntList0()[i];
+ var currhour = timePointView.GethIntList()[i];
if (systemHour == currhour)
{
systemHourIndex = i;
@@ -160,7 +160,7 @@
int hIndex = timePointView.GetValueIndex(timeValue, 0, 1, timePointView.GethIntList());
int mIndex = timePointView.GetValueIndex(timeValue, 1, 0, timePointView.GetmIntList());
//鏇存柊鍒濆鐘舵��
- timePointView.mUIPickerView.setCurrentItems(hIndex - 1, mIndex, 0);
+ timePointView.mUIPickerView.setCurrentItems(hIndex, mIndex, 0);
timepoint = timeValue;
}
}
@@ -378,9 +378,9 @@
var systeMinute = DateTime.Now.Minute;//鑾峰彇鍒嗛挓
int systemHourIndex = 0;
int systeMinuteIndex = 0;
- for (int i = 0; i < timePointView.GethIntList0().Count; i++)
+ for (int i = 0; i < timePointView.GethIntList().Count; i++)
{
- var currhour = timePointView.GethIntList0()[i];
+ var currhour = timePointView.GethIntList()[i];
if (systemHour == currhour)
{
systemHourIndex = i;
@@ -447,7 +447,7 @@
int hourIndex = timePointView.GetValueIndex(timepoint, 0, 1, timePointView.GethIntList());
int minuteIndex = timePointView.GetValueIndex(timepoint, 1, 0, timePointView.GetmIntList());
//鏇存柊鐘舵��
- timePointView.mUIPickerView.setCurrentItems(hourIndex - 1, minuteIndex, 0);
+ timePointView.mUIPickerView.setCurrentItems(hourIndex, minuteIndex, 0);
}
//閫変腑鏃堕棿鍥炶皟鏂规硶,鏃堕棿鍙樺寲涓�娆″洖璋冧竴娆�
--
Gitblit v1.8.0