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/AddUnLockMethod.cs | 78 ++++++++++-----------------------------
1 files changed, 20 insertions(+), 58 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethod.cs
index 4195a9e..34863dc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethod.cs
@@ -8,7 +8,7 @@
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
- public AddUnLockMethod(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes accountObj)
+ public AddUnLockMethod(ZigBee.Device.DoorLock doorLock, MemberInfoRes accountObj)
{
this.doorLock = doorLock;
this.curAccountObj = accountObj;
@@ -23,7 +23,7 @@
/// <summary>
/// 褰撳墠璐︽埛
/// </summary>
- Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
+ MemberInfoRes curAccountObj;
#endregion
/// <summary>
@@ -43,7 +43,7 @@
MidFrameLayoutContent();
}
-
+
/// <summary>
/// 涓儴甯冨眬
/// </summary>
@@ -54,8 +54,7 @@
};
this.midFrameLayout.AddChidren(bodyView);
- int count = GetSupportType(doorLock);
- for (int i = 0; i < count; i++)
+ for (int i = 0; i < 3; i++)
{
var RowView = new FrameLayout()
{
@@ -72,7 +71,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
Gravity = Gravity.CenterVertical,
- TextSize = 14,
+ TextSize=14,
};
RowView.AddChidren(btnText);
@@ -104,81 +103,44 @@
};
RowView.AddChidren(line2);
- var listDevice = Common.LocalDevice.Current.GetDevicesByMac(doorLock.DeviceAddr);
- var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
if (i == 0)
{
btnText.TextID = R.MyInternationalizationString.AddPassword;
}
else if (i == 1)
{
- if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.IntelligentLocks_AT1F)
- {
- btnText.TextID = R.MyInternationalizationString.AddDoorLockCalmFingerprint;
- }
- else if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.IntelligentLocks_HAT1B)
- {
- btnText.TextID = R.MyInternationalizationString.AddDoorLockCalmFingerprint;
- }
- else
- {
- btnText.TextID = R.MyInternationalizationString.AddFingerprint;
- }
+ btnText.TextID = R.MyInternationalizationString.AddFingerprint;
}
else if (i == 2)
{
- if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.IntelligentLocks_AT1F)
- {
- btnText.TextID = R.MyInternationalizationString.AddDoorLockFaceID;
- }
- else if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.IntelligentLocks_AT1TF)
- {
- btnText.TextID = R.MyInternationalizationString.AddIcCard;
- }
- else
- {
- btnText.TextID = R.MyInternationalizationString.AddIcCard;
- }
- }
- if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.IntelligentLocks_AT1TF)
- {
- if (i == 3)
- {
- btnText.TextID = R.MyInternationalizationString.AddDoorLockFaceID;
- }
- }
- if (i == count - 1)
- {
+ btnText.TextID = R.MyInternationalizationString.AddIcCard;
line2.Visible = false;
}
+
int currentIndex = i;
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
- string unlockTypeStr = "";
if (currentIndex == 0)
{
- unlockTypeStr = "password";
+ var addUnLockMethodTip = new AddUnLockMethodTip(doorLock, curAccountObj, "password");
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addUnLockMethodTip);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addUnLockMethodTip.Show();
}
else if (currentIndex == 1)
{
- unlockTypeStr = "fingerprint";
+ var addUnLockMethodTip = new AddUnLockMethodTip(doorLock, curAccountObj, "fingerprint");
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addUnLockMethodTip);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addUnLockMethodTip.Show();
}
else if (currentIndex == 2)
{
- unlockTypeStr = "proximity";
+ var addUnLockMethodTip = new AddUnLockMethodTip(doorLock, curAccountObj, "proximity");
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addUnLockMethodTip);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addUnLockMethodTip.Show();
}
- else if (currentIndex == 3)
- {
- unlockTypeStr = "faceID";
- }
- else if (currentIndex == 4)
- {
- unlockTypeStr = "calmFingerprint";
- }
- var addUnLockMethodTip = new AddUnLockMethodTip(doorLock, curAccountObj, unlockTypeStr);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(addUnLockMethodTip);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- addUnLockMethodTip.Show();
};
btnRight.MouseUpEventHandler += eHandler;
RowView.MouseUpEventHandler += eHandler;
--
Gitblit v1.8.0