From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
index 3e51ace..a3b41d3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
@@ -112,8 +112,8 @@
{
detailBackFrame.RemoveAll();
//绾�
- var btnLine2 = new NormalViewControl(detailBackFrame.Width, HdlControlResourse.BottomLineHeight, false);
- btnLine2.Y = Application.GetRealHeight(138) - HdlControlResourse.BottomLineHeight - halfRoundHeigth;
+ var btnLine2 = new NormalViewControl(detailBackFrame.Width, ControlCommonResourse.BottomLineHeight, false);
+ btnLine2.Y = Application.GetRealHeight(138) - ControlCommonResourse.BottomLineHeight - halfRoundHeigth;
btnLine2.BackgroundColor = UserCenterColor.Current.ButtomLine;
detailBackFrame.AddChidren(btnLine2);
@@ -145,8 +145,8 @@
};
//绾�
- var btnLine = new NormalViewControl(detailBackFrame.Width, HdlControlResourse.BottomLineHeight, false);
- btnLine.Y = Application.GetRealHeight(138) - HdlControlResourse.BottomLineHeight - halfRoundHeigth;
+ var btnLine = new NormalViewControl(detailBackFrame.Width, ControlCommonResourse.BottomLineHeight, false);
+ btnLine.Y = Application.GetRealHeight(138) - ControlCommonResourse.BottomLineHeight - halfRoundHeigth;
btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
detailBackFrame.AddChidren(btnLine);
@@ -234,7 +234,7 @@
}
//绾�
- var btnLine = new NormalViewControl(Application.GetRealWidth(919), HdlControlResourse.BottomLineHeight, false);
+ 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;
@@ -296,6 +296,22 @@
btnNormallyOpen.TextID = R.MyInternationalizationString.uNormallyOpenMode;
btnNormallyOpen.Name = "9000";
frameDetail.AddChidren(btnNormallyOpen);
+
+ //浜鸿劯璇嗗埆
+ var btnFace = this.InitLockSelectButton(listSelectLock.Contains(14));
+ btnFace.X = btnNormallyOpen.Right + Application.GetRealWidth(26);
+ btnFace.Y = btnNormallyOpen.Y;
+ btnFace.TextID = R.MyInternationalizationString.uFaceRecognition;
+ btnFace.Name = "14";
+ frameDetail.AddChidren(btnFace);
+
+ //闈欒剦绾�
+ var btnStria = this.InitLockSelectButton(listSelectLock.Contains(13));
+ btnStria.X = btnFace.Right + Application.GetRealWidth(26);
+ btnStria.Y = btnNormallyOpen.Y;
+ btnStria.TextID = R.MyInternationalizationString.uStriaVenosus;
+ btnStria.Name = "13";
+ frameDetail.AddChidren(btnStria);
}
#endregion
--
Gitblit v1.8.0