From 2ae36ddb40d28c62b64a2fdd4c3033e7d65d5cfb Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 三月 2021 15:20:29 +0800
Subject: [PATCH] 2021-0304-1
---
HDL_ON/DAL/Server/NewApiRes.cs | 141 ++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 62 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 8b7a67a..91d22eb 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 鈻� 娉ㄥ唽 ____________________________
@@ -523,38 +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>
/// 瀛愮綉鍙�
@@ -878,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>
@@ -1150,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鐗堟湰妫�娴�
@@ -1377,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
@@ -1446,9 +1430,42 @@
/// 鎺ㄩ�侀檮鍔犳暟鎹�
/// </summary>
public string Extras;
+ /// <summary>
+ /// 淇℃伅绫诲瀷
+ /// </summary>
+ public string messageType = "";
}
+ /// <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;
+ }
+
//#region 鏃ф帴鍙�
///// <summary>
/////
--
Gitblit v1.8.0