Merge branch 'wxr-2.1' into Dev-Branch

wxr

2023-07-30 88b9c9dbae4f0f28529cd3b3ffe53cd26f19f738

 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockFaceUnlockTriggerSettingPage.cs

@@ -107,9 +107,6 @@
                TextID = StringId.ManualTriggering,
            };
            manualView.AddChidren(btnManualText);
            btnManualText.MouseUpEventHandler = (sender, e) => {

            };
            #endregion


@@ -149,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()
                                    {
@@ -215,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()
                                    {
@@ -308,6 +311,7 @@
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextColor = CSS_Color.PromptingColor1,
                TextID = StringId.FaceUnlockNote,
                IsMoreLines = true,
            };
            automaitcTipView.AddChidren(btnAutomaitcNote);