From e75ccccb370b47305c6eadb321efb27c86cdd28b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 十一月 2021 09:57:24 +0800
Subject: [PATCH] 合并
---
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs | 342 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 242 insertions(+), 100 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
index 91f18dc..a872383 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
@@ -26,6 +26,16 @@
SecurityAlarm securityAlarm;
Action refreshAction;
+ /// <summary>
+ /// 瀹夐槻杈撳嚭-涓存椂
+ /// </summary>
+ List<SecurityOutput> tempOutput = new List<SecurityOutput>();
+ /// <summary>
+ /// 瀹夐槻杈撳叆-涓存椂
+ /// </summary>
+ List<SecurityInput> tempInput = new List<SecurityInput>();
+
+
public AddAlarmDeploymentPage(SecurityAlarm alarm, Action action)
{
bodyView = this;
@@ -33,10 +43,8 @@
refreshAction = action;
}
- public void LoadPage()
+ public void LoadPage(string title = "")
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView();
-
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
contentView = new VerticalScrolViewLayout()
@@ -46,95 +54,202 @@
};
bodyView.AddChidren(contentView);
- #region 甯冮槻淇℃伅
- var deploymentTitleRow = new FrameLayout()
+ if (string.IsNullOrEmpty(title))
{
- Height = Application.GetRealHeight(44),
+ new TopViewDiv(bodyView, Language.StringByID(StringId.AddSecurity)).LoadTopView();
+ #region 甯冮槻淇℃伅
+ var deploymentTitleRow = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(44),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ contentView.AddChidren(deploymentTitleRow);
+
+ var btnDeploymentTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ TextColor = CSS_Color.MainColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.DeploymentInformation,
+ IsBold = true,
+ };
+ deploymentTitleRow.AddChidren(btnDeploymentTitle);
+
+ deploymentTitleRow.AddChidren(new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(43), Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
+
+ #region 甯冮槻鍚嶇О
+ var deploymentNameRow = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ contentView.AddChidren(deploymentNameRow);
+
+ var btnDeploymentNameTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(72),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextID = StringId.Name,
+ };
+ deploymentNameRow.AddChidren(btnDeploymentNameTitle);
+ btnDeploymentNameTitle.Text += ":";
+
+ var btnDeploymentName = new Button()
+ {
+ X = Application.GetRealWidth(88),
+ Width = Application.GetRealWidth(230),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.TextualColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ Text = securityAlarm.name
+ };
+ deploymentNameRow.AddChidren(btnDeploymentName);
+ deploymentNameRow.AddChidren(new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(49), Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
+
+ LoadEvent_EditSecurityAlarmName(btnDeploymentName);
+ #endregion
+
+ #region 瑙﹀彂寤舵椂
+ var delayedRow = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ contentView.AddChidren(delayedRow);
+
+ var btnDelayedTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(72),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextID = StringId.TriggerDelay,
+ };
+ delayedRow.AddChidren(btnDelayedTitle);
+ btnDelayedTitle.Text += ":";
+
+ var btnDelayedText = new Button()
+ {
+ X = Application.GetRealWidth(88),
+ Width = Application.GetRealWidth(330),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.TextualColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ Text = securityAlarm.delay + "s"
+ };
+ delayedRow.AddChidren(btnDelayedText);
+ btnDelayedText.MouseUpEventHandler = (sender, e) =>
+ {
+ Action<string> action = (obj) =>
+ {
+ securityAlarm.delay = obj;
+ btnDelayedText.Text = securityAlarm.delay + "s";
+ };
+ new PublicAssmebly().SetSceneDelayDialog(action, securityAlarm.delay);
+ };
+
+ var btnDelayedRight = new Button()
+ {
+ X = Application.GetRealWidth(343),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/RightIcon.png",
+ };
+ delayedRow.AddChidren(btnDelayedRight);
+
+
+ delayedRow.AddChidren(new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(49), Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
+ #endregion
+
+ #endregion
+
+ contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8), BackgroundColor = CSS_Color.BackgroundColor });
+ }
+ else
+ {
+ new TopViewDiv(bodyView, title).LoadTopView();
+ }
+
+ //甯冮槻鍔熻兘
+ iniDefenseView();
+
+ //鍛婅鐩爣
+ iniAlarmView();
+
+ #region 鎵ц鎺ㄩ��
+ ///涓婁笅闂撮殧12鍍忕礌
+ contentView.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) });
+ ///鎵ц鎺ㄩ�乮ew
+ FrameLayout pushView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- contentView.AddChidren(deploymentTitleRow);
+ contentView.AddChidren(pushView);
- var btnDeploymentTitle = new Button()
+
+ var btnPushTitle = new Button()
{
X = Application.GetRealWidth(16),
- TextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.DeploymentInformation,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextID = StringId.push,
IsBold = true,
};
- deploymentTitleRow.AddChidren(btnDeploymentTitle);
+ pushView.AddChidren(btnPushTitle);
- deploymentTitleRow.AddChidren(new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(43), Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
-
- #region 甯冮槻鍚嶇О
- var deploymentNameRow = new FrameLayout()
+ var btnSwitchPush = new Button()
{
- Height = Application.GetRealHeight(50),
- BackgroundColor = CSS_Color.MainBackgroundColor,
+ Width = Application.GetRealWidth(36),
+ Height = Application.GetRealWidth(36),
+ X = Application.GetRealWidth(323),
+ UnSelectedImagePath = "LogicIcon/off.png",
+ SelectedImagePath = "LogicIcon/on.png",
+ Gravity = Gravity.CenterVertical,
};
- contentView.AddChidren(deploymentNameRow);
+ pushView.AddChidren(btnSwitchPush);
- var btnDeploymentNameTitle = new Button()
+
+ ///鏄惁瑕佹帹閫佺偣鍑讳簨浠�
+ btnSwitchPush.MouseUpEventHandler += (sender, e) =>
{
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(72),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.Name,
+ //璐﹀彿鍒楄〃涓虹┖榛樿鎺ㄩ�佸綋鍓嶈处鍙�
+ if (securityAlarm.pushConfigs.Count == 0)
+ {
+ //鍒濆鍖栧璞�
+ var pushConfigs = new SecurityPushConfig();
+ //榛樿娣诲姞鎺ㄩ�佸綋鍓嶈处鍙�
+ pushConfigs.pushTarget.Add(UserInfo.Current.ID);
+ securityAlarm.pushConfigs.Add(pushConfigs);
+ }
+ btnSwitchPush.IsSelected = !btnSwitchPush.IsSelected;
+ if (btnSwitchPush.IsSelected)
+ {
+ securityAlarm.noticeConfig.enable = true;
+ }
+ else
+ {
+ securityAlarm.noticeConfig.enable = false;
+ }
};
- deploymentNameRow.AddChidren(btnDeploymentNameTitle);
- btnDeploymentNameTitle.Text += ":";
-
- var btnDeploymentName = new Button()
- {
- X = Application.GetRealWidth(88),
- Width = Application.GetRealWidth(230),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.TextualColor,
- TextSize = CSS_FontSize.TextFontSize,
- Text = securityAlarm.name
- };
- deploymentNameRow.AddChidren(btnDeploymentName);
- deploymentNameRow.AddChidren(new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(49), Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
-
- LoadEvent_EditSecurityAlarmName(btnDeploymentName);
+ pushView.AddChidren(new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(49), Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
#endregion
-
- /*
- #region 瑙﹀彂寤舵椂
- var delayedRow = new FrameLayout()
+ #region 鍙戦�侀�氱煡
+ ///鍙戦�侀�氱煡View
+ var pushMsgView = new FrameLayout()
{
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- contentView.AddChidren(delayedRow);
-
- var btnDelayedTitle = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(72),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.TriggerDelay,
- };
- delayedRow.AddChidren(btnDelayedTitle);
- btnDelayedTitle.Text += ":";
-
- var btnDelayedText = new Button()
- {
- X = Application.GetRealWidth(88),
- Width = Application.GetRealWidth(230),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.TextualColor,
- TextSize = CSS_FontSize.TextFontSize,
- Text = securityAlarm.name
- };
- delayedRow.AddChidren(btnDelayedText);
-
- var btnDelayedRight = new Button()
+ contentView.AddChidren(pushMsgView);
+ var btnPushMsgRight = new Button()
{
X = Application.GetRealWidth(343),
Gravity = Gravity.CenterVertical,
@@ -142,22 +257,37 @@
Height = Application.GetMinRealAverage(16),
UnSelectedImagePath = "Public/RightIcon.png",
};
- delayedRow.AddChidren(btnDelayedRight);
+ pushMsgView.AddChidren(btnPushMsgRight);
- //delayedRow.AddChidren(new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(49), Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
- #endregion
- */
+
+
+ var btnPushMsgTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(372),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextID = StringId.fasongtongzhi,
+ IsBold = true,
+ };
+ pushMsgView.AddChidren(btnPushMsgTitle);
+
+ btnPushMsgTitle.MouseUpEventHandler = (sender, e) => {
+ var inputPushText = new PushConfigPage();
+ MainPage.BasePageView.AddChidren(inputPushText);
+ inputPushText.Show(securityAlarm);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+
+ ///涓婁笅闂撮殧62鍍忕礌
+ contentView.AddChidren(new FrameLayout { Height = Application.GetRealHeight(40) });
+
#endregion
- contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8), BackgroundColor = CSS_Color.BackgroundColor });
- //甯冮槻鍔熻兘
- iniDefenseView();
-#if DEBUG
- //鍛婅鐩爣
- iniAlarmView();
-#endif
+
#region 搴曢儴鍖哄煙
var bottomView = new FrameLayout()
@@ -209,17 +339,22 @@
tip.Show(MainPage.BaseView);
return;
}
- //if (securityAlarm.output.Count == 0)
- //{
- // var tip = new Tip()
- // {
- // Text = "璇烽�夋嫨鍛婅鐩爣",
- // CloseTime = 3,
- // Direction = AMPopTipDirection.None
- // };
- // tip.Show(MainPage.BaseView);
- // return;
- //}
+ if (securityAlarm.output.Count == 0)
+ {
+ var tipText = "璇烽�夋嫨鍛婅鐩爣";
+ if(Language.CurrentLanguage !="Chinese")
+ {
+ tipText = "Please select the alarm target";
+ }
+ var tip = new Tip()
+ {
+ Text = tipText,
+ CloseTime = 3,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ return;
+ }
var waitPage = new Loading();
waitPage.Start();
@@ -227,6 +362,7 @@
{
try
{
+
var code = securityAlarm.SaveInfo();
if (code == StateCode.SUCCESS)
{
@@ -276,6 +412,8 @@
BackgroundColor = CSS_Color.MainBackgroundColor,
};
contentView.AddChidren(deploymentFunctionRow);
+ deploymentFunctionRow.AddChidren(new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(43), Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
+
var btnFunctionTitle = new Button()
{
@@ -339,12 +477,9 @@
{
inputTargetView.AddChidren(new InputRow(target.GetFunction().name, target.GetFunction().GetRoomListName(), target.StateText()));
}
+ inputTargetView.AddChidren(new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(49), Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
}
inputTargetView.Height = Application.GetRealHeight(65 * securityAlarm.input.Count);
- //if (outputTargetView != null)
- //{
- // contentView.AddChidren(outputTargetView);
- //}
}
else
{
@@ -381,6 +516,7 @@
BackgroundColor = CSS_Color.MainBackgroundColor,
};
contentView.AddChidren(outputRow);
+ outputRow.AddChidren(new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(43), Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
var btnOutputRowTitle = new Button()
{
@@ -420,9 +556,11 @@
outputTargetView = new VerticalScrolViewLayout()
{
ScrollEnabled = false,
+ Height =0,
};
contentView.AddChidren(outputTargetView);
+ outputTargetView.Height = Application.GetRealHeight(65 * securityAlarm.output.Count);
iniAlarmListView();
#endregion
@@ -440,7 +578,11 @@
{
foreach (var outTarget in securityAlarm.output)
{
- outputTargetView.AddChidren(new OutputRow(outTarget.GetFunction().name, outTarget.GetFunction().GetRoomListName(), "鎵撳紑"));
+ if (outTarget.GetFunction() != null)
+ {
+ outputTargetView.AddChidren(new OutputRow(outTarget.GetFunction().name, outTarget.GetFunction().GetRoomListName(), outTarget.StateText()));
+ }
+ outputTargetView.AddChidren(new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(49), Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
}
outputTargetView.Height = Application.GetRealHeight(65 * securityAlarm.output.Count);
}
@@ -456,6 +598,7 @@
IsMoreLines = true,
BackgroundColor = CSS_Color.MainBackgroundColor,
});
+ outputTargetView.Height = Application.GetRealHeight(68);
}
}
@@ -480,7 +623,6 @@
}.Show(bodyView);
return;
}
-
btnDeploymentName.Text = securityAlarm.name = str;
--
Gitblit v1.8.0