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/VideoDoorLockPage.cs | 64 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
index 32d154f..8becceb 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
@@ -239,7 +239,8 @@
this.CalculatedPosition();//閲嶆柊璁＄畻瀹藉害
- var btnDoorlockStatus = new Button()
+ Button btnDoorlockStatus;
+ btnDoorlockStatus = new Button()
{
Width = Application.GetRealWidth(200),
Height = Application.GetRealHeight(62),
@@ -251,7 +252,7 @@
TextSize = 16,
};
whiteFl.AddChidren(btnDoorlockStatus);
-
+
int heightY = btnDoorLockIcon.Bottom + Application.GetRealHeight(133);
//瀹炴椂瑙嗛
rtvFL = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
@@ -283,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
@@ -386,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