合并了全部的代码

黄学彪

2019-11-18 88ce6b0697ccf6ce467545bb1125aefdf5b7130b

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs

@@ -155,7 +155,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 +165,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;

            }

        }

@@ -226,7 +232,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);

                }

@@ -291,7 +297,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 +306,7 @@
                    }

                    dic[listFile[i]] = listInfo;



                    if (dic.Count == UserCenterResourse.SafetyMaxAlarmMsgDay)

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

                    {

                        //只要三天的量

                        break;

@@ -464,7 +470,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 +510,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 +519,7 @@
                    }

                    dic[listFile[i]] = listInfo;



                    if (dic.Count == UserCenterResourse.DoorLockMaxAlarmMsgDay)

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

                    {

                        //只要三天的量

                        break;