From 404cdc88627f942df7944af04ee05b9d527752d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 九月 2019 13:22:40 +0800
Subject: [PATCH] 合并了徐梅的按键面板绑定
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/DelayedSettionMainForm.cs | 149 +++++++++++++++++++++++++++----------------------
1 files changed, 81 insertions(+), 68 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/DelayedSettionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/DelayedSettionMainForm.cs
index d5d1fd4..d1fe41d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/DelayedSettionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/DelayedSettionMainForm.cs
@@ -8,7 +8,7 @@
/// <summary>
/// 寤舵椂璁剧疆鐨勪富鐣岄潰鈽�
/// </summary>
- public class DelayedSettionMainForm : UserCenterCommonForm
+ public class DelayedSettionMainForm : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -19,42 +19,58 @@
/// <summary>
/// 杩涘叆寤惰繜鐨勬椂闂存帶浠�
/// </summary>
- private RowSecondRightTextView inDelayTimeControl = null;
+ private NormalViewControl inDelayTimeControl = null;
/// <summary>
/// 澶栧嚭寤惰繜鐨勬椂闂存帶浠�
/// </summary>
- private RowSecondRightTextView outDelayTimeControl = null;
+ private NormalViewControl outDelayTimeControl = null;
#endregion
#region 鈻� 鍒濆鍖朹____________________________
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- public void ShowForm()
- {
- //璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uDelayedSettion));
-
- //鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private void InitMiddleFrame()
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
{
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uDelayedSettion));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ //鑳屾櫙
+ var frameBack = new FrameLayout();
+ frameBack.Height = Application.GetRealHeight(423);
+ frameBack.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(frameBack);
+
//璇ュ姛鑳藉彧瀵瑰嚭鍏ラ槻鍖烘湁鏁�
- var btnTitle = new TitleViewControl();
- btnTitle.TextColor = UserCenterColor.Current.TextGrayColor;
- btnTitle.Y = Application.GetRealHeight(40);
+ var btnTitle = new NormalViewControl(864, 49, true);
+ btnTitle.X = ControlCommonResourse.XXLeft;
+ btnTitle.Y = Application.GetRealHeight(38);
+ btnTitle.TextSize = 12;
+ btnTitle.TextColor = UserCenterColor.Current.TextGrayColor2;
btnTitle.TextID = R.MyInternationalizationString.uThisFunctionOnlyInAndOutSectors;
- bodyFrameLayout.AddChidren(btnTitle);
-
- //娣诲姞鎵�鏈夌殑鑿滃崟
- this.AddAllMenuRow(btnTitle);
+ frameBack.AddChidren(btnTitle);
+
+ var frameTable = new FrameListControl(29);
+ frameTable.Y = btnTitle.Bottom + Application.GetRealHeight(38);
+ frameTable.Height = frameBack.Height - btnTitle.Bottom - Application.GetRealHeight(38);
+ bodyFrameLayout.AddChidren(frameTable);
+
+ //娣诲姞鎵�鏈夌殑鑿滃崟
+ this.AddAllMenuRow(frameTable);
}
#endregion
@@ -64,14 +80,14 @@
/// <summary>
/// 娣诲姞鎵�鏈夌殑鑿滃崟
/// </summary>
- /// <param name="btnTitle"></param>
- private async void AddAllMenuRow(TitleViewControl btnTitle)
+ /// <param name="listView"></param>
+ private async void AddAllMenuRow(FrameListControl listView)
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
//鑾峰彇闃插尯鐨勫欢杩熸椂闂�(浠呴檺鍑哄叆闃插尯),鍑洪敊鏃惰繑鍥瀗ull
- this.timeResponseData = await Common.LocalSafeguard.Current.GetGarrisonDelayTime();
+ this.timeResponseData = await HdlSafeguardLogic.Current.GetGarrisonDelayTime();
if (timeResponseData == null)
{
//鍏抽棴杩涘害鏉�
@@ -84,10 +100,10 @@
Application.RunOnMainThread(() =>
{
//鍒濆鍖栥�愯繘鍏ュ欢鏃躲�戣
- this.InitInDelayedRow(btnTitle);
+ this.InitInDelayedRow(listView);
//鍒濆鍖栥�愬鍑哄欢鏃躲�戣
- this.InitOutDelayedRow(btnTitle);
+ this.InitOutDelayedRow(listView);
});
}
@@ -98,34 +114,31 @@
/// <summary>
/// 鍒濆鍖栥�愯繘鍏ュ欢鏃躲�戣
/// </summary>
- /// <param name="titleView"></param>
- private void InitInDelayedRow(TitleViewControl titleView)
+ /// <param name="listView"></param>
+ private void InitInDelayedRow(FrameListControl listView)
{
- var rowLayout = new StatuRowLayout();
- rowLayout.Y = titleView.Bottom;
- bodyFrameLayout.AddChidren(rowLayout);
+ var row = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row);
+ row.Y = 0 - listView.rowSpace;
//杩涘叆寤舵椂
- var txName = new RowCenterView(false);
- txName.TextID = R.MyInternationalizationString.uInDelayed;
- rowLayout.AddChidren(txName);
-
+ row.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uInDelayed), 500);
+ //娣诲姞鍙崇澶�
+ row.AddRightArrow();
+ //搴曠嚎
+ row.AddBottomLine();
//鏃堕棿
string second = Language.StringByID(R.MyInternationalizationString.Second);
- this.inDelayTimeControl = new RowSecondRightTextView();
- inDelayTimeControl.Text = this.timeResponseData.EntranceDelayTime + " " + second;
- rowLayout.AddChidren(inDelayTimeControl);
+ this.inDelayTimeControl = row.AddMostRightView(this.timeResponseData.EntranceDelayTime + " " + second, 200);
+ this.inDelayTimeControl.TextColor = UserCenterColor.Current.TextGrayColor1;
- //娣诲姞鍙崇澶�
- rowLayout.AddRightIconControl();
-
- rowLayout.MouseUpEvent += (sender, e) =>
+ row.ButtonClickEvent += (sender, e) =>
{
List<string> listTime = this.GetTimeList();
PickerView.Show(listTime, (value) =>
{
//淇濆瓨鏃堕棿
- int inTime = Convert.ToInt32(value.Replace(second, string.Empty).Trim());
+ int inTime = Convert.ToInt32(listTime[value].Replace(second, string.Empty).Trim());
this.SaveTime(inTime, this.timeResponseData.GoOutDelayTime);
});
};
@@ -138,34 +151,28 @@
/// <summary>
/// 鍒濆鍖栥�愬鍑哄欢鏃躲�戣
/// </summary>
- /// <param name="titleView"></param>
- private void InitOutDelayedRow(TitleViewControl titleView)
+ /// <param name="listView"></param>
+ private void InitOutDelayedRow(FrameListControl listView)
{
- var rowLayout = new StatuRowLayout();
- rowLayout.Y = titleView.Bottom + ControlCommonResourse.ListViewRowHeight;
- bodyFrameLayout.AddChidren(rowLayout);
+ var row = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row);
//澶栧嚭寤舵椂
- var txName = new RowCenterView(false);
- txName.TextID = R.MyInternationalizationString.uOutDelayed;
- rowLayout.AddChidren(txName);
-
+ row.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uOutDelayed), 500);
+ //娣诲姞鍙崇澶�
+ row.AddRightArrow();
//鏃堕棿
string second = Language.StringByID(R.MyInternationalizationString.Second);
- this.outDelayTimeControl = new RowSecondRightTextView();
- outDelayTimeControl.Text = this.timeResponseData.GoOutDelayTime + " " + second;
- rowLayout.AddChidren(outDelayTimeControl);
+ this.outDelayTimeControl = row.AddMostRightView(this.timeResponseData.GoOutDelayTime + " " + second, 200);
+ this.outDelayTimeControl.TextColor = UserCenterColor.Current.TextGrayColor1;
- //娣诲姞鍙崇澶�
- rowLayout.AddRightIconControl();
-
- rowLayout.MouseUpEvent += (sender, e) =>
+ row.ButtonClickEvent += (sender, e) =>
{
List<string> listTime = this.GetTimeList();
PickerView.Show(listTime, (value) =>
{
//淇濆瓨鏃堕棿
- int outTime = Convert.ToInt32(value.Replace(second, string.Empty).Trim());
+ int outTime = Convert.ToInt32(listTime[value].Replace(second, string.Empty).Trim());
this.SaveTime(this.timeResponseData.EntranceDelayTime, outTime);
});
};
@@ -184,7 +191,7 @@
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
- var result = await Common.LocalSafeguard.Current.SetGarrisonDelayTime(inDelayTime, OutDelayTime);
+ var result = await HdlSafeguardLogic.Current.SetGarrisonDelayTime(inDelayTime, OutDelayTime);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
@@ -196,8 +203,14 @@
Application.RunOnMainThread(() =>
{
string second = Language.StringByID(R.MyInternationalizationString.Second);
- this.inDelayTimeControl.Text = inDelayTime + " " + second;
- this.outDelayTimeControl.Text = OutDelayTime + " " + second;
+ if (this.inDelayTimeControl != null)
+ {
+ this.inDelayTimeControl.Text = inDelayTime + " " + second;
+ }
+ if (this.outDelayTimeControl != null)
+ {
+ this.outDelayTimeControl.Text = OutDelayTime + " " + second;
+ }
});
}
}
--
Gitblit v1.8.0