2019-10-25-1

WJC

2019-10-25 e6504e6155818b1e7f35dd4d74d13e02359ceb7e

 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs

@@ -590,6 +590,7 @@
                        logic.LogicId = int.Parse(Logicifon["LogicId"].ToString());
                        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.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.TimeAttributeObj>(Logicifon["TimeAttribute"].ToString());
                        logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString());
@@ -695,7 +696,7 @@
        public static List<DoorLock> ReadDoorLockIfon(string doorlockMac)
        {
            List<DoorLock> list = new List<DoorLock>();
            string url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager";
            string url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager";//子账号和主账号可能链接不同
            System.Net.WebClient webClient = new System.Net.WebClient();
            System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
            postValues.Add("RequestVersion", CommonPage.RequestVersion);
@@ -735,7 +736,7 @@
                           }
                           else
                           {
                               residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetDoorLockPager";
                               residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager";
                               residential.Token = Config.Instance.Token;
                               residential.Id = Config.Instance.HomeId;
                               residential.IsOtherAccountCtrl = false;