From e4ff4b4f64015836f109999b3421e7e6bd39982a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 31 七月 2023 14:19:26 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs
index 67cc900..6bc84a5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs
@@ -146,7 +146,10 @@
//澶辫触鎻愮ず
Application.RunOnMainThread(() =>
{
- if (!string.IsNullOrEmpty(pack.message))
+ if (string.IsNullOrEmpty(pack.message))
+ {
+ pack.message = Language.StringByID(StringId.OperationFailed);
+ }
{
var tip = new Tip()
{
@@ -212,7 +215,10 @@
//澶辫触鎻愮ず
Application.RunOnMainThread(() =>
{
- if (!string.IsNullOrEmpty(pack.message))
+ if (string.IsNullOrEmpty(pack.message))
+ {
+ pack.message = Language.StringByID(StringId.OperationFailed);
+ }
{
var tip = new Tip()
{
@@ -305,6 +311,7 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.PromptingColor1,
TextID = StringId.FaceUnlockNote,
+ IsMoreLines = true,
};
automaitcTipView.AddChidren(btnAutomaitcNote);
--
Gitblit v1.8.0