From 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7 Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期四, 02 四月 2020 13:56:39 +0800 Subject: [PATCH] 2020-04-02-2 --- ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs index 2ae0329..8c89431 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs @@ -297,6 +297,7 @@ ["RemindTime"] = int.Parse(dictionary["RemindTime"]), ["EnDelay"] = int.Parse(dictionary["EnDelay"]), ["DelayTime"] = int.Parse(dictionary["DelayTime"]), + ["DoorLockOpenDelayTime"] = int.Parse(dictionary["DoorLockOpenDelayTime"]), }; if (dictionary["DateType"].ToString() == "0") { @@ -714,7 +715,7 @@ } catch { } var dateTime = DateTime.Now; - while ((DateTime.Now - dateTime).TotalMilliseconds < 8 * 1000) + while ((DateTime.Now - dateTime).TotalMilliseconds < 5* 1000) { await System.Threading.Tasks.Task.Delay(100); if (sum == listLogic.Count) @@ -934,7 +935,7 @@ { string s = null; var str = await WebClientAsync(0, CommonPage.RequestHttpsHost + "/App/GetHomePager");//涓嶅悓鍖哄煙鍩熷悕鍓嶇紑涓嶄竴鏍� - // var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager"); + var jObject = JObject.Parse(str); if (jObject == null || jObject["StateCode"].ToString() != "Success") { @@ -959,13 +960,11 @@ residential.IsOtherAccountCtrl = true; residential.doorlockmac = doorlockMac; residential.Url = CommonPage.RequestHttpsHost + "/App/GetSharedHomeApiControl"; - //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl"; s = await ReadUserDoorLock(residential); } else { residential.Url = CommonPage.RequestHttpsHost + "/DoorLock/GetDoorLockPager"; - //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager"; residential.Token = Config.Instance.Token; residential.Id = Config.Instance.HomeId; residential.IsOtherAccountCtrl = false; -- Gitblit v1.8.0