From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs b/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
index 49c40dd..924fa9d 100644
--- a/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
+++ b/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
@@ -87,7 +87,7 @@
/// <param name="i_hour">榛樿閫夋嫨鏃�</param>
/// <param name="i_minute">榛樿閫夋嫨鍒�</param>
/// <param name="contentView">閫夋嫨鍖哄煙楂樺害</param>
- public void InitControl(int i_hour, int i_minute,int contentView = 297)
+ public void InitControl(int i_hour, int i_minute,int contentView = 297,bool isHour = true)
{
//宸茬粡鍒濆鍖�
if (base.btnCancel != null) { return; }
@@ -108,7 +108,7 @@
base.btnConfirm.ButtonClickEvent += (sender, e) =>
{
//鏈夐�夋嫨浜嗘墠鑳界偣纭
- if (selectHour != 0 || selectMinute != 0)
+ //if (selectHour != 0 || selectMinute != 0)
{
base.Close();
this.FinishEvent?.Invoke(1, selectHour, selectMinute);
@@ -128,6 +128,13 @@
var strhour = Language.StringByID(StringId.h);
//鍒�
var strMinute = Language.StringByID(StringId.m);
+
+ if(!isHour)
+ {
+ strhour = Language.StringByID(StringId.m);
+ strMinute = Language.StringByID(StringId.s);
+ }
+
//XX鏃�
listHour = new List<string>();// { "00" + strhour };
//XX鍒�
@@ -181,14 +188,14 @@
value2 = 0;
pickerView.setCurrentItems(value1, value2, 0);
}
- else
+ //else
{
//鏇存敼绱㈠紩
selectHour = Convert.ToInt32(listHour[value1].Substring(0, 2));
selectMinute = Convert.ToInt32(listMinute[value2].Substring(0, 2));
}
};
- }
+ }
#endregion
--
Gitblit v1.8.0