From 45e4e387f3ef259b9e225fdd543e20be285a5112 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 13:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
old mode 100644
new mode 100755
index 8b0238f..133116c
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -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,6 +905,18 @@
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
@@ -916,7 +928,7 @@
public static List<MembershipIfon> UserList = new List<MembershipIfon>();
-
+
#endregion
}
}
--
Gitblit v1.8.0