From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
index 4fb69dd..417d640 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
@@ -65,12 +65,14 @@
};
if (addNav)
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.SecurityCenter)).LoadTopView_ArmCenter(skipAction);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.SecurityCenter));
+ topView.maginY = 10;
+ topView.LoadTopView_ArmCenter(skipAction);
}
VerticalScrolViewLayout contentView = new VerticalScrolViewLayout()
{
- Y = addNav? Application.GetRealHeight(64):0,
- Height = Application.GetRealHeight(667 - 64),
+ Y = addNav? Application.GetRealHeight(64+10):0,
+ Height = Application.GetRealHeight(667 - 64-10),
BackgroundColor = CSS_Color.MainBackgroundColor,
ScrollEnabled = false,
};
@@ -198,7 +200,6 @@
#region 鍥哄畾甯冮槻鍖哄煙
- /*
var fixedDeploymentView = new FrameLayout()
{
Height = Application.GetRealHeight(133),
@@ -286,9 +287,8 @@
addDefensePage.LoadPage(Language.StringByID(StringId.BurglarAlarm));
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- disasterAlarmView.SetClick(disasterAlarmViewClick);
+ burglarAlarmView.SetClick(burglarAlarmViewClick);
fixedDeploymentTypeView.AddChidren(burglarAlarmView);
- */
#endregion
@@ -331,6 +331,10 @@
armDiyViewList.Clear();
foreach (var mode in FunctionList.List.securities)
{
+ if(mode.type== "all_day"|| mode.type == "mute")
+ {
+ continue;
+ }
var armDiyView = new ArmDiyView("FunctionIcon/ArmCenter/AtHomeDefenseIcon.png", "FunctionIcon/ArmCenter/AtHomeDefenseIconOn.png",
mode.name,mode.sid);
customDeploymentView.AddChidren(armDiyView);
@@ -350,7 +354,7 @@
armDiyViewList.Add(armDiyView);
}
- if (FunctionList.List.securities.Count < 4)
+ if (FunctionList.List.GetOrdinarySecurities().Count < 4)
{
var view = new ArmDiyView("FunctionIcon/ArmCenter/AddDefenseIcon.png", "FunctionIcon/ArmCenter/AddDefenseIcon.png",
Language.StringByID(StringId.Custom),"customSid");
@@ -430,6 +434,7 @@
TextID = StringId.Cancel,
TextColor = CSS_Color.WarningColor,
IsBold = true,
+ TextSize = CSS_FontSize.SubheadingFontSize,
};
contentView.AddChidren(btnCancel);
@@ -488,6 +493,10 @@
{
if (bodyView != null)
{
+ if(updataTemp.type == "all_day"|| updataTemp.type == "mute")
+ {
+ return;
+ }
bodyView.refreshAction?.Invoke();
//甯冮槻
@@ -505,13 +514,23 @@
}
else
{
- //鎾ら槻
- if(bodyView.InDefenseMode.sid == updataTemp.sid)
+ try
{
- foreach (var tempView in bodyView.armDiyViewList)
+ //鎾ら槻
+ if (bodyView.InDefenseMode != null)
{
- tempView.LightingView(false);
+ if (bodyView.InDefenseMode.sid == updataTemp.sid)
+ {
+ bodyView.InDefenseMode.status = updataTemp.status;
+ foreach (var tempView in bodyView.armDiyViewList)
+ {
+ tempView.LightingView(false);
+ }
+ }
}
+ }catch(Exception ex)
+ {
+ MainPage.Log($"鎾ら槻寮傚父:{ex.Message}");
}
}
@@ -538,7 +557,10 @@
bodyView.btnArmTipIcon.IsSelected = true;
bodyView.btnDefenseName.Text = bodyView.InDefenseMode.name;
}
- bodyView.InitAlarmStatus(bodyView.InDefenseMode.alarm);
+ if (bodyView.InDefenseMode != null)
+ {
+ bodyView.InitAlarmStatus(bodyView.InDefenseMode.alarm);
+ }
}
}
catch (Exception ex)
@@ -653,6 +675,7 @@
TextSize = CSS_FontSize.TextFontSize,
Text = title,
IsBold = true,
+ IsMoreLines = true,
};
this.AddChidren(btnTitle);
--
Gitblit v1.8.0