From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs | 63 ++++++++++---------------------
1 files changed, 20 insertions(+), 43 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs
index 2c9951a..ead7ba5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs
@@ -45,26 +45,6 @@
/// </summary>
private string oldDeviceAlarmFile = string.Empty;
- #endregion
-
- #region 鈻� 鎶ヨ淇℃伅涓婃姤浜嬩欢___________________
-
- /// <summary>
- /// 娣诲姞鎶ヨ淇℃伅涓婃姤浜嬩欢(涓嶉渶瑕佸啀鎵ц浠讳綍鎿嶄綔,骞朵笖姘镐箙瀛樺湪)
- /// </summary>
- public void AddAlarmInfoEvent()
- {
- //瀹夐槻璁惧涓婃姤
- HdlDeviceAttributeLogic.Current.AddAttributeEvent("SaveSafetyAlarmInfo", "IASInfoReport", (device)=>
- {
- if (HdlGatewayLogic.Current.IsGatewayExist(device.CurrentGateWayId) == true)
- {
- //淇濆瓨瀹夐槻鎶ヨ淇℃伅鍒版湰鍦�
- this.SaveSafeguardAlarmInfo(device);
- }
- });
- }
-
#endregion
#region 鈻� 閲嶆柊鍒锋柊鎶ヨ淇℃伅___________________
@@ -155,7 +135,7 @@
//闄愬埗瀹冪殑闀垮害
this.listSafetyAlarmInfo.Insert(0, data);
- if (this.listSafetyAlarmInfo.Count > UserCenterResourse.SafetyOnedayMaxAlarmMsgCount)
+ if (this.listSafetyAlarmInfo.Count > UserCenterResourse.Option.SafetyOnedayMaxAlarmMsgCount)
{
this.listSafetyAlarmInfo.RemoveAt(this.listSafetyAlarmInfo.Count - 1);
}
@@ -165,6 +145,12 @@
var byteData = System.Text.Encoding.UTF8.GetBytes(saveData);
string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
Global.WriteFileToDirectoryByBytes(dir, fileName, byteData);
+
+ if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)
+ {
+ var form = (Phone.UserCenter.Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];
+ form?.AddSafeguardLogPushRow(device);
+ }
return true;
}
}
@@ -174,8 +160,7 @@
/// </summary>
/// <param name="garrison">甯冮槻妯″紡</param>
/// <param name="appendText">闄勫姞鏂囨湰</param>
- /// <param name="push">鏄惁鎺ㄩ�佸埌瀹夐槻涓荤晫闈�</param>
- public void SaveSafeguardAlarmInfo(GarrisonMode garrison, string appendText = "", bool push = false)
+ public void SaveSafeguardAlarmInfo(GarrisonMode garrison, string appendText = "")
{
if (garrison == GarrisonMode.None)
{
@@ -226,7 +211,7 @@
//闄愬埗瀹冪殑闀垮害
this.listSafetyAlarmInfo.Insert(0, data);
- if (this.listSafetyAlarmInfo.Count > UserCenterResourse.SafetyOnedayMaxAlarmMsgCount)
+ if (this.listSafetyAlarmInfo.Count > UserCenterResourse.Option.SafetyOnedayMaxAlarmMsgCount)
{
this.listSafetyAlarmInfo.RemoveAt(this.listSafetyAlarmInfo.Count - 1);
}
@@ -236,16 +221,6 @@
var byteData = System.Text.Encoding.UTF8.GetBytes(saveData);
string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
Global.WriteFileToDirectoryByBytes(dir, fileName, byteData);
-
- //鎺ㄩ��
- if (push == true)
- {
- if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)
- {
- var form = (Phone.UserCenter.Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];
- form?.AddSafeguardLogPushRow(null);
- }
- }
}
}
@@ -291,7 +266,7 @@
var listInfo = new List<SafeguardAlarmInfo>();
for (int j = 0; j < info.Count; j++)
{
- if (j == UserCenterResourse.SafetyOnedayMaxAlarmMsgCount)
+ if (j == UserCenterResourse.Option.SafetyOnedayMaxAlarmMsgCount)
{
//姣忓ぉ鏈�澶氫笁鍗佹潯鏁版嵁
break;
@@ -300,7 +275,7 @@
}
dic[listFile[i]] = listInfo;
- if (dic.Count == UserCenterResourse.SafetyMaxAlarmMsgDay)
+ if (dic.Count == UserCenterResourse.Option.SafetyMaxAlarmMsgDay)
{
//鍙涓夊ぉ鐨勯噺
break;
@@ -430,6 +405,8 @@
#endregion
+
+
#region 鈻� 闂ㄩ攣鎶ヨ淇濆瓨_______________________
/// <summary>
@@ -464,7 +441,7 @@
//闄愬埗瀹冪殑闀垮害
this.listDoorLockAlarmInfo.Insert(0, msgInfo);
- if (this.listDoorLockAlarmInfo.Count > UserCenterResourse.DoorLockOnedayMaxAlarmMsgCount)
+ if (this.listDoorLockAlarmInfo.Count > UserCenterResourse.Option.DoorLockOnedayMaxAlarmMsgCount)
{
this.listDoorLockAlarmInfo.RemoveAt(this.listDoorLockAlarmInfo.Count - 1);
}
@@ -504,7 +481,7 @@
var listInfo = new List<DeviceAlarmInfo>();
for (int j = 0; j < info.Count; j++)
{
- if (j == UserCenterResourse.DoorLockOnedayMaxAlarmMsgCount)
+ if (j == UserCenterResourse.Option.DoorLockOnedayMaxAlarmMsgCount)
{
//姣忓ぉ鏈�澶氫笁鍗佹潯鏁版嵁
break;
@@ -513,7 +490,7 @@
}
dic[listFile[i]] = listInfo;
- if (dic.Count == UserCenterResourse.DoorLockMaxAlarmMsgDay)
+ if (dic.Count == UserCenterResourse.Option.DoorLockMaxAlarmMsgDay)
{
//鍙涓夊ぉ鐨勯噺
break;
@@ -532,7 +509,7 @@
/// </summary>
/// <param name="jobject"></param>
/// <returns></returns>
- private DeviceAlarmInfo GetDoorLockAlarmInfo(Newtonsoft.Json.Linq.JObject jobject)
+ public DeviceAlarmInfo GetDoorLockAlarmInfo(Newtonsoft.Json.Linq.JObject jobject)
{
var info = (DoorLockAlarmsResult)JsonConvert.DeserializeObject<DoorLockAlarmsResult>(jobject["Data"].ToString());
var alarmInfo = new DeviceAlarmInfo();
@@ -572,17 +549,17 @@
//鏆村姏寮�闂�
alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg5);
}
- else if (info.AlarmCode == 16)
+ else if (info.AlarmCode == 116)
{
//甯稿紑妯″紡寮�鍚�
alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg6);
}
- else if (info.AlarmCode == 17)
+ else if (info.AlarmCode == 117)
{
//甯稿紑妯″紡缁撴潫
alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg7);
}
- else if (info.AlarmCode == 32)
+ else if (info.AlarmCode == 132)
{
//闂ㄩ搩瑙﹀彂
alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg8);
--
Gitblit v1.8.0