2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

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