From 160785587667cc0d927f85e44c139ec9dde13a9e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 14:30:13 +0800
Subject: [PATCH] 原来的 IOS 工程舍弃（注：没有合并其他组员的代码）
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs | 35 ++++++++++-------------------------
1 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
index 9f5fe85..23e7d57 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
+++ b/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鐐圭殑鏃跺�欙紝涓嶉��鍑篈PP)
- /// </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
{
--
Gitblit v1.8.0