From d3189eaa6be7c70ed5ac783efe68f43211a90d27 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 20 七月 2023 08:58:56 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://172.16.1.23:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs | 146 +++++++++++++++++++++++++++---------------------
1 files changed, 81 insertions(+), 65 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingPage.cs
index ce0d355..0e082c7 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,17 @@
//澶辫触鎻愮ず
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);
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = $"{pack.message}({pack.Code})",
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
});
}
@@ -364,15 +366,17 @@
//澶辫触鎻愮ず
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);
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = $"{pack.message}({pack.Code})",
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
});
}
#endregion
@@ -399,15 +403,17 @@
//澶辫触鎻愮ず
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);
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = $"{pack.message}({pack.Code})",
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
});
}
#endregion
@@ -430,15 +436,17 @@
//澶辫触鎻愮ず
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);
+ 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 +493,17 @@
//澶辫触鎻愮ず
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);
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = $"{pack.message}({pack.Code})",
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
});
}
}
@@ -535,15 +545,17 @@
//澶辫触鎻愮ず
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);
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = $"{pack.message}({pack.Code})",
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
});
}
}
@@ -587,15 +599,17 @@
//澶辫触鎻愮ず
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);
+ var tip = new Tip()
+ {
+ MaxWidth = Application.GetRealWidth(300),
+ Text = $"{pack.message}({pack.Code})",
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ }
});
}
}
@@ -638,15 +652,17 @@
//澶辫触鎻愮ず
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);
+ 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