From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaDelayedSettionForm.cs | 105 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 30 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/DelayedSettionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaDelayedSettionForm.cs
similarity index 68%
rename from ZigbeeApp/Shared/Phone/UserCenter/Safety/DelayedSettionMainForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaDelayedSettionForm.cs
index d1fe41d..bff1dff 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/DelayedSettionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaDelayedSettionForm.cs
@@ -8,7 +8,7 @@
/// <summary>
/// 寤舵椂璁剧疆鐨勪富鐣岄潰鈽�
/// </summary>
- public class DelayedSettionMainForm : EditorCommonForm
+ public class GarrisonAreaDelayedSettionForm : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -56,7 +56,7 @@
bodyFrameLayout.AddChidren(frameBack);
//璇ュ姛鑳藉彧瀵瑰嚭鍏ラ槻鍖烘湁鏁�
- var btnTitle = new NormalViewControl(864, 49, true);
+ var btnTitle = new NormalViewControl(864, 50, true);
btnTitle.X = ControlCommonResourse.XXLeft;
btnTitle.Y = Application.GetRealHeight(38);
btnTitle.TextSize = 12;
@@ -134,13 +134,8 @@
row.ButtonClickEvent += (sender, e) =>
{
- List<string> listTime = this.GetTimeList();
- PickerView.Show(listTime, (value) =>
- {
- //淇濆瓨鏃堕棿
- int inTime = Convert.ToInt32(listTime[value].Replace(second, string.Empty).Trim());
- this.SaveTime(inTime, this.timeResponseData.GoOutDelayTime);
- });
+ //鏄剧ず寤舵椂鏃堕棿
+ this.ShowDelayListTime(1);
};
}
@@ -168,13 +163,8 @@
row.ButtonClickEvent += (sender, e) =>
{
- List<string> listTime = this.GetTimeList();
- PickerView.Show(listTime, (value) =>
- {
- //淇濆瓨鏃堕棿
- int outTime = Convert.ToInt32(listTime[value].Replace(second, string.Empty).Trim());
- this.SaveTime(this.timeResponseData.EntranceDelayTime, outTime);
- });
+ //鏄剧ず寤舵椂鏃堕棿
+ this.ShowDelayListTime(2);
};
}
@@ -217,27 +207,82 @@
#endregion
- #region 鈻� 涓�鑸柟娉昣__________________________
+ #region 鈻� 鏄剧ず寤舵椂鏃堕棿_______________________
/// <summary>
- /// 鑾峰彇鏃堕棿鍒楄〃
+ /// 鏄剧ず寤舵椂鏃堕棿鍒楄〃
/// </summary>
- /// <returns></returns>
- private List<string> GetTimeList()
+ /// <param name="div">1:杩涘叆寤惰繜 2:澶栧嚭寤惰繜</param>
+ private void ShowDelayListTime(int div)
{
- List<string> list = new List<string>();
- string second = Language.StringByID(R.MyInternationalizationString.Second);
-
- list.Add("3 " + second);
- for (int i = 5; i <= 120; i = i + 5)
+ //鍒�
+ string strMinute = Language.StringByID(R.MyInternationalizationString.uMinute);
+ //绉�
+ string strSecond = Language.StringByID(R.MyInternationalizationString.uSecond);
+ var listfirst = new List<string>();
+ var listSecond = new List<List<string>>();
+ for (int i = 0; i <= 29; i++)
{
- list.Add(i + " " + second);
+ listfirst.Add(i.ToString().PadLeft(2, '0') + strMinute);
+ var listTemp = new List<string>();
+ for (int j = 0; j <= 59; j++)
+ {
+ if (i == 0 && j == 0)
+ {
+ continue;
+ }
+ listTemp.Add(j.ToString().PadLeft(2, '0') + strSecond);
+ }
+ listSecond.Add(listTemp);
}
- list.Add("180 " + second);
- list.Add("240 " + second);
- list.Add("300 " + second);
+ //鍔犱竴涓�30鍒嗛挓鍚�
+ listfirst.Add("30" + strMinute);
+ var listTemp2 = new List<string>() { "00" + strSecond };
+ listSecond.Add(listTemp2);
- return list;
+ //杩涘叆寤惰繜
+ int delayTime = this.timeResponseData.EntranceDelayTime;
+ string title = Language.StringByID(R.MyInternationalizationString.uInDelayed);
+ if (div == 2)
+ {
+ //澶栧嚭寤惰繜
+ delayTime = this.timeResponseData.GoOutDelayTime;
+ title = Language.StringByID(R.MyInternationalizationString.uOutDelayed);
+ }
+
+ string value = (delayTime / 60).ToString().PadLeft(2, '0') + strMinute;
+ int index1 = listfirst.IndexOf(value);
+ if (index1 == -1)
+ {
+ index1 = 0;
+ }
+ value = (delayTime % 60).ToString().PadLeft(2, '0') + strSecond;
+ int index2 = listSecond[index1].IndexOf(value);
+ if (index2 == -1)
+ {
+ index2 = 0;
+ }
+
+ PickerView.ShowSecondary(listfirst, listSecond, (value1, value2) =>
+ {
+ int minute = Convert.ToInt32(listfirst[value1].Substring(0, 2));
+ int second = Convert.ToInt32(listSecond[value1][value2].Substring(0, 2));
+ int delaySecond = minute * 60 + second;
+ //淇濆瓨鏃堕棿
+ if (div == 1)
+ {
+ //杩涘叆寤惰繜
+ this.SaveTime(delaySecond, this.timeResponseData.GoOutDelayTime);
+ }
+ else
+ {
+ //澶栧嚭寤惰繜
+ this.SaveTime(this.timeResponseData.EntranceDelayTime, delaySecond);
+ }
+ },
+ index1, index2, title,
+ Language.StringByID(R.MyInternationalizationString.uFinish),
+ Language.StringByID(R.MyInternationalizationString.uCancel));
}
#endregion
--
Gitblit v1.8.0