From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +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/UnlockSettingFacePage.cs | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs
index f1ee2e9..a9eaf42 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/UnlockSettingFacePage.cs
@@ -90,6 +90,21 @@
bodyView.AddChidren(waitPage);
waitPage.Start("");
+ #endregion
+
+ contentView.AddChidren(new Button()
+ {
+ Height = Application.GetRealHeight(8),
+ BackgroundColor = CSS_Color.BackgroundColor,
+ });
+
+ var view = new VerticalScrolViewLayout()
+ {
+ Height = Application.GetRealHeight(300),
+ };
+ contentView.AddChidren(view);
+
+
btnFaceUnlockSwitchIcon.MouseUpEventHandler = (sender, e) =>
{
waitPage.Start("");
@@ -110,6 +125,7 @@
{
//鏇存柊鐣岄潰
btnFaceUnlockSwitchIcon.IsSelected = changeState;
+ loadSubView(view, faceUnlockSetup);
});
}
else
@@ -145,19 +161,7 @@
})
{ IsBackground = true }.Start();
};
- #endregion
- contentView.AddChidren(new Button()
- {
- Height = Application.GetRealHeight(8),
- BackgroundColor = CSS_Color.BackgroundColor,
- });
-
- var view = new VerticalScrolViewLayout()
- {
- Height = Application.GetRealHeight(300),
- };
- contentView.AddChidren(view);
new System.Threading.Thread(() => {
try
--
Gitblit v1.8.0