From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断
---
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
index fc44e04..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,
};
@@ -512,14 +514,23 @@
}
else
{
- //鎾ら槻
- if (bodyView.InDefenseMode.sid == updataTemp.sid)
+ try
{
- bodyView.InDefenseMode.status = updataTemp.status;
- 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}");
}
}
@@ -546,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)
@@ -661,6 +675,7 @@
TextSize = CSS_FontSize.TextFontSize,
Text = title,
IsBold = true,
+ IsMoreLines = true,
};
this.AddChidren(btnTitle);
--
Gitblit v1.8.0