From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs | 67 ++++-----------------------------
1 files changed, 8 insertions(+), 59 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs
index 1f5b154..62070d8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs
@@ -10,7 +10,7 @@
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
- public AddUnLockMethodTip(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes accountObj, string entryType)
+ public AddUnLockMethodTip(ZigBee.Device.DoorLock doorLock, MemberInfoRes accountObj, string entryType)
{
this.doorLock = doorLock;
this.curAccountObj = accountObj;
@@ -26,7 +26,7 @@
/// <summary>
/// 褰撳墠璐︽埛
/// </summary>
- Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
+ MemberInfoRes curAccountObj;
/// <summary>
/// 褰撳墠绫诲瀷
/// </summary>
@@ -55,14 +55,6 @@
else if (currentType == "proximity")
{
currentTitle = Language.StringByID(R.MyInternationalizationString.AddIcCard);
- }
- else if (currentType == "faceID")
- {
- currentTitle = Language.StringByID(R.MyInternationalizationString.AddDoorLockFaceID);
- }
- else if (currentType == "calmFingerprint")
- {
- currentTitle = Language.StringByID(R.MyInternationalizationString.AddDoorLockCalmFingerprint);
}
this.TopFrameLayout(this, currentTitle);
@@ -107,7 +99,7 @@
{
X = Application.GetRealWidth(446),
Y = Application.GetRealHeight(330),
- Height = Application.GetRealHeight(80 / 2),
+ Height = Application.GetRealHeight(76 / 2),
Width = Application.GetRealWidth(407),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
TextSize = 10,
@@ -118,7 +110,7 @@
var btnPicTip2 = new Button
{
X = Application.GetRealWidth(446),
- Y = btnPicTip1.Y + Application.GetRealHeight(30),
+ Y = btnPicTip1.Bottom,
Height = Application.GetRealHeight(76 / 2),
Width = Application.GetRealWidth(207),
TextColor = Shared.Common.ZigbeeColor.Current.XMGray2,
@@ -223,41 +215,6 @@
btnPicTip4.Text = btnPicTip2.Text;
btnPicTip5.Text = Language.StringByID(R.MyInternationalizationString.EntryTip);
}
- else if (currentType == "faceID")
- {
- topMidFrameLayout.BackgroundImagePath = "DoorLock/AddFaceIDTipPic.png";
- topMidFrameLayout.X = Application.GetMinRealAverage(158);
- topMidFrameLayout.Height = Application.GetMinRealAverage(789);
- topMidFrameLayout.Width = Application.GetMinRealAverage(818);
- btnPicTip2.Width = btnPicTip1.Width = Application.GetMinRealAverage(307);
- btnPicTip3.Width = Application.GetMinRealAverage(576);
- btnPicTip1.X = btnPicTip2.X = Application.GetMinRealAverage(420);
- btnPicTip1.Y = Application.GetMinRealAverage(325);
- btnPicTip2.Y = btnPicTip1.Y + Application.GetMinRealAverage(30);
- btnPicTip3.Y = Application.GetMinRealAverage(1089);
- btnPicTip4.Y = btnPicTip3.Y + Application.GetMinRealAverage(50);
- btnPicTip3.X = Application.GetMinRealAverage(233);
- btnPicTip4.X = Application.GetRealWidth(397 + 40);
- btnPicTip1.Text = Language.StringByID(R.MyInternationalizationString.EntryFaceIDTip1);
- btnPicTip2.Text = Language.StringByID(R.MyInternationalizationString.EntryFaceIDTip2);
- btnPicTip3.Text = Language.StringByID(R.MyInternationalizationString.EntryFaceIDTip3);
- btnPicTip4.Text = Language.StringByID(R.MyInternationalizationString.EntryFaceIDTip4);
- btnPicTip5.Text = Language.StringByID(R.MyInternationalizationString.EntryTip);
- }
- else if (currentType == "calmFingerprint")
- {
- topMidFrameLayout.BackgroundImagePath = "DoorLock/AddFingerprintTipPic.png";
- btnPicTip1.Text = Language.StringByID(R.MyInternationalizationString.EntryFingerprintTip1);
- btnPicTip2.Text = Language.StringByID(R.MyInternationalizationString.EntryCalmFingerprint);
- btnPicTip3.Text = Language.StringByID(R.MyInternationalizationString.EntryFingerprintTip2);
- btnPicTip4.Text = btnPicTip2.Text;
- btnPicTip1.X = Application.GetRealWidth(486);
- btnPicTip1.Y = Application.GetRealHeight(320);
- btnPicTip2.X = Application.GetRealWidth(517);
- btnPicTip2.Width = Application.GetRealWidth(207);
- btnPicTip1.X = Application.GetRealWidth(450);
- btnPicTip5.Text = Language.StringByID(R.MyInternationalizationString.EntryTip);
- }
action = (topic, data) =>
{
@@ -285,22 +242,14 @@
{
curMethod = 0;
}
- else if (currentType == "proximity")
- {
- curMethod = 3;
- }
- else if (currentType == "calmFingerprint")
- {
- curMethod = 13;
- }
- else if (currentType == "faceID")
- {
- curMethod = 14;
- }
else if (currentType == "fingerprint")
{
curMethod = 15;
}
+ else if (currentType == "proximity")
+ {
+ curMethod = 3;
+ }
else
{
return;
--
Gitblit v1.8.0