From 3aa397ab145382935492b11c1f18c9634e69910b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 10 十二月 2020 16:45:00 +0800
Subject: [PATCH] 请合并，门锁和晾衣架第一版代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
old mode 100755
new mode 100644
index aee5ff4..4d78011
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
@@ -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);
--
Gitblit v1.8.0