From 1f4cec0e3b571e7541f0c7f3a5ea302ed586d9fb Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 24 十月 2019 16:47:06 +0800
Subject: [PATCH] 2019-10-24-5
---
ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs | 618 ++++++++++++++++++++++++++++----------------------------
1 files changed, 309 insertions(+), 309 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
index 51c7c30..40777bc 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
@@ -49,9 +49,9 @@
/// 涓存椂瀵嗙爜ID
/// </summary>
public int UserId;
- /// <summary>
- /// PrimaryId 闂ㄩ攣浜戠涓� 閿�(闈炴洿鏂板瓧娈�,浠ヤ笅鍧囦负鏇存柊瀛楁) -->閿悕 : PrimaryId榛樿鍊�: null
- /// </summary>
+ /// <summary>
+ /// PrimaryId 闂ㄩ攣浜戠涓� 閿�(闈炴洿鏂板瓧娈�,浠ヤ笅鍧囦负鏇存柊瀛楁) -->閿悕 : PrimaryId榛樿鍊�: null
+ /// </summary>
//public string PrimaryId;
/// <summary>
/// 6浣嶆湁鍔ㄦ�佷复鏃跺瘑鐮�
@@ -72,319 +72,319 @@
#region 涓庝簯绔�氳鎺ュ彛
#region 闂ㄩ攣鏈嶅姟鍣ㄥ彂閫佸熀鏈俊鎭�
- /// <summary>
- /// 娣诲姞闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 娣诲姞闂ㄩ攣
+ /// </summary>
public class BaseDoorLockServerData
{
- /// <summary>
- /// RequestVersion
- /// </summary>
- public string RequestVersion = Shared.Common.CommonPage.RequestVersion;
- /// <summary>
- /// LoginAccessToken
- /// </summary>
- public string LoginAccessToken = Shared.Common.Config.Instance.Token;
- /// <summary>
- /// 浣忓畢Id -->閿悕 : HomeId
- /// </summary>
+ /// <summary>
+ /// RequestVersion
+ /// </summary>
+ public string RequestVersion = Shared.Common.CommonPage.RequestVersion;
+ /// <summary>
+ /// LoginAccessToken
+ /// </summary>
+ public string LoginAccessToken = Shared.Common.Config.Instance.Token;
+ /// <summary>
+ /// 浣忓畢Id -->閿悕 : HomeId
+ /// </summary>
public string HomeId = Shared.Common.Config.Instance.HomeId;
- /// <summary>
- /// 闂ㄩ攣Id -->閿悕 : DoorLockId
- /// </summary>
+ /// <summary>
+ /// 闂ㄩ攣Id -->閿悕 : DoorLockId
+ /// </summary>
public string DoorLockId = "";
- /// <summary>
- /// 闂ㄩ攣鏈湴鐢ㄦ埛Id -->閿悕 : DoorLockLocalUserId
- /// </summary>
+ /// <summary>
+ /// 闂ㄩ攣鏈湴鐢ㄦ埛Id -->閿悕 : DoorLockLocalUserId
+ /// </summary>
public string DoorLockLocalUserId = "";
}
#endregion
#region 娣诲姞闂ㄩ攣
- /// <summary>
- /// 娣诲姞闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 娣诲姞闂ㄩ攣
+ /// </summary>
public class AddDoorLockData : BaseDoorLockServerData
{
- /// <summary>
- /// 浜戠甯愬彿Id -->閿悕 : CloudAccountId
- /// </summary>
+ /// <summary>
+ /// 浜戠甯愬彿Id -->閿悕 : CloudAccountId
+ /// </summary>
public string CloudAccountId = "";
- /// <summary>
- /// OpenLockMode 寮�閿佹柟寮�(瀵嗙爜銆佹寚绾广�両C鍗�) -->閿悕 : OpenLockMode (鍙��)
- /// </summary>
+ /// <summary>
+ /// OpenLockMode 寮�閿佹柟寮�(瀵嗙爜銆佹寚绾广�両C鍗�) -->閿悕 : OpenLockMode (鍙��)
+ /// </summary>
public int OpenLockMode = 0;
- /// <summary>
- /// Data 鐩稿叧鍐呭(濡�:瀵嗙爜銆佹寚绾广�両C鍗� 鐨勪簩杩涘埗) -->閿悕 : Data (鍙��)
- public byte[] Data = null;
- /// <summary>
- /// 鐢ㄦ埛Id澶囨敞 -->閿悕 : UserIdRemarks
- /// </summary>
+ /// <summary>
+ /// Data 鐩稿叧鍐呭(濡�:瀵嗙爜銆佹寚绾广�両C鍗� 鐨勪簩杩涘埗) -->閿悕 : Data (鍙��)
+ public byte[] Data = null;
+ /// <summary>
+ /// 鐢ㄦ埛Id澶囨敞 -->閿悕 : UserIdRemarks
+ /// </summary>
public string UserIdRemarks = "";
- /// <summary>
- /// IsFreezeUser 鏄惁鍐荤粨鐢ㄦ埛 -->閿悕 : IsFreezeUser (鍙��)
- /// </summary>
- public bool IsFreezeUser = false;
- /// <summary>
- /// IsTempUnlockAuthority 鏄惁涓存椂寮�閿佹潈闄� -->閿悕 : IsTempUnlockAuthority(鍙��)
- /// </summary>
- public bool IsTempUnlockAuthority = false;
- /// <summary>
- /// EntryTime 褰曞叆鏃堕棿 -->閿悕 : EntryTime(鍙��)
- /// </summary>
- public DateTime EntryTime = System.DateTime.Now;
+ /// <summary>
+ /// IsFreezeUser 鏄惁鍐荤粨鐢ㄦ埛 -->閿悕 : IsFreezeUser (鍙��)
+ /// </summary>
+ public bool IsFreezeUser = false;
+ /// <summary>
+ /// IsTempUnlockAuthority 鏄惁涓存椂寮�閿佹潈闄� -->閿悕 : IsTempUnlockAuthority(鍙��)
+ /// </summary>
+ public bool IsTempUnlockAuthority = false;
+ /// <summary>
+ /// EntryTime 褰曞叆鏃堕棿 -->閿悕 : EntryTime(鍙��)
+ /// </summary>
+ public DateTime EntryTime = System.DateTime.Now;
}
- /// <summary>
- /// 娣诲姞闂ㄩ攣缁撴灉
- /// </summary>
+ /// <summary>
+ /// 娣诲姞闂ㄩ攣缁撴灉
+ /// </summary>
public class AddDoorLockDataRes
{
- /// <summary>
- /// 鍝嶅簲鐨勭増鏈彿,涓�鑸姹備粈涔堢増鏈彿锛岃繖閲屼笌涔嬭姹傜浉鍚�
- /// </summary>
+ /// <summary>
+ /// 鍝嶅簲鐨勭増鏈彿,涓�鑸姹備粈涔堢増鏈彿锛岃繖閲屼笌涔嬭姹傜浉鍚�
+ /// </summary>
public string ResponseVersion = string.Empty;
- /// <summary>
+ /// <summary>
/// 鍝嶅簲鐘舵�佺爜:
///<para>(1)Success 鍒橻璋冪敤姝ゆ帴鍙ｆ搷浣滄垚鍔焆, ResponseData鍒欎负null</para>
///<para>(2)ParameterOrEmpty,鍒欏搷搴斿瓧娈典腑[ErrorInfo] 涓洪敊璇俊鎭�, ResponseData鍒欎负null</para>
///(<para>3)NoLogin,鍒欏搷搴斿瓧娈典腑[ErrorInfo] 涓洪敊璇俊鎭负[鏃犳晥鐧诲綍Token!]</para>
///<para>(4)NoRecord,鍒欏搷搴斿瓧娈典腑[ErrorInfo] 涓洪敊璇俊鎭负[褰撳墠鎻愪氦DoorLockId鍊煎湪浜戠涓嶅瓨鍦紝璇风‘璁ゅ�兼槸鍚︽纭�!]</para>
- ///<para>(5)DoorLockIdNoIsYou,鍒欏搷搴斿瓧娈典腑[ErrorInfo] 涓洪敊璇俊鎭负[褰撳墠鎻愪氦DoorLockId骞朵笉灞炰簬浣犲綋鍓嶅笎鍙风殑锛岃纭鍊兼槸鍚︽纭�!]</para>
- /// </summary>
+ ///<para>(5)DoorLockIdNoIsYou,鍒欏搷搴斿瓧娈典腑[ErrorInfo] 涓洪敊璇俊鎭负[褰撳墠鎻愪氦DoorLockId骞朵笉灞炰簬浣犲綋鍓嶅笎鍙风殑锛岃纭鍊兼槸鍚︽纭�!]</para>
+ /// </summary>
public string StateCode = string.Empty;
}
#endregion
#region 鏇存柊闂ㄩ攣
- /// <summary>
- /// 鏇存柊闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 鏇存柊闂ㄩ攣
+ /// </summary>
public class RefreshDoorLockData : BaseDoorLockServerData
{
- /// <summary>
- /// PrimaryId 闂ㄩ攣浜戠涓� 閿�(闈炴洿鏂板瓧娈�,浠ヤ笅鍧囦负鏇存柊瀛楁) -->閿悕 : PrimaryId榛樿鍊�: null
- /// </summary>
+ /// <summary>
+ /// PrimaryId 闂ㄩ攣浜戠涓� 閿�(闈炴洿鏂板瓧娈�,浠ヤ笅鍧囦负鏇存柊瀛楁) -->閿悕 : PrimaryId榛樿鍊�: null
+ /// </summary>
public string PrimaryId = "";
- /// <summary>
- /// 浜戠甯愬彿Id -->閿悕 : CloudAccountId
- /// </summary>
+ /// <summary>
+ /// 浜戠甯愬彿Id -->閿悕 : CloudAccountId
+ /// </summary>
public string CloudAccountId = "";
- /// <summary>
- /// OpenLockMode 寮�閿佹柟寮�(瀵嗙爜銆佹寚绾广�両C鍗�) -->閿悕 : OpenLockMode (鍙��)
- /// </summary>
+ /// <summary>
+ /// OpenLockMode 寮�閿佹柟寮�(瀵嗙爜銆佹寚绾广�両C鍗�) -->閿悕 : OpenLockMode (鍙��)
+ /// </summary>
public int OpenLockMode = 0;
- /// <summary>
- /// 浣忓畢Id (鍙��)
- /// </summary>
+ /// <summary>
+ /// 浣忓畢Id (鍙��)
+ /// </summary>
public byte[] Data;
- /// <summary>
- /// 鐢ㄦ埛Id澶囨敞
- /// </summary>
+ /// <summary>
+ /// 鐢ㄦ埛Id澶囨敞
+ /// </summary>
public string UserIdRemarks = "";
- /// <summary>
- /// 鏄惁涓虹鐞嗗憳闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 鏄惁涓虹鐞嗗憳闂ㄩ攣
+ /// </summary>
public bool IsFreezeUser;
- /// <summary>
- /// 鏄惁涓虹鐞嗗憳闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 鏄惁涓虹鐞嗗憳闂ㄩ攣
+ /// </summary>
public bool IsTempUnlockAuthority;
}
#endregion
#region 鍒犻櫎闂ㄩ攣
- /// <summary>
- /// 鍒犻櫎闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 鍒犻櫎闂ㄩ攣
+ /// </summary>
public class DeleteDoorLockData : BaseDoorLockServerData
{
- /// <summary>
- /// PrimaryId 闂ㄩ攣浜戠涓� 閿�(闈炴洿鏂板瓧娈�,浠ヤ笅鍧囦负鏇存柊瀛楁) -->閿悕 : PrimaryId榛樿鍊�: null
- /// </summary>
+ /// <summary>
+ /// PrimaryId 闂ㄩ攣浜戠涓� 閿�(闈炴洿鏂板瓧娈�,浠ヤ笅鍧囦负鏇存柊瀛楁) -->閿悕 : PrimaryId榛樿鍊�: null
+ /// </summary>
public string PrimaryId = "";
- /// <summary>
- /// 闂ㄩ攣Id -->閿悕 : DoorLockId (鍙��)
- /// </summary>
+ /// <summary>
+ /// 闂ㄩ攣Id -->閿悕 : DoorLockId (鍙��)
+ /// </summary>
public int DelDoorLockDelType;
}
#endregion
#region 娣诲姞闂ㄩ攣涓存椂瀵嗙爜
- /// <summary>
- /// 娣诲姞闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 娣诲姞闂ㄩ攣
+ /// </summary>
public class AddDoorLockTempPasswordData
{
- /// <summary>
- /// RequestVersion
- /// </summary>
- public string RequestVersion = Shared.Common.CommonPage.RequestVersion;
- /// <summary>
- /// LoginAccessToken
- /// </summary>
- public string LoginAccessToken = Shared.Common.Config.Instance.Token;
- /// <summary>
- /// 浣忓畢Id -->閿悕 : HomeId
- /// </summary>
+ /// <summary>
+ /// RequestVersion
+ /// </summary>
+ public string RequestVersion = Shared.Common.CommonPage.RequestVersion;
+ /// <summary>
+ /// LoginAccessToken
+ /// </summary>
+ public string LoginAccessToken = Shared.Common.Config.Instance.Token;
+ /// <summary>
+ /// 浣忓畢Id -->閿悕 : HomeId
+ /// </summary>
public string HomeId = Shared.Common.Config.Instance.HomeId;
- /// <summary>
- /// 闂ㄩ攣Id -->閿悕 : DoorLockId
- /// </summary>
+ /// <summary>
+ /// 闂ㄩ攣Id -->閿悕 : DoorLockId
+ /// </summary>
public string LocalDoorLockId = "";
- /// <summary>
- /// 涓存椂瀵嗙爜Id -->閿悕 : TempPwdId
- /// </summary>
+ /// <summary>
+ /// 涓存椂瀵嗙爜Id -->閿悕 : TempPwdId
+ /// </summary>
public string TempPwdId = "";
- /// <summary>
- /// 涓存椂瀵嗙爜 -->閿悕 : TempPwd
- /// </summary>
+ /// <summary>
+ /// 涓存椂瀵嗙爜 -->閿悕 : TempPwd
+ /// </summary>
public string TempPwd = "";
- /// <summary>
- /// 0:00:00] ValidBeginTime 鏈夋晥寮�濮嬫椂闂� -->閿悕 : ValidBeginTime 榛樿鍊�: 0001/1/1
- /// </summary>
+ /// <summary>
+ /// 0:00:00] ValidBeginTime 鏈夋晥寮�濮嬫椂闂� -->閿悕 : ValidBeginTime 榛樿鍊�: 0001/1/1
+ /// </summary>
public DateTime ValidBeginTime;
- /// <summary>
- /// 0:00:00] ValidEndTime 鏈夋晥缁撴潫鏃堕棿 -->閿悕 : ValidEndTime
- /// </summary>
- public DateTime ValidEndTime;
+ /// <summary>
+ /// 0:00:00] ValidEndTime 鏈夋晥缁撴潫鏃堕棿 -->閿悕 : ValidEndTime
+ /// </summary>
+ public DateTime ValidEndTime;
}
- /// <summary>
- /// 娣诲姞闂ㄩ攣缁撴灉
- /// </summary>
+ /// <summary>
+ /// 娣诲姞闂ㄩ攣缁撴灉
+ /// </summary>
public class AddDoorLockTempPasswordDataRes : AddDoorLockDataRes
{
}
#endregion
#region 鍒犻櫎闂ㄩ攣涓存椂瀵嗙爜
- /// <summary>
- /// 鍒犻櫎闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 鍒犻櫎闂ㄩ攣
+ /// </summary>
public class DelDoorLockTempPasswordData
{
- /// <summary>
- /// RequestVersion
- /// </summary>
- public string RequestVersion = Shared.Common.CommonPage.RequestVersion;
- /// <summary>
- /// LoginAccessToken
- /// </summary>
+ /// <summary>
+ /// RequestVersion
+ /// </summary>
+ public string RequestVersion = Shared.Common.CommonPage.RequestVersion;
+ /// <summary>
+ /// LoginAccessToken
+ /// </summary>
public string LoginAccessToken = Shared.Common.Config.Instance.Token;
- /// <summary>
- /// 浣忓畢Id -->閿悕 : HomeId
- /// </summary>
+ /// <summary>
+ /// 浣忓畢Id -->閿悕 : HomeId
+ /// </summary>
public string HomeId = Shared.Common.Config.Instance.HomeId;
- /// <summary>
- /// LocalDoorLockId 鎼滅储鏈湴闂ㄩ攣Id -->閿悕 : LocalDoorLockId 榛樿鍊�: null
- /// </summary>
+ /// <summary>
+ /// LocalDoorLockId 鎼滅储鏈湴闂ㄩ攣Id -->閿悕 : LocalDoorLockId 榛樿鍊�: null
+ /// </summary>
public string LocalDoorLockId = "";
}
- /// <summary>
- /// 鍒犻櫎闂ㄩ攣缁撴灉
- /// </summary>
+ /// <summary>
+ /// 鍒犻櫎闂ㄩ攣缁撴灉
+ /// </summary>
public class DelDoorLockTempPasswordDataRes : AddDoorLockDataRes
{
}
#endregion
#region 鏇存柊闂ㄩ攣涓存椂瀵嗙爜
- /// <summary>
- /// 鏇存柊闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 鏇存柊闂ㄩ攣
+ /// </summary>
public class ModifyDoorLockTempPasswordData
{
- /// <summary>
- /// RequestVersion
- /// </summary>
- public string RequestVersion = Shared.Common.CommonPage.RequestVersion;
- /// <summary>
- /// LoginAccessToken
- /// </summary>
- public string LoginAccessToken = Shared.Common.Config.Instance.Token;
- /// <summary>
- /// 浣忓畢Id -->閿悕 : HomeId
- /// </summary>
- public string HomeId = Shared.Common.Config.Instance.HomeId;
- /// <summary>
- /// 闂ㄩ攣瀵嗙爜涓婚敭(鑾峰彇闂ㄩ攣瀵嗙爜鍒嗛〉涓殑Id) -->閿悕 : DoorLockPwdId
- /// </summary>
+ /// <summary>
+ /// RequestVersion
+ /// </summary>
+ public string RequestVersion = Shared.Common.CommonPage.RequestVersion;
+ /// <summary>
+ /// LoginAccessToken
+ /// </summary>
+ public string LoginAccessToken = Shared.Common.Config.Instance.Token;
+ /// <summary>
+ /// 浣忓畢Id -->閿悕 : HomeId
+ /// </summary>
+ public string HomeId = Shared.Common.Config.Instance.HomeId;
+ /// <summary>
+ /// 闂ㄩ攣瀵嗙爜涓婚敭(鑾峰彇闂ㄩ攣瀵嗙爜鍒嗛〉涓殑Id) -->閿悕 : DoorLockPwdId
+ /// </summary>
public string DoorLockPwdId = "";
- /// <summary>
- /// 闂ㄩ攣Id -->閿悕 : DoorLockId
- /// </summary>
+ /// <summary>
+ /// 闂ㄩ攣Id -->閿悕 : DoorLockId
+ /// </summary>
public string LocalDoorLockId = "";
- /// <summary>
- /// 涓存椂瀵嗙爜Id -->閿悕 : TempPwdId
- /// </summary>
+ /// <summary>
+ /// 涓存椂瀵嗙爜Id -->閿悕 : TempPwdId
+ /// </summary>
public string TempPwdId = "";
- /// <summary>
- /// 涓存椂瀵嗙爜 -->閿悕 : TempPwd
- /// </summary>
+ /// <summary>
+ /// 涓存椂瀵嗙爜 -->閿悕 : TempPwd
+ /// </summary>
public string TempPwd = "";
- /// <summary>
- /// 0:00:00] ValidBeginTime 鏈夋晥寮�濮嬫椂闂� -->閿悕 : ValidBeginTime 榛樿鍊�: 0001/1/1
- /// </summary>
+ /// <summary>
+ /// 0:00:00] ValidBeginTime 鏈夋晥寮�濮嬫椂闂� -->閿悕 : ValidBeginTime 榛樿鍊�: 0001/1/1
+ /// </summary>
public DateTime ValidBeginTime;
- /// <summary>
- /// 0:00:00] ValidEndTime 鏈夋晥缁撴潫鏃堕棿 -->閿悕 : ValidEndTime
- /// </summary>
- public DateTime ValidEndTime;
+ /// <summary>
+ /// 0:00:00] ValidEndTime 鏈夋晥缁撴潫鏃堕棿 -->閿悕 : ValidEndTime
+ /// </summary>
+ public DateTime ValidEndTime;
}
- /// <summary>
- /// 娣诲姞闂ㄩ攣缁撴灉
- /// </summary>
+ /// <summary>
+ /// 娣诲姞闂ㄩ攣缁撴灉
+ /// </summary>
public class ModigDoorLockTempPasswordDataRes : AddDoorLockDataRes
{
}
#endregion
#region 鑾峰彇闂ㄩ攣涓存椂瀵嗙爜
- /// <summary>
- /// 鑾峰彇闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 鑾峰彇闂ㄩ攣
+ /// </summary>
public class GetDoorLockTempPasswordData
{
- /// <summary>
- /// RequestVersion
- /// </summary>
- public string RequestVersion = Shared.Common.CommonPage.RequestVersion;
- /// <summary>
- /// LoginAccessToken
- /// </summary>
- public string LoginAccessToken = Shared.Common.Config.Instance.Token;
- /// <summary>
- /// 浣忓畢Id -->閿悕 : HomeId
- /// </summary>
- public string HomeId = Shared.Common.Config.Instance.HomeId;
- /// <summary>
- /// 闂ㄩ攣Id -->閿悕 : DoorLockId
- /// </summary>
+ /// <summary>
+ /// RequestVersion
+ /// </summary>
+ public string RequestVersion = Shared.Common.CommonPage.RequestVersion;
+ /// <summary>
+ /// LoginAccessToken
+ /// </summary>
+ public string LoginAccessToken = Shared.Common.Config.Instance.Token;
+ /// <summary>
+ /// 浣忓畢Id -->閿悕 : HomeId
+ /// </summary>
+ public string HomeId = Shared.Common.Config.Instance.HomeId;
+ /// <summary>
+ /// 闂ㄩ攣Id -->閿悕 : DoorLockId
+ /// </summary>
public string LocalDoorLockId = "";
- /// <summary>
- /// 涓存椂瀵嗙爜Id -->閿悕 : TempPwdId
- /// </summary>
+ /// <summary>
+ /// 涓存椂瀵嗙爜Id -->閿悕 : TempPwdId
+ /// </summary>
public string TempPwdId = "";
- /// <summary>
- /// 涓存椂瀵嗙爜 -->閿悕 : TempPwd
- /// </summary>
+ /// <summary>
+ /// 涓存椂瀵嗙爜 -->閿悕 : TempPwd
+ /// </summary>
public string TempPwd = "";
- /// <summary>
- /// 0:00:00] ValidBeginTime 鏈夋晥寮�濮嬫椂闂� -->閿悕 : ValidBeginTime 榛樿鍊�: 0001/1/1
- /// </summary>
+ /// <summary>
+ /// 0:00:00] ValidBeginTime 鏈夋晥寮�濮嬫椂闂� -->閿悕 : ValidBeginTime 榛樿鍊�: 0001/1/1
+ /// </summary>
public DateTime? ValidBeginTime;
- /// <summary>
- /// 0:00:00] ValidEndTime 鏈夋晥缁撴潫鏃堕棿 -->閿悕 : ValidEndTime
- /// </summary>
- public DateTime? ValidEndTime;
+ /// <summary>
+ /// 0:00:00] ValidEndTime 鏈夋晥缁撴潫鏃堕棿 -->閿悕 : ValidEndTime
+ /// </summary>
+ public DateTime? ValidEndTime;
}
- /// <summary>
- /// 鑾峰彇闂ㄩ攣涓存椂瀵嗙爜缁撴灉
+ /// <summary>
+ /// 鑾峰彇闂ㄩ攣涓存椂瀵嗙爜缁撴灉
/// </summary>
[Serializable]
public class GetDoorLockTempPasswordDataRes
@@ -400,33 +400,33 @@
[Serializable]
public class CloudDoorLockTempPasswordObj
{
- /// <summary>
- /// 闂ㄩ攣Id -->閿悕 : DoorLockId
- /// </summary>
+ /// <summary>
+ /// 闂ㄩ攣Id -->閿悕 : DoorLockId
+ /// </summary>
public string LocalDoorLockId = "";
- /// <summary>
- /// 涓存椂瀵嗙爜Id -->閿悕 : TempPwdId
- /// </summary>
+ /// <summary>
+ /// 涓存椂瀵嗙爜Id -->閿悕 : TempPwdId
+ /// </summary>
public string TempPwdId = "";
- /// <summary>
- /// 涓存椂瀵嗙爜 -->閿悕 : TempPwd
- /// </summary>
+ /// <summary>
+ /// 涓存椂瀵嗙爜 -->閿悕 : TempPwd
+ /// </summary>
public string TempPwd = "";
- /// <summary>
- /// 0:00:00] ValidBeginTime 鏈夋晥寮�濮嬫椂闂� -->閿悕 : ValidBeginTime 榛樿鍊�: 0001/1/1
- /// </summary>
+ /// <summary>
+ /// 0:00:00] ValidBeginTime 鏈夋晥寮�濮嬫椂闂� -->閿悕 : ValidBeginTime 榛樿鍊�: 0001/1/1
+ /// </summary>
public DateTime ValidBeginTime;
- /// <summary>
- /// 0:00:00] ValidEndTime 鏈夋晥缁撴潫鏃堕棿 -->閿悕 : ValidEndTime
- /// </summary>
+ /// <summary>
+ /// 0:00:00] ValidEndTime 鏈夋晥缁撴潫鏃堕棿 -->閿悕 : ValidEndTime
+ /// </summary>
public DateTime ValidEndTime;
- /// <summary>
- /// 銆愰棬閿佷簯绔富閿��,鐢ㄤ簬銆愭坊鍔犻棬閿佸巻鍙层�戞帴鍙ｄ腑鐨凞oorLockId鍙傛暟鍙娿�愬垹闄ら棬閿併�戞帴鍙ｄ腑鐨凱rimaryId鍙傛暟,娉ㄦ剰涓嶆槸缃戝叧涓殑銆愰棬閿両d
- /// </summary>
+ /// <summary>
+ /// 銆愰棬閿佷簯绔富閿��,鐢ㄤ簬銆愭坊鍔犻棬閿佸巻鍙层�戞帴鍙ｄ腑鐨凞oorLockId鍙傛暟鍙娿�愬垹闄ら棬閿併�戞帴鍙ｄ腑鐨凱rimaryId鍙傛暟,娉ㄦ剰涓嶆槸缃戝叧涓殑銆愰棬閿両d
+ /// </summary>
public string Id;
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
public DateTime CreatedOnUtc;
}
@@ -453,14 +453,14 @@
#endregion
#region 鑾峰彇闂ㄩ攣
- /// <summary>
- /// 鑾峰彇闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 鑾峰彇闂ㄩ攣
+ /// </summary>
public class GetDoorLockData : BaseDoorLockServerData
{
- /// <summary>
- /// 浜戠甯愬彿Id -->閿悕 : CloudAccountId (鍙��)
- /// </summary>
+ /// <summary>
+ /// 浜戠甯愬彿Id -->閿悕 : CloudAccountId (鍙��)
+ /// </summary>
public string CloudAccountId = "";
}
@@ -477,58 +477,58 @@
}
[Serializable]
public class CloudDoorLockObj
- {
- /// <summary>
- /// 闂ㄩ攣Id
- /// </summary>
- public string DoorLockId;
- /// <summary>
- /// 浜戠甯愬彿Id
- /// </summary>
- public string CloudAccountId;
- /// <summary>
- /// OpenLockMode 寮�閿佹柟寮�(瀵嗙爜銆佹寚绾广�両C鍗�)
- /// </summary>
+ {
+ /// <summary>
+ /// 闂ㄩ攣Id
+ /// </summary>
+ public string DoorLockId;
+ /// <summary>
+ /// 浜戠甯愬彿Id
+ /// </summary>
+ public string CloudAccountId;
+ /// <summary>
+ /// OpenLockMode 寮�閿佹柟寮�(瀵嗙爜銆佹寚绾广�両C鍗�)
+ /// </summary>
public int OpenLockMode;
- /// <summary>
- /// 闂ㄩ攣鏈湴鐢ㄦ埛Id
- /// </summary>
- public string DoorLockLocalUserId;
- /// <summary>
- /// 浣忓畢Id
- /// </summary>
+ /// <summary>
+ /// 闂ㄩ攣鏈湴鐢ㄦ埛Id
+ /// </summary>
+ public string DoorLockLocalUserId;
+ /// <summary>
+ /// 浣忓畢Id
+ /// </summary>
public byte[] Data;
- /// <summary>
- /// 鐢ㄦ埛Id澶囨敞
- /// </summary>
+ /// <summary>
+ /// 鐢ㄦ埛Id澶囨敞
+ /// </summary>
public string UserIdRemarks;
- /// <summary>
- /// 鏄惁涓虹鐞嗗憳闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 鏄惁涓虹鐞嗗憳闂ㄩ攣
+ /// </summary>
public bool IsAdminDoorLock;
- /// <summary>
- /// 鏄惁涓虹鐞嗗憳闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 鏄惁涓虹鐞嗗憳闂ㄩ攣
+ /// </summary>
public bool IsFreezeUser;
- /// <summary>
- /// 鏄惁涓虹鐞嗗憳闂ㄩ攣
- /// </summary>
+ /// <summary>
+ /// 鏄惁涓虹鐞嗗憳闂ㄩ攣
+ /// </summary>
public bool IsTempUnlockAuthority;
- /// <summary>
- /// 褰曞叆鏃堕棿
- /// </summary>
+ /// <summary>
+ /// 褰曞叆鏃堕棿
+ /// </summary>
public DateTime EntryTime;
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
public string LastChangeTime;
- /// <summary>
- /// 銆愰棬閿佷簯绔富閿��,鐢ㄤ簬銆愭坊鍔犻棬閿佸巻鍙层�戞帴鍙ｄ腑鐨凞oorLockId鍙傛暟鍙娿�愬垹闄ら棬閿併�戞帴鍙ｄ腑鐨凱rimaryId鍙傛暟,娉ㄦ剰涓嶆槸缃戝叧涓殑銆愰棬閿両d
- /// </summary>
+ /// <summary>
+ /// 銆愰棬閿佷簯绔富閿��,鐢ㄤ簬銆愭坊鍔犻棬閿佸巻鍙层�戞帴鍙ｄ腑鐨凞oorLockId鍙傛暟鍙娿�愬垹闄ら棬閿併�戞帴鍙ｄ腑鐨凱rimaryId鍙傛暟,娉ㄦ剰涓嶆槸缃戝叧涓殑銆愰棬閿両d
+ /// </summary>
public string Id;
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
public DateTime CreatedOnUtc;
}
@@ -554,28 +554,28 @@
}
#endregion
- /// <summary>
- /// 鍙戦�侀棬閿佹暟鎹埌鏈嶅姟鍣紝鍙洖澶嶇姸鎬侊紝娌℃湁鏁版嵁澶勭悊
- /// </summary>
- /// <returns>鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑ResponsePack</returns>
- /// <param name="RequestName">璁块棶鍦板潃</param>
- /// <param name="obj">涓�涓被</param>
- public static async Task<ResponsePack> SendDoorLockToServer(string RequestName, object obj)
- {
- try
- {
- //搴忓垪鍖栧璞�
- var requestJson = JsonConvert.SerializeObject(obj);
- //璁块棶鎺ュ彛
- var result = await CommonPage.Instance.RequestHttpsZigbeeAsync(RequestName, System.Text.Encoding.UTF8.GetBytes(requestJson));
-
- return result;
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex.Message);
- return null;
- }
+ /// <summary>
+ /// 鍙戦�侀棬閿佹暟鎹埌鏈嶅姟鍣紝鍙洖澶嶇姸鎬侊紝娌℃湁鏁版嵁澶勭悊
+ /// </summary>
+ /// <returns>鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑ResponsePack</returns>
+ /// <param name="RequestName">璁块棶鍦板潃</param>
+ /// <param name="obj">涓�涓被</param>
+ public static async Task<ResponsePack> SendDoorLockToServer(string RequestName, object obj)
+ {
+ try
+ {
+ //搴忓垪鍖栧璞�
+ var requestJson = JsonConvert.SerializeObject(obj);
+ //璁块棶鎺ュ彛
+ var result = await CommonPage.Instance.RequestHttpsZigbeeAsync(RequestName, System.Text.Encoding.UTF8.GetBytes(requestJson));
+
+ return result;
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ return null;
+ }
}
/// <summary>
@@ -1086,7 +1086,7 @@
result = new DefaultControlResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
- {
+ {
if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
{
var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
@@ -1099,7 +1099,7 @@
tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
result = new DefaultControlResponseAllData { defaultControlResponseData = tempD };
- DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0450_{ topic}");
+ DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0402_{ topic}");
}
}
}
@@ -1128,7 +1128,7 @@
break;
}
}
- if ((DateTime.Now - dateTime).TotalMilliseconds > 9000)
+ if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
{
result = new DefaultControlResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
--
Gitblit v1.8.0