From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs | 232 +++++++++++++--------------------------------------------
1 files changed, 54 insertions(+), 178 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
index e70341a..97eb5c7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
@@ -8,11 +8,14 @@
namespace Shared.Phone.UserCenter.DoorLock
{
- public class EntryStatusPage : DoorLockCommonLayout, ZigBee.Common.IStatus
+ public class EntryStatusPage : DoorLockCommonLayout
{
+ /// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
+ /// <param name="accountObj"></param>
+ /// <param name="entryType"></param>
public EntryStatusPage(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes accountObj, string entryType)
{
this.doorLock = doorLock;
@@ -21,15 +24,27 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
}
- #region 鈼� 鍙橀噺鐢虫槑__________________________
+ #region 鍙橀噺鐢虫槑
+ /// <summary>
+ /// 褰撳墠闂ㄩ攣
+ /// </summary>
ZigBee.Device.DoorLock doorLock;
+ /// <summary>
+ /// 褰撳墠璐︽埛
+ /// </summary>
Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
+ /// <summary>
+ /// 褰撳墠绫诲瀷
+ /// </summary>
string currentType = string.Empty;
+ /// <summary>
+ /// 搴曢儴甯冨眬
+ /// </summary>
FrameLayout bottomFrameLayout;
#endregion
- /// <summary>
- /// UI鏄剧ず
+ /// <summary>
+ /// UI鏄剧ず
/// </summary>
public void Show()
{
@@ -45,15 +60,17 @@
MidFrameLayoutContent();
}
-
+ /// <summary>
+ /// 涓儴甯冨眬
+ /// </summary>
public void MidFrameLayoutContent()
{
var entryStatusPic = new Button
{
X = Application.GetRealWidth(297),
Y = Application.GetRealHeight(268),
- Height = Application.GetRealHeight(363),
- Width = Application.GetRealWidth(452),
+ Height = Application.GetMinRealAverage(363),
+ Width = Application.GetMinRealAverage(452),
UnSelectedImagePath = "DoorLock/EntrySuccessIcon.png",
};
this.midFrameLayout.AddChidren(entryStatusPic);
@@ -78,6 +95,14 @@
{
btnPicTip.Text = Language.StringByID(R.MyInternationalizationString.EntryFingerprintSuccess);
}
+ else if (currentType == "faceID")
+ {
+ btnPicTip.Text = Language.StringByID(R.MyInternationalizationString.EntryFaceIDSuccess);
+ }
+ else if (currentType == "calmFingerprint")
+ {
+ btnPicTip.Text = Language.StringByID(R.MyInternationalizationString.EntryCalmFingerprintSuccess);
+ }
else
{
btnPicTip.Text = Language.StringByID(R.MyInternationalizationString.EntryProximitySuccess);
@@ -85,7 +110,9 @@
BottomFrameLayoutContent();
}
-
+ /// <summary>
+ /// 搴曢儴甯冨眬
+ /// </summary>
public void BottomFrameLayoutContent()
{
bottomFrameLayout = new FrameLayout()
@@ -201,17 +228,33 @@
if (currentType == "password")
{
btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.PasswordRemark);
- btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.Password) + "-" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
+ btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.Password) + "ID" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
}
else if (currentType == "fingerprint")
{
btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.FingerprintRemark);
- btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.Fingerprint) + "-" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
+ btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.Fingerprint) + "ID" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
+ }
+ else if (currentType == "faceID")
+ {
+ btnPasswordRemark.Width = Application.GetRealWidth(222 + 75);
+ btnPasswordRemarkContent.Width = Application.GetRealWidth(965 - 222 - 75);
+ btnPasswordRemarkContent.X = Application.GetRealWidth(222 + 75 + 1);
+ btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.FaceIDRemark);
+ btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.FaceIDMark) + "ID" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
+ }
+ else if (currentType == "calmFingerprint")
+ {
+ btnPasswordRemark.Width = Application.GetRealWidth(222 + 25);
+ btnPasswordRemarkContent.Width = Application.GetRealWidth(965 - 222 - 25);
+ btnPasswordRemarkContent.X = Application.GetRealWidth(222 + 25 + 1);
+ btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.CalmFingerprintRemark);
+ btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.CalmFingerprintMark) + "ID" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
}
else
{
btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.ProximityRemark);
- btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.ProximityCard) + "-" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
+ btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.IcCard) + "ID" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
}
if (!string.IsNullOrEmpty(curAccountObj.UserName))
@@ -324,172 +367,5 @@
}
};
}
-
- public void MatchUsersFrameLayout()
- {
- var flMain = new FrameLayout { BackgroundColor = 0x0f000000 };
- this.midFrameLayout.AddChidren(flMain);
- flMain.MouseUpEventHandler += (sender11, e11) =>
- {
- flMain.RemoveFromParent();
- bottomFrameLayout.RemoveAll();
- BottomFrameLayoutContent();
- };
- bottomFrameLayout = new FrameLayout()
- {
- Height = Application.GetRealHeight(100),
- Y = Application.GetRealHeight(930),
- Radius = 17,
- BackgroundColor = ZigbeeColor.Current.XMWhite,
- };
- flMain.AddChidren(bottomFrameLayout);
-
- var bottomFrameLayout1 = new FrameLayout()
- {
- Height = Application.GetRealHeight(806 - 50),
- Y = Application.GetRealHeight(930 + 48),
- BackgroundColor = ZigbeeColor.Current.XMWhite,
- };
- flMain.AddChidren(bottomFrameLayout1);
-
- var bottomFrameLayout2 = new FrameLayout()
- {
- Height = Application.GetRealHeight(806),
- Y = Application.GetRealHeight(930),
- };
- flMain.AddChidren(bottomFrameLayout2);
-
- var matchUsersFrameLayout = new FrameLayout()
- {
- Height = Application.GetRealHeight(138),
- };
- bottomFrameLayout2.AddChidren(matchUsersFrameLayout);
-
- var btnCancel = new Button
- {
- X = Application.GetRealWidth(81),
- Y = Application.GetRealHeight(40),
- Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(101),
- Text = Language.StringByID(R.MyInternationalizationString.Cancel),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- TextSize = 14,
- };
- matchUsersFrameLayout.AddChidren(btnCancel);
-
- var btnMatchUser = new Button
- {
- X = Application.GetRealWidth(446),
- Y = Application.GetRealHeight(35),
- Height = Application.GetRealHeight(63),
- Width = Application.GetRealWidth(284),
- Text = Language.StringByID(R.MyInternationalizationString.MatchPerson),
- TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
- TextSize = 16,
- };
- matchUsersFrameLayout.AddChidren(btnMatchUser);
-
- var btnFinish = new Button
- {
- X = Application.GetRealWidth(919),
- Y = Application.GetRealHeight(40),
- Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(101),
- Text = Language.StringByID(R.MyInternationalizationString.Complete),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- TextSize = 14,
- };
- matchUsersFrameLayout.AddChidren(btnFinish);
-
- var btnTopLine = new FrameLayout()
- {
- Height = Application.GetRealHeight(5),
- Y = Application.GetRealHeight(138),
- BackgroundColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- };
- bottomFrameLayout2.AddChidren(btnTopLine);
-
- var matchUserHorizontalScrolViewLayout = new VerticalScrolViewLayout()
- {
- Y = Application.GetRealHeight(207),
- Height = Application.GetRealHeight(806 - 207),
- };
- bottomFrameLayout2.AddChidren(matchUserHorizontalScrolViewLayout);
-
- for (var i = 0; i < 4; i++)
- {
- var rowFrameLayout = new FrameLayout()
- {
- Height = Application.GetRealHeight(127),
- };
- matchUserHorizontalScrolViewLayout.AddChidren(rowFrameLayout);
-
- var btnUserName = new Button()
- {
- Width = Application.GetRealWidth(743),
- Height = Application.GetRealHeight(58),
- X = Application.GetRealWidth(81),
- Y = Application.GetRealHeight(37),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- TextSize = 14,
- TextAlignment = TextAlignment.CenterLeft,
- };
- rowFrameLayout.AddChidren(btnUserName);
-
- var btnChoose = new Button()
- {
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
- X = Application.GetRealWidth(861 + 81),
- Y = Application.GetRealHeight(35),
- BackgroundColor = ZigbeeColor.Current.XMOrange,
- };
- rowFrameLayout.AddChidren(btnChoose);
-
- var btnLine = new FrameLayout()
- {
- Width = Application.GetRealWidth(919),
- Height = Application.GetRealHeight(5),
- X = Application.GetRealWidth(81),
- Y = Application.GetRealHeight(122),
- BackgroundColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- };
- rowFrameLayout.AddChidren(btnLine);
- }
- }
-
- #region 鈼� 鎺ュ彛瀹炵幇__________________________
- /// <summary>
- /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
- /// </summary>
- /// <returns>The changed.</returns>
- /// <param name="common">Common.</param>
- public void Changed(CommonDevice common)
- {
-
- }
- /// <summary>
- /// 澶勭悊鍙樺寲浜嬩欢
- /// </summary>
- /// <param name="common"></param>
- /// <param name="typeTag"></param>
- public void DeviceInfoChange(CommonDevice common, string typeTag)
- {
- }
- /// <summary>
- /// Changeds the IL ogic status.
- /// </summary>
- /// <param name="logic">Logic.</param>
- public void ChangedILogicStatus(ZigBee.Device.Logic logic)
- {
- }
- /// <summary>
- /// Changeds the IS cene status.
- /// </summary>
- /// <param name="scene">Scene.</param>
- public void ChangedISceneStatus(Scene scene)
- {
- }
- #endregion
}
}
--
Gitblit v1.8.0