From 9eec81850e418a3c16410b4870910bde142b06e3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 14 九月 2022 15:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc
---
HDL_ON/DAL/Server/NewApiRes.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index f005989..1f2c5b9 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -62,6 +62,36 @@
#endregion
+ #region =============璁垮绠＄悊=============
+ /// <summary>
+ /// 璁垮涓存椂瀵嗙爜
+ /// </summary>
+ [System.Serializable]
+ public class VisitorTempPassword
+ {
+ public string id;
+ public string homeId;
+ public string phone;//":"13355558888",
+ public string tempPwd;//":"123456",
+ public string validBeginTime;//":"2022-05-06 13:00:00",
+ public string validEndTime;//":"2022-05-09 13:00:00",
+ public int useCount;//":1,
+ public bool status = true;//:true
+ }
+
+ /// <summary>
+ /// 鑾峰彇涓存椂瀵嗙爜鍒楄〃
+ /// </summary>
+ public class GetTempPasswordList
+ {
+ public string pageNo;//": 0,
+ public string pageSize;//": 0,
+ public string totalCount;//": 0,
+ public string totalPage;//": 0
+ public List<VisitorTempPassword> list;
+ }
+ #endregion
+
#region 鈻� 鐧诲綍 ____________________________
[System.Serializable]
public class LoginObj
@@ -1091,6 +1121,18 @@
}
/// <summary>
+ /// 璁惧鎺ㄩ�佹秷鎭鍒�
+ /// </summary>
+ [Serializable]
+ public class DeviceMessageRules
+ {
+ public string homeId;
+ public string deviceId;
+ public string conditionIdentify;
+ public bool push;
+ }
+
+ /// <summary>
///
/// </summary>
[System.Serializable]
@@ -1474,12 +1516,14 @@
/// 鎵╁睍鏁版嵁鍐呭
/// </summary>
public string expantContent = "";
-
/// <summary>
- /// 璁惧绫诲瀷
- /// HDL: door.gate
+ /// spk鏍囧織锛屽�间负door.gate鏃惰〃绀鸿嚜鐮�
/// </summary>
- public string spk = "";
+ public string spk="";
+ /// <summary>
+ /// sip璐﹀彿
+ /// </summary>
+ public string sipAccount;
}
@@ -1505,7 +1549,7 @@
/// <summary>
/// 浣忓畢ID
/// </summary>
- public string homeId ;
+ public string homeId;
/// <summary>
/// 闄勫姞鍐呭
/// </summary>
@@ -1514,8 +1558,6 @@
/// 淇℃伅绫诲瀷
/// </summary>
public string messageType;
-
- public string spk;
}
/// <summary>
--
Gitblit v1.8.0