新云端的代码Ver1.0

黄学彪

2020-11-20 99253403b560f761d5f9af8b4f5140496996433a

 ZigbeeApp/Shared/Phone/Common/Logic/HdlAlarmsLogic.cs

old mode 100755
new mode 100644
File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs
@@ -4,7 +4,7 @@
using Shared.Common;
using ZigBee.Device;

namespace Shared.Phone.UserCenter
namespace Shared.Phone
{
    /// <summary>
    /// 报警类的逻辑
@@ -59,7 +59,7 @@
            string fileName = DateTime.Now.ToString("yyyyMMdd");



            //安防报警

            string fullName = System.IO.Path.Combine(DirNameResourse.SafeguardAlarmDirectory, fileName);

            string fullName = System.IO.Path.Combine(HdlFileNameResourse.SafeguardAlarmDirectory, fileName);
            var data1 = HdlFileLogic.Current.ReadFileByteContent(fullName);

            if (data1 != null)
            {

@@ -71,7 +71,7 @@
            }



            //门锁记录

            fullName = System.IO.Path.Combine(DirNameResourse.DoorLockAlarmDirectory, fileName);

            fullName = System.IO.Path.Combine(HdlFileNameResourse.DoorLockAlarmDirectory, fileName);
            var data2 = HdlFileLogic.Current.ReadFileByteContent(fullName);

            if (data2 != null)
            {

@@ -128,19 +128,19 @@


                //限制它的长度

                this.listSafetyAlarmInfo.Insert(0, data);

                if (this.listSafetyAlarmInfo.Count > UserCenterResourse.ResidenceOption.SafetyOnedayMaxAlarmMsgCount)

                if (this.listSafetyAlarmInfo.Count > HdlUserCenterResourse.ResidenceOption.SafetyOnedayMaxAlarmMsgCount)
                {

                    this.listSafetyAlarmInfo.RemoveAt(this.listSafetyAlarmInfo.Count - 1);

                }



                //保存到本地

                string fullName = System.IO.Path.Combine(DirNameResourse.SafeguardAlarmDirectory, fileName);

                string fullName = System.IO.Path.Combine(HdlFileNameResourse.SafeguardAlarmDirectory, fileName);
                HdlFileLogic.Current.SaveFileContent(fullName, this.listSafetyAlarmInfo);



                if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)

                var form = HdlFormLogic.Current.GetFormByName("SafetyManagementMainForm");
                if (form != null)
                {

                    var form = (Phone.UserCenter.Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];

                    form?.AddSafeguardLogPushRow(device);

                    ((UserCenter.Safety.SafetyManagementMainForm)form).AddSafeguardLogPushRow(device);
                }

                return true;

            }

@@ -202,13 +202,13 @@


                //限制它的长度

                this.listSafetyAlarmInfo.Insert(0, data);

                if (this.listSafetyAlarmInfo.Count > UserCenterResourse.ResidenceOption.SafetyOnedayMaxAlarmMsgCount)

                if (this.listSafetyAlarmInfo.Count > HdlUserCenterResourse.ResidenceOption.SafetyOnedayMaxAlarmMsgCount)
                {

                    this.listSafetyAlarmInfo.RemoveAt(this.listSafetyAlarmInfo.Count - 1);

                }



                //保存到本地

                string fullName = System.IO.Path.Combine(DirNameResourse.SafeguardAlarmDirectory, fileName);

                string fullName = System.IO.Path.Combine(HdlFileNameResourse.SafeguardAlarmDirectory, fileName);
                HdlFileLogic.Current.SaveFileContent(fullName, this.listSafetyAlarmInfo);

            }

        }

@@ -237,7 +237,7 @@
        {

            lock (listSafetyAlarmInfo)

            {

                string fullPath = DirNameResourse.SafeguardAlarmDirectory;

                string fullPath = HdlFileNameResourse.SafeguardAlarmDirectory;
                //获取指定目录下面的文件

                List<string> listFile = HdlFileLogic.Current.GetFileFromDirectory(fullPath);

                //升序

@@ -254,7 +254,7 @@
                    var listInfo = new List<SafeguardAlarmInfo>();

                    for (int j = 0; j < info.Count; j++)

                    {

                        if (j == UserCenterResourse.ResidenceOption.SafetyOnedayMaxAlarmMsgCount)

                        if (j == HdlUserCenterResourse.ResidenceOption.SafetyOnedayMaxAlarmMsgCount)
                        {

                            //每天最多三十条数据

                            break;

@@ -263,7 +263,7 @@
                    }

                    dic[listFile[i]] = listInfo;



                    if (dic.Count == UserCenterResourse.ResidenceOption.SafetyMaxAlarmMsgDay)

                    if (dic.Count == HdlUserCenterResourse.ResidenceOption.SafetyMaxAlarmMsgDay)
                    {

                        //只要三天的量

                        break;

@@ -289,9 +289,9 @@
            {

                return null;

            }

            string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(i_device);

            string mainkey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(i_device);
            //因为推送的是虚拟的设备，所以去获取真实物理设备

            CommonDevice device = Common.LocalDevice.Current.GetDevice(mainkey);

            CommonDevice device = HdlDeviceCommonLogic.Current.GetDevice(mainkey);
            if (device == null)

            {

                return null;

@@ -435,7 +435,7 @@
        /// <param name="jobject"></param>

        public bool SaveDoorLockAlarmInfo(Newtonsoft.Json.Linq.JObject jobject)

        {
            var device = Common.LocalDevice.Current.GetDevice(jobject.Value<string>("DeviceAddr"), jobject.Value<int>("Epoint"));

            var device = HdlDeviceCommonLogic.Current.GetDevice(jobject.Value<string>("DeviceAddr"), jobject.Value<int>("Epoint"));
            if ((device is ZigBee.Device.DoorLock) == false)
            {
                //它不是门锁
@@ -461,13 +461,13 @@


                //限制它的长度

                this.listDoorLockAlarmInfo.Insert(0, msgInfo);

                if (this.listDoorLockAlarmInfo.Count > UserCenterResourse.ResidenceOption.DoorLockOnedayMaxAlarmMsgCount)

                if (this.listDoorLockAlarmInfo.Count > HdlUserCenterResourse.ResidenceOption.DoorLockOnedayMaxAlarmMsgCount)
                {

                    this.listDoorLockAlarmInfo.RemoveAt(this.listDoorLockAlarmInfo.Count - 1);

                }



                //保存到本地

                string fullName = System.IO.Path.Combine(DirNameResourse.DoorLockAlarmDirectory, fileName);

                string fullName = System.IO.Path.Combine(HdlFileNameResourse.DoorLockAlarmDirectory, fileName);
                HdlFileLogic.Current.SaveFileContent(fullName, this.listDoorLockAlarmInfo);


                return true;

@@ -482,7 +482,7 @@
        {

            lock (listDoorLockAlarmInfo)

            {

                string fullPath = DirNameResourse.DoorLockAlarmDirectory;

                string fullPath = HdlFileNameResourse.DoorLockAlarmDirectory;
                //获取指定目录下面的文件

                List<string> listFile = HdlFileLogic.Current.GetFileFromDirectory(fullPath);

                //升序

@@ -499,7 +499,7 @@
                    var listInfo = new List<DeviceAlarmInfo>();

                    for (int j = 0; j < info.Count; j++)

                    {

                        if (j == UserCenterResourse.ResidenceOption.DoorLockOnedayMaxAlarmMsgCount)

                        if (j == HdlUserCenterResourse.ResidenceOption.DoorLockOnedayMaxAlarmMsgCount)
                        {

                            //每天最多三十条数据

                            break;

@@ -508,7 +508,7 @@
                    }

                    dic[listFile[i]] = listInfo;



                    if (dic.Count == UserCenterResourse.ResidenceOption.DoorLockMaxAlarmMsgDay)

                    if (dic.Count == HdlUserCenterResourse.ResidenceOption.DoorLockMaxAlarmMsgDay)
                    {

                        //只要三天的量

                        break;