From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
index 4fb69dd..ddbe6d8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
@@ -198,7 +198,6 @@
#region 鍥哄畾甯冮槻鍖哄煙
- /*
var fixedDeploymentView = new FrameLayout()
{
Height = Application.GetRealHeight(133),
@@ -286,9 +285,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 +329,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 +352,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 +432,7 @@
TextID = StringId.Cancel,
TextColor = CSS_Color.WarningColor,
IsBold = true,
+ TextSize = CSS_FontSize.SubheadingFontSize,
};
contentView.AddChidren(btnCancel);
@@ -488,6 +491,10 @@
{
if (bodyView != null)
{
+ if(updataTemp.type == "all_day"|| updataTemp.type == "mute")
+ {
+ return;
+ }
bodyView.refreshAction?.Invoke();
//甯冮槻
@@ -506,8 +513,9 @@
else
{
//鎾ら槻
- if(bodyView.InDefenseMode.sid == updataTemp.sid)
+ if (bodyView.InDefenseMode.sid == updataTemp.sid)
{
+ bodyView.InDefenseMode.status = updataTemp.status;
foreach (var tempView in bodyView.armDiyViewList)
{
tempView.LightingView(false);
@@ -653,6 +661,7 @@
TextSize = CSS_FontSize.TextFontSize,
Text = title,
IsBold = true,
+ IsMoreLines = true,
};
this.AddChidren(btnTitle);
--
Gitblit v1.8.0