From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
index 6544496..9f21fd5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
@@ -38,7 +38,7 @@
/// 娣诲姞鍘嗗彶璁板綍
/// </summary>
/// <param name="i_doorLock">闂ㄩ攣瀵硅薄</param>
- /// <param name="OtherOpenLockMode">鍏朵粬寮�閿佹柟寮� 9001:甯稿紑鎵撳紑 9002:甯稿紑鍙栨秷 9003:甯稿紑鎸佺画</param>
+ /// <param name="OtherOpenLockMode">鍏朵粬寮�閿佹柟寮� 9001:甯稿紑鎵撳紑 9002:甯稿紑鍙栨秷 9003:甯稿紑鎸佺画 9004:甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�</param>
/// <param name="NormallyOpenContinuedTime">甯稿紑鎸佺画鏃堕棿(1~72灏忔椂 OtherOpenLockMode=9003鐨勬椂鍊欐湁鏁�)</param>
public void AddDoorHistoryLog(ZigBee.Device.DoorLock i_doorLock, int OtherOpenLockMode, string NormallyOpenContinuedTime)
{
@@ -46,6 +46,11 @@
{
//鑾峰彇闂ㄩ攣鐨勪富閿甀D
var DoorLockId = await this.GetDoorHistoryDoorLockId(i_doorLock);
+ if (DoorLockId == null)
+ {
+ //缃戠粶涓嶉��
+ return;
+ }
var pra = new AddDoorHistoryLogPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
@@ -71,7 +76,7 @@
{
var pra = new GetDoorIdPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- pra.DoorLockId = i_doorLock.DeviceAddr + "_200";
+ pra.DoorLockId = i_doorLock.DeviceAddr + "_" + i_doorLock.DeviceEpoint;
//涓嶄簩娆″彂閫�,涓嶆娴嬮敊璇爜
var listCheck = new List<string>() { "NotSetAgain", "NotCheck" };
var result = await UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/GetDoorLockPager", true, pra, listCheck);
@@ -87,7 +92,7 @@
//濡傛灉杩樻病鏈夊垱寤�,鍒欒櫄鎷熶竴涓壒娈婄殑涓滆タ鍑烘潵
var pra2 = new AddDoorPra();
pra2.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- pra2.DoorLockId = i_doorLock.DeviceAddr + "_200";
+ pra2.DoorLockId = i_doorLock.DeviceAddr + "_" + i_doorLock.DeviceEpoint;
var result2 = await UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/AddDoorLock", true, pra2, listCheck);
//浜戠鏄洿鎺ヨ繑鍥炲垱寤虹殑涓婚敭瀛楃涓�
return result2;
--
Gitblit v1.8.0