From 160785587667cc0d927f85e44c139ec9dde13a9e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 14:30:13 +0800
Subject: [PATCH] 原来的 IOS 工程舍弃（注：没有合并其他组员的代码）
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs | 122 ++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
index 4e48b03..996b9ef 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
@@ -40,74 +40,74 @@
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
/// <param name="dicUser">鐢ㄦ埛鐨勬樉绀烘枃鏈�(key + 鏂囨湰)</param>
- /// <param name="nowSelectUser">褰撳墠閫夋嫨鐨勭敤鎴�</param>
- /// <param name="nowSelectLock">褰撳墠閫夋嫨鐨勫紑閿佹柟寮�</param>
- public void ShowForm(Dictionary<string, string> dicUser, List<string> nowSelectUser, List<int> nowSelectLock)
- {
- this.listSelectUser.Clear();
+ /// <param name="nowSelectUser">褰撳墠閫夋嫨鐨勭敤鎴�</param>
+ /// <param name="nowSelectLock">褰撳墠閫夋嫨鐨勫紑閿佹柟寮�</param>
+ public void ShowForm(Dictionary<string, string> dicUser, List<string> nowSelectUser, List<int> nowSelectLock)
+ {
+ this.listSelectUser.Clear();
this.listSelectUser.AddRange(nowSelectUser);
- this.listSelectLock.Clear();
+ this.listSelectLock.Clear();
this.listSelectLock.AddRange(nowSelectLock);
- this.listOldSelectUser.Clear();
- this.listOldSelectUser.AddRange(nowSelectUser);
-
- this.listOldSelectLock.Clear();
- this.listOldSelectLock.AddRange(nowSelectLock);
-
- //鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame(dicUser);
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private void InitMiddleFrame(Dictionary<string, string> dicUser)
+ this.listOldSelectUser.Clear();
+ this.listOldSelectUser.AddRange(nowSelectUser);
+
+ this.listOldSelectLock.Clear();
+ this.listOldSelectLock.AddRange(nowSelectLock);
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame(dicUser);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame(Dictionary<string, string> dicUser)
{
//寮у害鐨勫渾鐨勪竴鍗婄殑楂樺害(鍥哄畾)
- int halfRoundHeigth = Application.GetRealHeight(116) / 2;
- //澶撮儴楂樺害
+ int halfRoundHeigth = Application.GetRealHeight(116) / 2;
+ //澶撮儴楂樺害
int topHeight = Application.GetRealHeight(195);
//鎼炰竴涓�忔槑鐨勬
var frameTransparent = new FrameLayout();
- frameTransparent.Y = Application.GetRealHeight(933);
+ frameTransparent.Y = Application.GetRealHeight(933);
frameTransparent.Height = Application.GetRealHeight(988) + halfRoundHeigth * 2;//楂樺害灏辨槸瑕佸畠瓒呰繃锛岄殢渚挎悶鐨�
- frameTransparent.BackgroundColor = UserCenterColor.Current.Transparent;
+ frameTransparent.BackgroundColor = UserCenterColor.Current.Transparent;
bodyFrameLayout.AddChidren(frameTransparent);
//鏄庣粏鍒楄〃鐨勬甯冿紝鐧借壊鑳屾櫙(瀹冧笌瀹為檯楂樺害灏忎簡鍗婁釜寮у害鐨勫渾)
- var detailBackFrame = new FrameLayout();
- detailBackFrame.Y = halfRoundHeigth;
+ var detailBackFrame = new FrameLayout();
+ detailBackFrame.Y = halfRoundHeigth;
detailBackFrame.Height = frameTransparent.Height;
- detailBackFrame.BackgroundColor = UserCenterColor.Current.White;
+ detailBackFrame.BackgroundColor = UserCenterColor.Current.White;
frameTransparent.AddChidren(detailBackFrame);
//寮у害鐨勫渾
- var rowRound = new FrameLayout();
- rowRound.Width = bodyFrameLayout.Width;
- rowRound.Height = halfRoundHeigth * 2;
- rowRound.BackgroundColor = UserCenterColor.Current.White;
- rowRound.Radius = (uint)halfRoundHeigth;
- frameTransparent.AddChidren(rowRound);
-
+ var rowRound = new FrameLayout();
+ rowRound.Width = bodyFrameLayout.Width;
+ rowRound.Height = halfRoundHeigth * 2;
+ rowRound.BackgroundColor = UserCenterColor.Current.White;
+ rowRound.Radius = (uint)halfRoundHeigth;
+ frameTransparent.AddChidren(rowRound);
+
//绫诲瀷绛涢��
- var btnTitle = new NormalViewControl(detailBackFrame.Width, Application.GetRealHeight(63), false);
- btnTitle.Y = Application.GetRealHeight(35);
- btnTitle.TextID = R.MyInternationalizationString.uScreeningType;
- btnTitle.TextColor = UserCenterColor.Current.TextColor4;
- btnTitle.TextSize = 16;
- btnTitle.TextAlignment = TextAlignment.Center;
- rowRound.AddChidren(btnTitle);
-
- //閲嶇疆
- var btnReset = new NormalViewControl(200, 58, true);
- btnReset.X = Application.GetRealWidth(81);
- btnReset.Y = Application.GetRealHeight(40);
- btnReset.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnReset.TextID = R.MyInternationalizationString.uResettion;
- rowRound.AddChidren(btnReset);
+ var btnTitle = new NormalViewControl(detailBackFrame.Width, Application.GetRealHeight(63), false);
+ btnTitle.Y = Application.GetRealHeight(35);
+ btnTitle.TextID = R.MyInternationalizationString.uScreeningType;
+ btnTitle.TextColor = UserCenterColor.Current.TextColor4;
+ btnTitle.TextSize = 16;
+ btnTitle.TextAlignment = TextAlignment.Center;
+ rowRound.AddChidren(btnTitle);
+
+ //閲嶇疆
+ var btnReset = new NormalViewControl(200, 58, true);
+ btnReset.X = Application.GetRealWidth(81);
+ btnReset.Y = Application.GetRealHeight(40);
+ btnReset.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnReset.TextID = R.MyInternationalizationString.uResettion;
+ rowRound.AddChidren(btnReset);
btnReset.ButtonClickEvent += (sender, e) =>
{
detailBackFrame.RemoveAll();
@@ -130,13 +130,13 @@
};
//纭畾
- var btnFinish = new NormalViewControl(200, 58, true);
- btnFinish.X = Application.GetRealWidth(800);
- btnFinish.Y = Application.GetRealHeight(40);
- btnFinish.TextAlignment = TextAlignment.CenterRight;
- btnFinish.TextColor = 0xfffb744a;
- btnFinish.TextID = R.MyInternationalizationString.uConfirm1;
- rowRound.AddChidren(btnFinish);
+ var btnFinish = new NormalViewControl(200, 58, true);
+ btnFinish.X = Application.GetRealWidth(800);
+ btnFinish.Y = Application.GetRealHeight(40);
+ btnFinish.TextAlignment = TextAlignment.CenterRight;
+ btnFinish.TextColor = 0xfffb744a;
+ btnFinish.TextID = R.MyInternationalizationString.uConfirm1;
+ rowRound.AddChidren(btnFinish);
btnFinish.ButtonClickEvent += (sender, e) =>
{
FinishSelectEvent?.Invoke(listSelectUser, listSelectLock);
@@ -147,7 +147,7 @@
//绾�
var btnLine = new NormalViewControl(detailBackFrame.Width, ControlCommonResourse.BottomLineHeight, false);
btnLine.Y = Application.GetRealHeight(138) - ControlCommonResourse.BottomLineHeight - halfRoundHeigth;
- btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
detailBackFrame.AddChidren(btnLine);
//鍒濆鍖栭�夋嫨鐢ㄦ埛鎺т欢
@@ -156,7 +156,7 @@
this.InitUnLockSelectControl(detailBackFrame, btnLine.Bottom);
//鍔ㄧ敾鏁堟灉
- frameTransparent.Animate = Animate.DownToUp;
+ frameTransparent.Animate = Animate.DownToUp;
}
#endregion
@@ -240,7 +240,7 @@
var btnLine = new NormalViewControl(Application.GetRealWidth(919), ControlCommonResourse.BottomLineHeight, false);
btnLine.Gravity = Gravity.CenterHorizontal;
btnLine.Y = YY + Application.GetRealHeight(386);
- btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
detailBackFrame.AddChidren(btnLine);
}
@@ -427,11 +427,11 @@
/// <summary>
/// 鐣岄潰鍏抽棴
/// </summary>
- public override void CloseForm()
+ public override void CloseFormBefore()
{
this.FinishSelectEvent = null;
- base.CloseForm();
+ base.CloseFormBefore();
}
#endregion
--
Gitblit v1.8.0