临时备份

xm

2020-07-31 ecba45c93391066bc30c7bd602c3a7683fbb99a7

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

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

            zoneInfo.ZoneName = allData.ZoneName;



            //信息推送

            zoneInfo.InformationPush = allData.IsDisablePushMessage;



            //处理设备

            foreach (var data2 in allData.DeviceList)

            {

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


            zoneInfo.dicAlarmDevice.Clear();

            zoneInfo.dicScenes.Clear();



            //信息推送

            zoneInfo.InformationPush = resData.IsDisablePushMessage;



            foreach (var data in resData.Actions)

            {

@@ -1708,6 +1708,11 @@
            {

                return false;

            }



            if (zoneId > 3)

            {

                zoneId = 3;

            }

            //状态变更

            var result = await Safeguard.DisablePushMessageAsync(zoneId, statu);

            if (result == null || result.disablePushMessageResponseData == null || result.disablePushMessageResponseData.Result == 1)

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

        public int GetGarrisonInformationPushStatu(int zoneId)

        {

            if (zoneId > 3)

            {

                zoneId = 3;

            }

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

            {

                return 1;

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

            public string ZoneName;

            /// <summary>

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

            /// </summary>

            public int InformationPush = 1;

            /// <summary>