From d72ca686a3e262693f8a6e45e747e8e8da43335b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 06 七月 2021 09:39:03 +0800
Subject: [PATCH] 2021-07-06 1.更新
---
HDL_ON/DAL/Server/NewApiRes.cs | 218 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 153 insertions(+), 65 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 80a2ac7..c23dac9 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -136,6 +136,27 @@
public string name;
}
+
+ /// <summary>
+ /// 鐧诲綍閿佸畾鍚庣殑寮傚父鎵╁睍鍙傛暟
+ /// </summary>
+ [Serializable]
+ public class AccountLoginLockExtraRes
+ {
+ /// <summary>
+ /// 鏈�澶у厑璁哥殑瀵嗙爜閿欒娆℃暟
+ /// </summary>
+ public int maxPwdErrorNum;
+ /// <summary>
+ /// 褰撳墠閿欒娆℃暟
+ /// </summary>
+ public int currentPwdErrorNum;
+ /// <summary>
+ /// 瑙ｉ攣浜嬩欢
+ /// </summary>
+ public long unlockTime;
+
+ }
#endregion
#region 鈻� 娉ㄥ唽 ____________________________
@@ -316,6 +337,10 @@
/// 鐧诲綍鍚�
/// </summary>
public string loginName;
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚
+ /// </summary>
+ public string memberHeadIcon;
}
@@ -332,6 +357,18 @@
}
+ /// <summary>
+ /// 鏇存柊涓汉澶村儚
+ /// </summary>
+ [System.Serializable]
+ public class UpdateMemberHeadIconRes
+ {
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚
+ /// </summary>
+ public string memberHeadIcon;
+
+ }
/// <summary>
/// 缁戝畾璁よ瘉(鎵嬫満/閭)
@@ -379,6 +416,10 @@
/// 浣忓畢绫诲瀷
/// </summary>
public string homeType;
+ /// <summary>
+ /// 涓嶈嚜鍔ㄧ敓鎴愰粯璁や綇瀹�
+ /// </summary>
+ public bool autoGenerate = false;
}
@@ -503,35 +544,38 @@
/// <summary>
/// 缃戝叧ID
/// </summary>
- public string gatewayId;
+ public string gatewayId ="";
/// <summary>
/// 缃戝叧snID
/// </summary>
- public string sn;
+ public string sn = "";
/// <summary>
///
/// </summary>
- public string aesKey;
+ public string aesKey = "";
/// <summary>
- ///
+ /// BUSUDPGATEWAY,
+ /// AGATEWAY,
+ /// ZIGBEEGATEWAY,
+ /// KNXGATEWAY
/// </summary>
- public string gatewayType;
+ public string gatewayType = "";
/// <summary>
/// 浣忓畢ID
/// </summary>
- public string homeId;
+ public string homeId = "";
/// <summary>
///
/// </summary>
- public string mac;
+ public string mac = "";
/// <summary>
///
/// </summary>
- public string primaryKey;
+ public string primaryKey = "";
/// <summary>
///
/// </summary>
- public string encryptionType;
+ public string encryptionType = "";
/// <summary>
/// 瀛愮綉鍙�
@@ -541,6 +585,12 @@
/// 璁惧鍙�
/// </summary>
public int deviceId;
+ /// <summary>
+ /// 缃戝叧鐘舵��
+ /// ON_LINE(0,"鍦ㄧ嚎"),
+ /// OFF_LINE(1,"涓嬬嚎"),;
+ /// </summary>
+ public bool gatewayStatus;
///// <summary>
/////
@@ -849,56 +899,6 @@
public string homeId;
}
-
-
- //鑾峰彇椤圭洰 (浣忓畢)涓嬮潰鐨勫瓙璐﹀彿
- /// <summary>
- /// 鑾峰彇鎴愬憳淇℃伅鐨勭粨鏋�
- /// </summary>
- /// [Serializable]
- public class SubAccountNewRes
- {
-
- /// <summary>
- ///
- /// </summary>
- public string id;
- /// <summary>
- ///
- /// </summary>
- public string homeId;
- /// <summary>
- ///
- /// </summary>
- public string homeRegionId;
- /// <summary>
- ///
- /// </summary>
- public string childAccountId;
- /// <summary>
- ///
- /// </summary>
- public string childAccountRegionId;
- /// <summary>
- /// 瀛愯处鎴风被鍨� ORDINARY銆丏EBUG銆丄DMIN
- /// </summary>
- public string childAccountType;
- /// <summary>
- /// 鏄惁鍏佽杩滅▼鎺у埗
- /// </summary>
- public bool isRemoteControl;
- /// <summary>
- /// 鏄电О1
- /// </summary>
- public string nickName;
- /// <summary>
- ///
- /// </summary>
- public string createTime;
-
-
- }
-
/// <summary>
/// 鏇存柊瀛愯处鍙峰娉ㄥ悕瀛�
/// </summary>
@@ -1121,6 +1121,18 @@
///
/// </summary>
public string Id;
+ }
+
+ /// <summary>
+ /// AppNameObj
+ /// </summary>
+ [System.Serializable]
+ public class AppNameObj
+ {
+ /// <summary>
+ /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
+ /// </summary>
+ public string appName = SoftwareType.ON_Plus.ToString();
}
#region APP鐗堟湰妫�娴�
@@ -1348,10 +1360,11 @@
/// 瀛愯处鍙稩D
/// </summary>
public string childAccountId;
- /// <summary>
- /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
- /// </summary>
- public string shareType = "DEVICE";
+ ///// <summary>
+ ///// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ ///// 涓嶄紶榛樿鏌ュ叏閮�
+ ///// </summary>
+ //public string shareType = "DEVICE";
}
#endregion
@@ -1361,7 +1374,7 @@
/// <summary>
/// 涓婁紶鍥剧墖
/// </summary>
- /// [System.Serializable]
+ [System.Serializable]
public class UploadImageObj
{
/// <summary>
@@ -1385,7 +1398,7 @@
/// <summary>
/// 鏌ヨ鍥剧墖璺緞
/// </summary>
- /// [System.Serializable]
+ [System.Serializable]
public class GetImageUrlObj
{
/// <summary>
@@ -1399,6 +1412,81 @@
#endregion
+ /// <summary>
+ /// 鏋佸厜鎺ㄩ�佹秷鎭�
+ /// </summary>
+ [System.Serializable]
+ public class JPushMessageInfo
+ {
+ /// <summary>
+ /// 鎺ㄩ�佹爣棰�
+ /// </summary>
+ public string Title;
+ /// <summary>
+ /// 鎺ㄩ�佸唴瀹�
+ /// </summary>
+ public string Content;
+ /// <summary>
+ /// 鎺ㄩ�侀檮鍔犳暟鎹�
+ /// </summary>
+ public string Extras;
+ /// <summary>
+ /// 淇℃伅绫诲瀷
+ /// </summary>
+ public string messageType = "";
+ /// <summary>
+ /// 鎵╁睍鏁版嵁鍐呭
+ /// </summary>
+ public string expantContent = "";
+
+
+ }
+
+ /// <summary>
+ /// 鏋佸厜鎺ㄩ�佹秷鎭�
+ /// </summary>
+ [System.Serializable]
+ public class JPushExpandData
+ {
+ /// <summary>
+ /// 闄勫姞鍐呭
+ /// </summary>
+ public string expandData;
+
+ }
+
+ /// <summary>
+ /// 鏋佸厜鎺ㄩ�佹秷鎭�
+ /// </summary>
+ [System.Serializable]
+ public class ExpandData
+ {
+ /// <summary>
+ /// 闄勫姞鍐呭
+ /// </summary>
+ public string expantContent;
+ /// <summary>
+ /// 淇℃伅绫诲瀷
+ /// </summary>
+ public string messageType;
+ }
+
+ /// <summary>
+ /// 钀ょ煶浜戝瓙璐﹀彿token
+ /// </summary>
+ [System.Serializable]
+ public class EZChildAccessToken
+ {
+ /// <summary>
+ /// token
+ /// </summary>
+ public string accessToken;
+ /// <summary>
+ /// 杩囨湡鏃堕棿
+ /// </summary>
+ public string expireTime;
+ }
+
//#region 鏃ф帴鍙�
///// <summary>
--
Gitblit v1.8.0