原来的 IOS 工程舍弃（注：没有合并其他组员的代码）

黄学彪

2019-11-25 160785587667cc0d927f85e44c139ec9dde13a9e

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

@@ -56,18 +56,7 @@
        /// 安防数据缓存

        /// </summary>

        private Dictionary<int, SafeguardZoneInfo> dicAllZoneInfo = new Dictionary<int, SafeguardZoneInfo>();

        /// <summary>

        /// 安防上报信息

        /// </summary>

        public List<SafeguardAlarmInfo> listAlarmInfo = new List<SafeguardAlarmInfo>();

        /// <summary>

        /// 上一次安防上报信息保存的文件名字(考虑到用户有可能24点的时候，不退出APP)

        /// </summary>

        private string oldDeviceAlarmFile = string.Empty;

        /// <summary>

        /// 锁

        /// </summary>

        private object objLock = new object();



        #endregion



        #region ■ 刷新安防___________________________

@@ -188,7 +177,7 @@
            try

            {

                var jObject = new Newtonsoft.Json.Linq.JObject() { { "Cluster_ID", 0 }, { "Command", 4036 } };

                await mainGateway.Send("Security/GetSecurityInfo", jObject.ToString());

                mainGateway.Send("Security/GetSecurityInfo", jObject.ToString());

            }

            catch { }



@@ -1419,6 +1408,13 @@
            {

                return GarrisonMode.None;

            }

            //判断有没有其他逻辑去修改了布防模式

            //所以再次获取模式

            var safetyMode = await this.GetSafetyMode();

            if (safetyMode != null)

            {

                return GarrisonMode.None;

            }



            //参数 

            var Pra = new Safeguard.EnableModeData();

@@ -1504,10 +1500,6 @@
                this.ShowErrorMsg(msg);

                return GarrisonMode.RemoveGarrison;

            }



            //保存布防操作信息到本地

            HdlAlarmsLogic.Current.SaveSafeguardAlarmInfo(garrison);



            return garrison;

        }



@@ -1608,13 +1600,6 @@
                this.ShowErrorMsg(msg);

                return -1;

            }



            if (garrison == GarrisonMode.RemoveGarrison)

            {

                //保存布防操作信息到本地

                HdlAlarmsLogic.Current.SaveSafeguardAlarmInfo(garrison);

            }



            return 1;

        }



@@ -2098,7 +2083,7 @@
                var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 4033 } };

                var data = new Newtonsoft.Json.Linq.JObject { { "HomeId", Common.Config.Instance.HomeId }, { "Password", password } };

                jObject.Add("Data", data);

                await realWay.Send("Security/AdminSetNewPassword", jObject.ToString());

                realWay.Send("Security/AdminSetNewPassword", jObject.ToString());

            }

            catch

            {