From dc9a1b15bb69227e19afc070adf58156a362d2a2 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 30 九月 2024 17:07:58 +0800
Subject: [PATCH] 安卓可视对讲响铃，
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 98 +++++++++++++++++++++++++++++--------------------
1 files changed, 58 insertions(+), 40 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 13115eb..8893874 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -76,13 +76,14 @@
#region top
topView = new FrameLayout()
{
- Height = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(74),
BackgroundColor = CSS_Color.TopViewColor,
};
bodyView.AddChidren(topView);
//涓嶆槸A缃戝叧鎴栬�呮槸鎴愬憳 鍙厑璁告坊鍔犲満鏅殣钘忚嚜鍔ㄥ寲
var HideAutoPage = DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
+ bool hideSecurity = true;
//鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
if (HideAutoPage)
{
@@ -122,7 +123,7 @@
btnSceneTilte = new Button()
{
- Y = Application.GetRealHeight(30),
+ Y = Application.GetRealHeight(40),
//Width = Application.GetRealWidth(170),
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.Center,
@@ -143,7 +144,7 @@
{
btnAutomationTitle = new Button()
{
- Y = Application.GetRealHeight(30),
+ Y = Application.GetRealHeight(40),
Gravity = Gravity.CenterHorizontal,
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.Center,
@@ -159,10 +160,9 @@
var otherWidth = (Application.GetRealWidth(375) - btnAutomationTitle.Width) / 2;
btnAutomationTitle.X = otherWidth;
-
btnSceneTilte = new Button()
{
- Y = Application.GetRealHeight(30),
+ Y = Application.GetRealHeight(40),
Width = otherWidth,
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.CenterRight,
@@ -174,11 +174,10 @@
};
topView.AddChidren(btnSceneTilte);
-
btnSecurityTitle = new Button()
{
X = btnAutomationTitle.Right,
- Y = Application.GetRealHeight(30),
+ Y = Application.GetRealHeight(40),
Width = otherWidth,
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.CenterLeft,
@@ -188,12 +187,13 @@
TextID = StringId.anfang,
};
topView.AddChidren(btnSecurityTitle);
+ hideSecurity = false;
}
else
{
btnSceneTilte = new Button()
{
- Y = Application.GetRealHeight(30),
+ Y = Application.GetRealHeight(40),
Width = Application.GetRealWidth(170),
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.CenterRight,
@@ -208,7 +208,7 @@
btnAutomationTitle = new Button()
{
X = Application.GetRealWidth(209),
- Y = Application.GetRealHeight(30),
+ Y = Application.GetRealHeight(40),
Width = Application.GetRealWidth(170),
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.CenterLeft,
@@ -223,7 +223,7 @@
btnAddIconBg = new Button()
{
X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
+ Y = Application.GetRealHeight(39),
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/AddIcon.png",
@@ -240,8 +240,8 @@
contentPageView = new PageLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667 - 64 - 49 + 30),
+ Y = Application.GetRealHeight(74),
+ Height = Application.GetRealHeight(667 - 74 - 49 + 30),
BackgroundColor = CSS_Color.BackgroundColor,
IsShowPoint = false
};
@@ -253,7 +253,10 @@
{
LoadAutomationPageView();
}
- LoadSecurityPageView();
+ if (!hideSecurity)
+ {
+ LoadSecurityPageView();
+ }
LoadEventList();
}
@@ -399,36 +402,49 @@
var rowView = new FrameLayout();
new System.Threading.Thread(() =>
{
- foreach (var scene in listScene)
+ try
{
- if(scene == null)
+ foreach (var scene in listScene)
{
- continue;
+ if (scene == null)
+ {
+ continue;
+ }
+ if (scene.sceneType == SceneType.LightScene)
+ {
+ continue;
+ }
+ System.Threading.Thread.Sleep(10);
+ Application.RunOnMainThread(() =>
+ {
+ if (index % 2 == 0)
+ {
+ rowView = new FrameLayout()
+ {
+ Height = Application.GetRealWidth(122),
+ };
+ sceneFunctionView.AddChidren(rowView);
+ sceneFunctionView.AddChidren(new Button()
+ {
+ Height = Application.GetRealHeight(7 + 7),
+ });
+ }
+ var functionView_X = Application.GetRealWidth((16 + 164) * (index % 2) + 16);
+
+ var functionView = LoadSceneFunctionDiv(functionView_X, scene);
+ rowView.AddChidren(functionView);
+ index++;
+ });
}
- if(scene.sceneType == SceneType.LightScene)
- {
- continue;
- }
- System.Threading.Thread.Sleep(10);
+ }catch(Exception ex)
+ {
+ MainPage.Log($"鍔犺浇鍦烘櫙鍒楄〃寮傚父锛歿ex.Message}");
+ }
+ finally
+ {
Application.RunOnMainThread(() =>
{
- if (index % 2 == 0)
- {
- rowView = new FrameLayout()
- {
- Height = Application.GetRealWidth(122),
- };
- sceneFunctionView.AddChidren(rowView);
- sceneFunctionView.AddChidren(new Button()
- {
- Height = Application.GetRealHeight(7 + 7),
- });
- }
- var functionView_X = Application.GetRealWidth((16 + 164) * (index % 2) + 16);
-
- var functionView = LoadSceneFunctionDiv(functionView_X, scene);
- rowView.AddChidren(functionView);
- index++;
+ sceneFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) });
});
}
})
@@ -439,8 +455,6 @@
{
MainPage.Log("homepage erorr : " + ex.Message);
}
- sceneFunctionView.AddChidren(new Button { Height = Application.GetRealHeight(30) });
-
}
/// <summary>
@@ -716,6 +730,10 @@
{
btnAddIcon.MouseUpEventHandler = (sender, e) =>
{
+ if (btnSecurityTitle != null && btnSecurityTitle.IsSelected)
+ {
+ return;
+ }
if (!btnAutomationTitle.IsSelected)
{
//濡傛灉鏄垚鍛�
--
Gitblit v1.8.0