From a100ed2898468add96398ae069080a103c355c08 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 17 七月 2023 16:41:41 +0800
Subject: [PATCH] 视频门锁优化
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs
index 36eea30..97ec8e1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs
@@ -98,6 +98,20 @@
void initOptionView(bool isEdit)
{
+ if(doorlockUser.faceCount == 0&&
+ doorlockUser.faceCount == 0 &&
+ doorlockUser.pwdCount == 0 &&
+ doorlockUser.cardCount == 0)
+ {
+ new PublicAssmebly().TipMsg(StringId.Tip, StringId.VideoDoorlockDelDataTip, () =>
+ {
+ delCallBackAction?.Invoke();
+ this.RemoveFromParent();
+ });
+ return;
+ }
+
+
int childrenViewHeight = Application.GetRealWidth(116);
int permissionsViewHeight = Application.GetRealHeight(291 + 92);
if (userPermissionsView!= null)
@@ -241,6 +255,7 @@
{
Application.RunOnMainThread(() =>
{
+ doorlockUser.fingerCount = 0;
//鏇存柊鐣岄潰
initOptionView(true);
});
@@ -310,17 +325,17 @@
};
digitalPasswordView.AddChidren(btnDigitalPasswordText);
- if (doorlockUser.fingerCount > 0)
+ if (doorlockUser.pwdCount > 0)
{
btnDigitalPasswordIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UserRightsManagement/DigitalPasswordOnIcon.png";
btnDigitalPasswordText.TextColor = CSS_Color.FirstLevelTitleColor;
if (Language.CurrentLanguage == "Chinese")
{
- btnDigitalPasswordText.Text = doorlockUser.fingerCount + "缁�" + Language.StringByID(StringId.DigitalPassword);
+ btnDigitalPasswordText.Text = doorlockUser.pwdCount + "缁�" + Language.StringByID(StringId.DigitalPassword);
}
else
{
- btnDigitalPasswordText.Text = doorlockUser.fingerCount + " " + Language.StringByID(StringId.DigitalPassword);
+ btnDigitalPasswordText.Text = doorlockUser.pwdCount + " " + Language.StringByID(StringId.DigitalPassword);
}
if (isEdit)
@@ -350,6 +365,7 @@
{
Application.RunOnMainThread(() =>
{
+ doorlockUser.pwdCount = 0;
//鏇存柊鐣岄潰
initOptionView(true);
});
@@ -419,17 +435,17 @@
};
nfcView.AddChidren(btnNfcText);
- if (doorlockUser.fingerCount > 0)
+ if (doorlockUser.cardCount > 0)
{
btnNfcIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UserRightsManagement/NfcOnIcon.png";
btnNfcText.TextColor = CSS_Color.FirstLevelTitleColor;
if (Language.CurrentLanguage == "Chinese")
{
- btnNfcText.Text = doorlockUser.fingerCount + "缁�" + Language.StringByID(StringId.NfcKey);
+ btnNfcText.Text = doorlockUser.cardCount + "缁�" + Language.StringByID(StringId.NfcKey);
}
else
{
- btnNfcText.Text = doorlockUser.fingerCount + " " + Language.StringByID(StringId.NfcKey);
+ btnNfcText.Text = doorlockUser.cardCount + " " + Language.StringByID(StringId.NfcKey);
}
if (isEdit)
@@ -458,6 +474,7 @@
{
Application.RunOnMainThread(() =>
{
+ doorlockUser.cardCount = 0;
//鏇存柊鐣岄潰
initOptionView(true);
});
@@ -500,7 +517,7 @@
var faceView = new FrameLayout()
{
X = Application.GetRealWidth(16),
- Y = fingerprintView.Bottom,
+ Y = fingerprintView.Bottom+ Application.GetRealHeight(20),
Width = Application.GetRealWidth(64 + 32),
Height = childrenViewHeight
};
@@ -526,17 +543,17 @@
};
faceView.AddChidren(btnFaceText);
- if (doorlockUser.fingerCount > 0)
+ if (doorlockUser.faceCount > 0)
{
btnFaceIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UserRightsManagement/FaceOnIcon.png";
btnFaceText.TextColor = CSS_Color.FirstLevelTitleColor;
if (Language.CurrentLanguage == "Chinese")
{
- btnFaceText.Text = doorlockUser.fingerCount + "缁�" + Language.StringByID(StringId.FaceKey);
+ btnFaceText.Text = doorlockUser.faceCount + "缁�" + Language.StringByID(StringId.FaceKey);
}
else
{
- btnFaceText.Text = doorlockUser.fingerCount + " " + Language.StringByID(StringId.FaceKey);
+ btnFaceText.Text = doorlockUser.faceCount + " " + Language.StringByID(StringId.FaceKey);
}
if (isEdit)
@@ -565,6 +582,7 @@
{
Application.RunOnMainThread(() =>
{
+ doorlockUser.faceCount = 0;
//鏇存柊鐣岄潰
initOptionView(true);
});
--
Gitblit v1.8.0