From a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 06 三月 2020 15:31:36 +0800
Subject: [PATCH] 删除了郭雪城的 DeviceUi 这个类
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs | 60 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs
index 1ec9341..e74e709 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs
@@ -105,13 +105,18 @@
var listRow = dicRowFrame[listId[i]];
foreach (var alarmInfo in dicInfo[listId[i]])
{
- //娣诲姞鎶ヨ淇℃伅
- var contr = this.AddAlarmInfoControl(alarmInfo);
- if (listRow.Count != 0)
+ //涓�鏉′俊鎭噷闈紝瀹冨彲鑳藉寘鍚涓姤璀�
+ var listMsg = HdlAlarmsLogic.Current.GetSensorListAlarmMsg(alarmInfo);
+ foreach (var strMsg in listMsg)
{
- contr.Y = listRow[listRow.Count - 1].Bottom + Application.GetRealHeight(23);
+ //娣诲姞鎶ヨ淇℃伅鎺т欢
+ var contr = this.AddAlarmInfoControl(alarmInfo, strMsg);
+ if (listRow.Count != 0)
+ {
+ contr.Y = listRow[listRow.Count - 1].Bottom + Application.GetRealHeight(23);
+ }
+ listRow.Add(contr);
}
- listRow.Add(contr);
}
//鍙樻洿楂樺害
frame1.Height = listRow[listRow.Count - 1].Bottom + Application.GetRealHeight(55);
@@ -193,8 +198,34 @@
/// <summary>
/// 娣诲姞鎶ヨ淇℃伅
/// </summary>
+ /// <param name="alarmInfo"></param>
/// <returns></returns>
public int AddSafeguardAlarmInfo(SafeguardAlarmInfo alarmInfo)
+ {
+ if (dicFrame.ContainsKey(alarmInfo.ZoneId) == false)
+ {
+ return -1;
+ }
+ //涓�鏉′俊鎭噷闈紝瀹冨彲鑳藉寘鍚涓姤璀�
+ var listMsg = HdlAlarmsLogic.Current.GetSensorListAlarmMsg(alarmInfo);
+ int valueCount = 0;
+ foreach (var strMsg in listMsg)
+ {
+ //涓�涓姤璀︿俊鎭紝涓�涓帶浠�
+ int value = this.AddSafeguardAlarmInfo2(alarmInfo, strMsg);
+ //杩欎釜value鏄帶浠跺鍔犵殑楂樺害鍊�
+ valueCount += value;
+ }
+ return valueCount;
+ }
+
+ /// <summary>
+ /// 娣诲姞鎶ヨ淇℃伅(涓�涓姤璀︿俊鎭紝涓�涓帶浠�)
+ /// </summary>
+ /// <param name="alarmInfo"></param>
+ /// <param name="strMsg">閽堝涓�鏉℃暟鎹噷闈㈠寘鍚涓姤璀︾殑闂锛岃拷鍔犵殑鎶ヨ鏂囨湰</param>
+ /// <returns></returns>
+ private int AddSafeguardAlarmInfo2(SafeguardAlarmInfo alarmInfo, string strMsg)
{
if (dicFrame.ContainsKey(alarmInfo.ZoneId) == false)
{
@@ -223,7 +254,7 @@
}
//娣诲姞鎶ヨ淇℃伅鎺т欢
- var frameRow = this.AddAlarmInfoControl(alarmInfo);
+ var frameRow = this.AddAlarmInfoControl(alarmInfo, strMsg);
if (listRow.Count >= 100)
{
//绉婚櫎鏈�鍚庝竴涓�
@@ -282,7 +313,7 @@
/// </summary>
/// <param name="alarmInfo"></param>
/// <returns></returns>
- private FrameLayout AddAlarmInfoControl(SafeguardAlarmInfo alarmInfo)
+ private FrameLayout AddAlarmInfoControl(SafeguardAlarmInfo alarmInfo, string strMsg)
{
var frame = dicFrame[alarmInfo.ZoneId];
@@ -309,20 +340,7 @@
var btnMsg = new NormalViewControl(303, 58, true);
btnMsg.X = Application.GetRealWidth(469);
btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;
- //鐢垫睜鐢甸噺
- if (alarmInfo.BatteryMsg != null)
- {
- btnMsg.Text = alarmInfo.BatteryMsg;
- }
- //琚媶鎶ヨ
- else if (alarmInfo.DemolishmentMsg != null)
- {
- btnMsg.Text = alarmInfo.DemolishmentMsg;
- }
- else
- {
- btnMsg.Text = alarmInfo.AlarmMsg;
- }
+ btnMsg.Text = strMsg;
rowFrame.AddChidren(btnMsg);
//鏃堕棿锛氭椂鍒嗙
var btnTime = new NormalViewControl(190, 58, true);
--
Gitblit v1.8.0