From 0fa1534827bd21d763216550d11006fc1441c6cb Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 14 五月 2021 17:08:45 +0800
Subject: [PATCH] 门锁初始上传
---
HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 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..ff9854e 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
{
@@ -33,7 +33,7 @@
int selectHour = 0;
int selectMinute = 0;
//XX鏃�
- List<string> listHour ;
+ List<string> listHour;
//XX鍒�
List<string> listMinute;
@@ -43,15 +43,15 @@
#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.StrTitle = i_title;
+ base.RowCount = 5;
for (int i = 0; i <= 23; i++)
{
@@ -65,11 +65,11 @@
/// <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;
@@ -87,14 +87,20 @@
/// <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)
{
//宸茬粡鍒濆鍖�
if (base.btnCancel != null) { return; }
+ this.selectHour = i_hour;
+ this.selectMinute = i_minute;
+
//鍒濆鍖栧簳灞傛帶浠�
var frameWhiteBack = base.InitBaseControl();
- frameWhiteBack.Height = Application.GetRealHeight(contentView);
+ if (contentView != -1)
+ {
+ frameWhiteBack.Height = Application.GetRealHeight(contentView);
+ }
//frameWhiteBack.Y = frameWhiteBack.Parent.Height - Application.GetRealHeight(297 + 20);
//鍙栨秷
@@ -125,15 +131,15 @@
//鏃堕棿鎺т欢
pickerView = new UIPickerView();
//鏃�
- var strhour = Language.StringByID(StringId.h);
+ var strhour = HdlCommonLogic.Current.GetHourText();
//鍒�
- var strMinute = Language.StringByID(StringId.m);
+ var strMinute = HdlCommonLogic.Current.GetMinuteText();
//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)
+ foreach (var hItem in hRange)
{
listHour.Add(hItem.ToString().PadLeft(2, '0') + strhour);
}
--
Gitblit v1.8.0