From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs | 148 +++++++++++++++++++++++++++++++-----------------
1 files changed, 95 insertions(+), 53 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs
index ce0d355..b7ef627 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs
@@ -92,7 +92,7 @@
faceUnlockSettingView.AddChidren(btnFaceText);
btnFaceText.MouseUpEventHandler = (sender, e) => {
- var page = new UnlockSettingFacePage();
+ var page = new UnlockSettingFacePage(device);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -336,15 +336,21 @@
//澶辫触鎻愮ず
Application.RunOnMainThread(() =>
{
- //澶辫触鎻愮ず
- var tip = new Tip()
+ if (!string.IsNullOrEmpty(pack.message))
{
- MaxWidth = Application.GetRealWidth(300),
- Text = pack.message,
- CloseTime = 3,
- Direction = AMPopTipDirection.None
- };
- tip.Show(MainPage.BaseView);
+ if (string.IsNullOrEmpty(pack.message))
+ {
+ pack.message = Language.StringByID(StringId.OperationFailed);
+ }
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = $"{pack.message}({pack.Code})",
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
});
}
@@ -364,11 +370,14 @@
//澶辫触鎻愮ず
Application.RunOnMainThread(() =>
{
- //澶辫触鎻愮ず
+ if (string.IsNullOrEmpty(pack.message))
+ {
+ pack.message = Language.StringByID(StringId.OperationFailed);
+ }
var tip = new Tip()
{
MaxWidth = Application.GetRealWidth(300),
- Text = pack.message,
+ Text = $"{pack.message}({pack.Code})",
CloseTime = 3,
Direction = AMPopTipDirection.None
};
@@ -399,11 +408,14 @@
//澶辫触鎻愮ず
Application.RunOnMainThread(() =>
{
- //澶辫触鎻愮ず
+ if (string.IsNullOrEmpty(pack.message))
+ {
+ pack.message = Language.StringByID(StringId.OperationFailed);
+ }
var tip = new Tip()
{
MaxWidth = Application.GetRealWidth(300),
- Text = pack.message,
+ Text = $"{pack.message}({pack.Code})",
CloseTime = 3,
Direction = AMPopTipDirection.None
};
@@ -430,15 +442,21 @@
//澶辫触鎻愮ず
Application.RunOnMainThread(() =>
{
- //澶辫触鎻愮ず
- var tip = new Tip()
+
+ if (string.IsNullOrEmpty(pack.message))
{
- MaxWidth = Application.GetRealWidth(300),
- Text = pack.message,
- CloseTime = 3,
- Direction = AMPopTipDirection.None
- };
- tip.Show(MainPage.BaseView);
+ pack.message = Language.StringByID(StringId.OperationFailed);
+ }
+ {
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = $"{pack.message}({pack.Code})",
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
});
}
#endregion
@@ -485,15 +503,21 @@
//澶辫触鎻愮ず
Application.RunOnMainThread(() =>
{
- //澶辫触鎻愮ず
- var tip = new Tip()
+
+ if (string.IsNullOrEmpty(pack.message))
{
- MaxWidth = Application.GetRealWidth(300),
- Text = pack.message,
- CloseTime = 3,
- Direction = AMPopTipDirection.None
- };
- tip.Show(MainPage.BaseView);
+ pack.message = Language.StringByID(StringId.OperationFailed);
+ }
+ {
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = $"{pack.message}({pack.Code})",
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
});
}
}
@@ -535,15 +559,21 @@
//澶辫触鎻愮ず
Application.RunOnMainThread(() =>
{
- //澶辫触鎻愮ず
- var tip = new Tip()
+
+ if (string.IsNullOrEmpty(pack.message))
{
- MaxWidth = Application.GetRealWidth(300),
- Text = pack.message,
- CloseTime = 3,
- Direction = AMPopTipDirection.None
- };
- tip.Show(MainPage.BaseView);
+ pack.message = Language.StringByID(StringId.OperationFailed);
+ }
+ {
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = $"{pack.message}({pack.Code})",
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
});
}
}
@@ -587,15 +617,21 @@
//澶辫触鎻愮ず
Application.RunOnMainThread(() =>
{
- //澶辫触鎻愮ず
- var tip = new Tip()
+
+ if (string.IsNullOrEmpty(pack.message))
{
- MaxWidth = Application.GetRealWidth(300),
- Text = pack.message,
- CloseTime = 3,
- Direction = AMPopTipDirection.None
- };
- tip.Show(MainPage.BaseView);
+ pack.message = Language.StringByID(StringId.OperationFailed);
+ }
+ {
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = $"{pack.message}({pack.Code})",
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
});
}
}
@@ -638,15 +674,21 @@
//澶辫触鎻愮ず
Application.RunOnMainThread(() =>
{
- //澶辫触鎻愮ず
- var tip = new Tip()
+
+ if (string.IsNullOrEmpty(pack.message))
{
- MaxWidth = Application.GetRealWidth(300),
- Text = pack.message,
- CloseTime = 3,
- Direction = AMPopTipDirection.None
- };
- tip.Show(MainPage.BaseView);
+ pack.message = Language.StringByID(StringId.OperationFailed);
+ }
+ {
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = $"{pack.message}({pack.Code})",
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
});
}
}
--
Gitblit v1.8.0