新版本

黄学彪

2020-07-29 8ce0f9b1e568dd9125e74421cd02fbc29381c1f1

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

@@ -231,6 +231,9 @@
            zoneInfo.ZoneId = allData.ZoneId;

            zoneInfo.ZoneName = allData.ZoneName;



            //信息推送

            zoneInfo.InformationPush = allData.IsDisablePushMessage;



            //处理设备

            foreach (var data2 in allData.DeviceList)

            {

@@ -285,9 +288,6 @@


            zoneInfo.dicAlarmDevice.Clear();

            zoneInfo.dicScenes.Clear();



            //信息推送

            zoneInfo.InformationPush = resData.IsDisablePushMessage;



            foreach (var data in resData.Actions)

            {

@@ -1737,10 +1737,6 @@
        /// <returns>0:推送  1:不推送</returns>

        public int GetGarrisonInformationPushStatu(int zoneId)

        {

            if (zoneId > 3)

            {

                zoneId = 3;

            }

            if (this.dicAllZoneInfo.ContainsKey(zoneId) == false)

            {

                return 1;

@@ -2335,7 +2331,7 @@
            /// </summary>

            public string ZoneName;

            /// <summary>

            /// 信息推送 0:推送  1:不推送 (只有防区ID:1,2,3才会有。4,5的都归为3,因为它是以防区模式ID(ActionType)为单位的)

            /// 信息推送 0:推送  1:不推送 
            /// </summary>

            public int InformationPush = 1;

            /// <summary>