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 | 68 ++++++++++++++-------------------
1 files changed, 29 insertions(+), 39 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
index 0217b3a..97eb5c7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
@@ -8,7 +8,7 @@
namespace Shared.Phone.UserCenter.DoorLock
{
- public class EntryStatusPage : DoorLockCommonLayout, ZigBee.Common.IStatus
+ public class EntryStatusPage : DoorLockCommonLayout
{
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -43,8 +43,8 @@
FrameLayout bottomFrameLayout;
#endregion
- /// <summary>
- /// UI鏄剧ず
+ /// <summary>
+ /// UI鏄剧ず
/// </summary>
public void Show()
{
@@ -69,8 +69,8 @@
{
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);
@@ -94,6 +94,14 @@
else if (currentType == "fingerprint")
{
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
{
@@ -227,6 +235,22 @@
btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.FingerprintRemark);
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);
@@ -343,39 +367,5 @@
}
};
}
-
- #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