From e35967bbb7a3a678752283c64fe2a496e2f3b702 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 03 八月 2023 23:37:23 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr-2.1
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs
index 40600a1..385e4d9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs
@@ -135,6 +135,10 @@
{
if (!string.IsNullOrEmpty(pack.message))
{
+ if (string.IsNullOrEmpty(pack.message))
+ {
+ pack.message = Language.StringByID(StringId.OperationFailed);
+ }
var tip = new Tip()
{
MaxWidth = Application.GetRealWidth(300),
@@ -184,6 +188,10 @@
{
if (!string.IsNullOrEmpty(pack.message))
{
+ if (string.IsNullOrEmpty(pack.message))
+ {
+ pack.message = Language.StringByID(StringId.OperationFailed);
+ }
var tip = new Tip()
{
MaxWidth = Application.GetRealWidth(300),
@@ -259,7 +267,10 @@
btnTriggerModeText.MouseUpEventHandler = (sender, e) =>
{
- var page = new VideoDoorlockFaceUnlockTriggerSettingPage(device, faceUnlockSetup);
+ Action<int> updataAction = (faceUnlockSetupMode) => {
+ btnTriggerModeStateText.TextID = faceUnlockSetupMode == 0 ? StringId.AutomaticTriggering : StringId.ManualTriggering;
+ };
+ var page = new VideoDoorlockFaceUnlockTriggerSettingPage(device, faceUnlockSetup,updataAction);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0