From 760dd84b465de4dac4992fedb579e6becb0fc20e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 八月 2023 13:43:27 +0800
Subject: [PATCH] Update HdlEzvizDroid.dll
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs | 59 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
index 2055a86..8becceb 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
@@ -284,24 +284,27 @@
recordFL.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/HistoryList.png";
recordFL.GetTextButton().TextID = StringId.lishijilu;
- //鐢ㄦ埛绠＄悊
- CustomFrameLayout userManagerView = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
- whiteFl.AddChidren(userManagerView);
- userManagerView.Y = heightY;
- userManagerView.X = recordFL.Right + Application.GetRealWidth(CustomFrameLayout.interval);
- userManagerView.AddImageView();
- userManagerView.AddTextButtonView();
- userManagerView.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/DoorlockUserManager.png";
- userManagerView.GetTextButton().TextID = StringId.UserManagement;
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ {
+ //鐢ㄦ埛绠＄悊
+ CustomFrameLayout userManagerView = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
+ whiteFl.AddChidren(userManagerView);
+ userManagerView.Y = heightY;
+ userManagerView.X = recordFL.Right + Application.GetRealWidth(CustomFrameLayout.interval);
+ userManagerView.AddImageView();
+ userManagerView.AddTextButtonView();
+ userManagerView.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/DoorlockUserManager.png";
+ userManagerView.GetTextButton().TextID = StringId.UserManagement;
- userManagerView.SetClickListener((fl, btnImage, btnText) => {
- var page = new VideoDoorlockUserListPage(device);
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ userManagerView.SetClickListener((fl, btnImage, btnText) =>
+ {
+ var page = new VideoDoorlockUserListPage(device);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- });
-
+ });
+ }
#endregion
@@ -387,7 +390,29 @@
//MainPage.BasePageView.AddChidren(historyPage);
//historyPage.LoadPage();
//MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- CommonMethod.Current.SkipRecordActivity(this.device.deviceId);
+ var waitPage = new Loading();
+ this.AddChidren(waitPage);
+ waitPage.Start("");
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonMethod.Current.SkipRecordActivity(this.device.deviceId);
+ });
+ }catch(Exception ex)
+ {
+
+ }
+ finally
+ {
+ Application.RunOnMainThread(() => {
+ waitPage.Hide();
+ });
+ }
+ })
+ { IsBackground = true }.Start();
});
--
Gitblit v1.8.0