~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -608,7 +608,7 @@
			logic.IsEnable = int.Parse(Logicifon["IsEnable"].ToString());
			logic.LogicName = Logicifon["LogicName"].ToString();
			logic.LogicType = int.Parse(Logicifon["LogicType"].ToString());
			logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
			logic.Relationship = int.Parse(Logicifon["Relationship"].ToString());
			logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
			logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
			logic.Accounts = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Accounts"].ToString());
			@@ -830,7 +830,7 @@
			public static List<DoorLock> ReadDoorLock(Residential lockifon)
			{
			List<DoorLock> list = new List<DoorLock>();
			System.Net.WebClient webClient = new System.Net.WebClient();
			System.Net.WebClient webClient = new System.Net.WebClient();
			System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
			postValues.Add("RequestVersion", CommonPage.RequestVersion);
			postValues.Add("LoginAccessToken", lockifon.Token);
			@@ -905,18 +905,6 @@
			return DoorLockLocalUserId + "_" + OpenLockMode.ToString();
			}
			}
			return list;
			}

			public class Residential
			{
			public string Id = string.Empty;
			public bool IsOthreShare;
			public string MainUserDistributedMark = string.Empty;
			public string Url = string.Empty;
			public string Token = string.Empty;
			public bool IsOtherAccountCtrl;
			public string doorlockmac;
			}

			public class MembershipIfon
			@@ -928,7 +916,7 @@

			public static List<MembershipIfon> UserList = new List<MembershipIfon>();



			#endregion
			}
			}