From cb6e11c5067ecaba4d8f9907989154167c1e8943 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:15:05 +0800
Subject: [PATCH] Merge branch 'wxr4' into dev-tzy
---
HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs | 159 +++++++++++++++++++++-------------------------------
1 files changed, 64 insertions(+), 95 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs b/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
index 40db4f7..924fa9d 100644
--- a/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
+++ b/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
@@ -7,7 +7,7 @@
namespace HDL_ON.Stan
{
/// <summary>
- /// 搴曢儴鏃堕棿閫夋嫨鎺т欢(鏃跺拰鍒�),涓嶉渶瑕佸姞鍒扮埗鎺т欢
+ /// 搴曢儴鏃堕棿閫夋嫨鎺т欢
/// </summary>
public class BottomTimeSelectControl : BottomDialogCommon
{
@@ -17,24 +17,24 @@
/// 缁撴潫浜嬩欢(0:鐐瑰嚮浜嗗彇娑� 1:鐐瑰嚮浜嗙‘瀹�,绗簩,涓夊弬鏁颁负鏃跺拰鍒�)
/// </summary>
public Action<int, int, int> FinishEvent = null;
- /// <summary>
- /// 灏忔椂鍙栧�艰寖鍥�
+ /// <summary>
+ /// 灏忔椂鍙栧�艰寖鍥�
/// </summary>
List<int> hRange = new List<int>();
- /// <summary>
- /// 鍒嗛挓鍙栧�艰寖鍥�
+ /// <summary>
+ /// 鍒嗛挓鍙栧�艰寖鍥�
/// </summary>
- List<int> mRange = new List<int>();
- /// <summary>
- /// 鏃堕棿鎺т欢
- /// </summary>
- UIPickerView pickerView;
- //閫夋嫨鐨勬椂涓庡垎
- int selectHour = 0;
- int selectMinute = 0;
- //XX鏃�
- List<string> listHour;
- //XX鍒�
+ List<int> mRange = new List<int>();
+ /// <summary>
+ /// 鏃堕棿鎺т欢
+ /// </summary>
+ UIPickerView pickerView;
+ //閫夋嫨鐨勬椂涓庡垎
+ int selectHour = 0;
+ int selectMinute = 0;
+ //XX鏃�
+ List<string> listHour ;
+ //XX鍒�
List<string> listMinute;
@@ -43,16 +43,16 @@
#region 鈻� 鍒濆鍖朹____________________________
/// <summary>
- /// 搴曢儴鏃堕棿閫夋嫨鎺т欢(鏃跺拰鍒�),涓嶉渶瑕佸姞鍒扮埗鎺т欢
+ /// 搴曢儴鏃堕棿閫夋嫨鎺т欢
/// </summary>
/// <param name="i_title">鏍囬</param>
/// <param name="clickBackClose">鐐瑰嚮鑳屾櫙鏃�,鏄惁鍏抽棴寮圭獥</param>
public BottomTimeSelectControl(string i_title = "", bool clickBackClose = true)
{
base.ClickBackClose = clickBackClose;
- base.StrTitle = i_title;
- base.RowCount = 5;
-
+ base.StrTitle = i_title;
+
+
for (int i = 0; i <= 23; i++)
{
hRange.Add(i);
@@ -61,23 +61,23 @@
{
mRange.Add(i);
}
- }
-
-
+ }
+
+
/// <summary>
- /// 搴曢儴鏃堕棿閫夋嫨鎺т欢(鏃跺拰鍒�),涓嶉渶瑕佸姞鍒扮埗鎺т欢
+ /// 搴曢儴鏃堕棿閫夋嫨鎺т欢
/// </summary>
/// <param name="i_title">鏍囬</param>
/// <param name="clickBackClose">鐐瑰嚮鑳屾櫙鏃�,鏄惁鍏抽棴寮圭獥</param>
- public BottomTimeSelectControl(List<int> hoursRange, List<int> minuteRange, int rowCount, string i_title = "", bool clickBackClose = true)
+ public BottomTimeSelectControl(List<int> hoursRange,List<int> minuteRange ,int rowCount, string i_title = "", bool clickBackClose = true)
{
base.ClickBackClose = clickBackClose;
base.StrTitle = i_title;
- hRange = hoursRange;
- mRange = minuteRange;
-
- base.RowCount = rowCount;
+ hRange = hoursRange;
+ mRange = minuteRange;
+
+ base.RowCount = rowCount;
}
@@ -92,15 +92,9 @@
//宸茬粡鍒濆鍖�
if (base.btnCancel != null) { return; }
- this.selectHour = i_hour;
- this.selectMinute = i_minute;
-
//鍒濆鍖栧簳灞傛帶浠�
var frameWhiteBack = base.InitBaseControl();
- if (contentView != -1)
- {
- frameWhiteBack.Height = Application.GetRealHeight(contentView);
- }
+ frameWhiteBack.Height = Application.GetRealHeight(contentView);
//frameWhiteBack.Y = frameWhiteBack.Parent.Height - Application.GetRealHeight(297 + 20);
//鍙栨秷
@@ -131,27 +125,27 @@
//鏃堕棿鎺т欢
pickerView = new UIPickerView();
//鏃�
- var strhour = HdlCommonLogic.Current.GetHourText();
+ var strhour = Language.StringByID(StringId.h);
//鍒�
- var strMinute = HdlCommonLogic.Current.GetMinuteText();
-
- if(!isHour)
- {
- strhour = Language.StringByID(StringId.m);
+ 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鍒�
- listMinute = new List<string>();// { "00" + strMinute };
- //for (int i = 1; i <= 23; i++)
- foreach (var hItem in hRange)
+ listMinute = new List<string>();// { "00" + strMinute };
+ //for (int i = 1; i <= 23; i++)
+ foreach(var hItem in hRange)
{
listHour.Add(hItem.ToString().PadLeft(2, '0') + strhour);
- }
- //for (int i = 1; i <= 59; i++)
- foreach (var mItem in mRange)
+ }
+ //for (int i = 1; i <= 59; i++)
+ foreach (var mItem in mRange)
{
listMinute.Add(mItem.ToString().PadLeft(2, '0') + strMinute);
}
@@ -177,57 +171,32 @@
};
}
- /// <summary>
- /// 鐗规畩鐨勯泦鍚堥�夋嫨浜嬩欢锛屽噳闇告椂闂磋缃娇鐢�
+ /// <summary>
+ /// 鐗规畩鐨勯泦鍚堥�夋嫨浜嬩欢锛屽噳闇告椂闂磋缃娇鐢�
/// </summary>
- public void ChangePickerEvent()
- {
+ public void ChangePickerEvent()
+ {
pickerView.OnSelectChangeEvent = (value1, value2, value3) =>
- {
- if (value1 == 0 && value2 == 0)
- {
- value2 = 1;
- pickerView.setCurrentItems(value1, value2, 0);
+ {
+ if (value1 == 0 && value2 == 0)
+ {
+ value2 = 1;
+ pickerView.setCurrentItems(value1, value2, 0);
+ }
+ else if (value1 == 4 && value2 == 1)
+ {
+ value2 = 0;
+ pickerView.setCurrentItems(value1, value2, 0);
+ }
+ //else
+ {
+ //鏇存敼绱㈠紩
+ selectHour = Convert.ToInt32(listHour[value1].Substring(0, 2));
+ selectMinute = Convert.ToInt32(listMinute[value2].Substring(0, 2));
}
- else if (value1 == 4 && value2 == 1)
- {
- value2 = 0;
- pickerView.setCurrentItems(value1, value2, 0);
- }
- else
- {
- //鏇存敼绱㈠紩
- selectHour = Convert.ToInt32(listHour[value1].Substring(0, 2));
- selectMinute = Convert.ToInt32(listMinute[value2].Substring(0, 2));
- }
- };
- }
+ };
+ }
- /// <summary>
- /// 鐗规畩鐨勯泦鍚堥�夋嫨浜嬩欢锛屽満鏅椂闂磋缃娇鐢�
- /// </summary>
- public void ChangePickerEvent2()
- {
- pickerView.OnSelectChangeEvent = (value1, value2, value3) =>
- {
- if (value1 == 60 && value2 == 60)
- {
- value2 = 0;
- pickerView.setCurrentItems(value1, value2, 0);
- }
- //else if (value1 == 4 && value2 == 1)
- //{
- // value2 = 0;
- // pickerView.setCurrentItems(value1, value2, 0);
- //}
- //else
- //{
- // //鏇存敼绱㈠紩
- // selectHour = Convert.ToInt32(listHour[value1].Substring(0, 2));
- // selectMinute = Convert.ToInt32(listMinute[value2].Substring(0, 2));
- //}
- };
- }
#endregion
#region 鈻� 涓�鑸柟娉昣__________________________
--
Gitblit v1.8.0