From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 29 八月 2023 09:22:38 +0800 Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc --- HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs index 73348c9..c56f096 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs @@ -15,8 +15,10 @@ Function device; FaceUnlockSetupObj faceUnlockSetup; - public VideoDoorlockFaceUnlockTriggerSettingPage(Function function,FaceUnlockSetupObj setupObj) + Action<int> updataAction; + public VideoDoorlockFaceUnlockTriggerSettingPage(Function function,FaceUnlockSetupObj setupObj,Action<int> action) { + updataAction = action; bodyView = this; device = function; faceUnlockSetup = setupObj; @@ -138,7 +140,7 @@ btnManualText.TextColor = CSS_Color.MainColor; automaitcTipView.Visible = true; manualTipView.Visible = false; - + updataAction?.Invoke(0); }); } else @@ -146,7 +148,10 @@ //澶辫触鎻愮ず Application.RunOnMainThread(() => { - if (!string.IsNullOrEmpty(pack.message)) + if (string.IsNullOrEmpty(pack.message)) + { + pack.message = Language.StringByID(StringId.OperationFailed); + } { var tip = new Tip() { @@ -204,6 +209,7 @@ btnManualText.TextColor = CSS_Color.MainBackgroundColor; automaitcTipView.Visible = false; manualTipView.Visible = true; + updataAction?.Invoke(1); }); } @@ -212,7 +218,10 @@ //澶辫触鎻愮ず Application.RunOnMainThread(() => { - if (!string.IsNullOrEmpty(pack.message)) + if (string.IsNullOrEmpty(pack.message)) + { + pack.message = Language.StringByID(StringId.OperationFailed); + } { var tip = new Tip() { -- Gitblit v1.8.0