From 4f0ab0ad21ce450b7856d50f98322a7899361386 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 22 九月 2020 10:30:01 +0800
Subject: [PATCH] 不要下载这个备份
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs | 102 ++++++++++++++++++++++++++------------------------
1 files changed, 53 insertions(+), 49 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs
index 5246663..5eeab9e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs
@@ -58,34 +58,27 @@
this.listDoorLockAlarmInfo.Clear();
string fileName = DateTime.Now.ToString("yyyyMMdd");
- //鍒ゆ柇鏈夋病鏈夎繖涓枃浠�
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory, fileName);
- if (System.IO.File.Exists(fullName) == true)
+ //瀹夐槻鎶ヨ
+ string fullName = System.IO.Path.Combine(DirNameResourse.SafeguardAlarmDirectory, fileName);
+ var data1 = HdlFileLogic.Current.ReadFileByteContent(fullName);
+ if (data1 != null)
{
- lock (listSafetyAlarmInfo)
+ this.listSafetyAlarmInfo = JsonConvert.DeserializeObject<List<SafeguardAlarmInfo>>(System.Text.Encoding.UTF8.GetString(data1));
+ if (this.listSafetyAlarmInfo == null)
{
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
- var data = Global.ReadFileByDirectory(dir, fileName);
- this.listSafetyAlarmInfo = JsonConvert.DeserializeObject<List<SafeguardAlarmInfo>>(System.Text.Encoding.UTF8.GetString(data));
- if (this.listSafetyAlarmInfo == null)
- {
- this.listSafetyAlarmInfo = new List<SafeguardAlarmInfo>();
- }
+ this.listSafetyAlarmInfo = new List<SafeguardAlarmInfo>();
}
}
+
//闂ㄩ攣璁板綍
- fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DoorLockAlarmDirectory, fileName);
- if (System.IO.File.Exists(fullName) == true)
+ fullName = System.IO.Path.Combine(DirNameResourse.DoorLockAlarmDirectory, fileName);
+ var data2 = HdlFileLogic.Current.ReadFileByteContent(fullName);
+ if (data2 != null)
{
- lock (listDoorLockAlarmInfo)
+ this.listDoorLockAlarmInfo = JsonConvert.DeserializeObject<List<DeviceAlarmInfo>>(System.Text.Encoding.UTF8.GetString(data2));
+ if (this.listDoorLockAlarmInfo == null)
{
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DoorLockAlarmDirectory);
- var data = Global.ReadFileByDirectory(dir, fileName);
- this.listDoorLockAlarmInfo = JsonConvert.DeserializeObject<List<DeviceAlarmInfo>>(System.Text.Encoding.UTF8.GetString(data));
- if (this.listDoorLockAlarmInfo == null)
- {
- this.listDoorLockAlarmInfo = new List<DeviceAlarmInfo>();
- }
+ this.listDoorLockAlarmInfo = new List<DeviceAlarmInfo>();
}
}
}
@@ -141,10 +134,8 @@
}
//淇濆瓨鍒版湰鍦�
- var saveData = JsonConvert.SerializeObject(this.listSafetyAlarmInfo);
- var byteData = System.Text.Encoding.UTF8.GetBytes(saveData);
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
- Global.WriteFileToDirectoryByBytes(dir, fileName, byteData);
+ string fullName = System.IO.Path.Combine(DirNameResourse.SafeguardAlarmDirectory, fileName);
+ HdlFileLogic.Current.SaveFileContent(fullName, this.listSafetyAlarmInfo);
if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)
{
@@ -217,10 +208,8 @@
}
//淇濆瓨鍒版湰鍦�
- var saveData = JsonConvert.SerializeObject(this.listSafetyAlarmInfo);
- var byteData = System.Text.Encoding.UTF8.GetBytes(saveData);
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
- Global.WriteFileToDirectoryByBytes(dir, fileName, byteData);
+ string fullName = System.IO.Path.Combine(DirNameResourse.SafeguardAlarmDirectory, fileName);
+ HdlFileLogic.Current.SaveFileContent(fullName, this.listSafetyAlarmInfo);
}
}
@@ -248,16 +237,15 @@
{
lock (listSafetyAlarmInfo)
{
- string fullPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
- //鍊熺敤涓�涓嬭嚜鍔ㄥ浠借幏鍙栨寚瀹氱洰褰曚笅闈㈢殑鏂囦欢鐨勫嚱鏁�
- List<string> listFile = HdlAutoBackupLogic.GetFileFromDirectory(fullPath);
+ string fullPath = DirNameResourse.SafeguardAlarmDirectory;
+ //鑾峰彇鎸囧畾鐩綍涓嬮潰鐨勬枃浠�
+ List<string> listFile = HdlFileLogic.Current.GetFileFromDirectory(fullPath);
//鍗囧簭
listFile.Sort();
var dic = new Dictionary<string, List<SafeguardAlarmInfo>>();
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
for (int i = listFile.Count - 1; i >= 0; i--)
{
- var data = Global.ReadFileByDirectory(dir, listFile[i]);
+ var data = HdlFileLogic.Current.ReadFileByteContent(System.IO.Path.Combine(fullPath, listFile[i]));
var info = JsonConvert.DeserializeObject<List<SafeguardAlarmInfo>>(System.Text.Encoding.UTF8.GetString(data));
if (info == null)
{
@@ -309,6 +297,10 @@
return null;
}
IASZone iASZone = (IASZone)i_device;
+ if (iASZone.iASInfo == null)
+ {
+ return null;
+ }
var alarmInfo = new IASZoneReportInfo();
if (iASZone.iASInfo.Battery == 1)
@@ -323,11 +315,11 @@
}
//杩愬姩浼犳劅鍣�
- if (device.IasDeviceType == 13)
+ if (device.IasDeviceType == 13 || device.IasDeviceType == 541)
{
if (iASZone.iASInfo.Alarm1 == 1)
{
- //鏈変笉鏄庣墿浣撶粡杩�
+ //鏈変汉缁忚繃
alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uHadUnKnowObjectPassed);
}
}
@@ -475,10 +467,9 @@
}
//淇濆瓨鍒版湰鍦�
- var saveData = JsonConvert.SerializeObject(this.listDoorLockAlarmInfo);
- var byteData = System.Text.Encoding.UTF8.GetBytes(saveData);
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DoorLockAlarmDirectory);
- Global.WriteFileToDirectoryByBytes(dir, fileName, byteData);
+ string fullName = System.IO.Path.Combine(DirNameResourse.DoorLockAlarmDirectory, fileName);
+ HdlFileLogic.Current.SaveFileContent(fullName, this.listDoorLockAlarmInfo);
+
return true;
}
}
@@ -491,16 +482,15 @@
{
lock (listDoorLockAlarmInfo)
{
- string fullPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DoorLockAlarmDirectory);
- //鍊熺敤涓�涓嬭嚜鍔ㄥ浠借幏鍙栨寚瀹氱洰褰曚笅闈㈢殑鏂囦欢鐨勫嚱鏁�
- List<string> listFile = HdlAutoBackupLogic.GetFileFromDirectory(fullPath);
+ string fullPath = DirNameResourse.DoorLockAlarmDirectory;
+ //鑾峰彇鎸囧畾鐩綍涓嬮潰鐨勬枃浠�
+ List<string> listFile = HdlFileLogic.Current.GetFileFromDirectory(fullPath);
//鍗囧簭
listFile.Sort();
var dic = new Dictionary<string, List<DeviceAlarmInfo>>();
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DoorLockAlarmDirectory);
for (int i = listFile.Count - 1; i >= 0; i--)
{
- var data = Global.ReadFileByDirectory(dir, listFile[i]);
+ var data = HdlFileLogic.Current.ReadFileByteContent(System.IO.Path.Combine(fullPath, listFile[i]));
var info = JsonConvert.DeserializeObject<List<DeviceAlarmInfo>>(System.Text.Encoding.UTF8.GetString(data));
if (info == null)
{
@@ -579,17 +569,31 @@
}
else if (info.AlarmCode == 216)
{
- //甯稿紑妯″紡寮�鍚�
+ //甯稿紑妯″紡寮�鍚�(闂ㄩ攣瑙﹀彂)
alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg6);
+ alarmInfo.MsgDiv = 9000;
}
else if (info.AlarmCode == 217)
{
- //甯稿紑妯″紡缁撴潫
- alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg7);
+ //甯稿紑妯″紡缁撴潫(闂ㄩ攣瑙﹀彂)
+ alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg7);
+ alarmInfo.MsgDiv = 9000;
+ }
+ else if (info.AlarmCode == 218)
+ {
+ //甯稿紑妯″紡寮�鍚�(缃戝叧瑙﹀彂)
+ alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg9);
+ alarmInfo.MsgDiv = 9000;
+ }
+ else if (info.AlarmCode == 219)
+ {
+ //甯稿紑妯″紡缁撴潫(缃戝叧瑙﹀彂)
+ alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg10);
+ alarmInfo.MsgDiv = 9000;
}
else if (info.AlarmCode == 232)
{
- //闂ㄩ搩瑙﹀彂
+ //鏈変汉璁块棶
alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uDoorLockAlarmMsg8);
}
}
--
Gitblit v1.8.0