Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 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);

                }

@@ -226,7 +226,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 +291,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 +300,7 @@
                    }

                    dic[listFile[i]] = listInfo;



                    if (dic.Count == UserCenterResourse.SafetyMaxAlarmMsgDay)

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

                    {

                        //只要三天的量

                        break;

@@ -464,7 +464,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 +504,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 +513,7 @@
                    }

                    dic[listFile[i]] = listInfo;



                    if (dic.Count == UserCenterResourse.DoorLockMaxAlarmMsgDay)

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

                    {

                        //只要三天的量

                        break;