From 3069c032027eeea7a14fa9f462440bb2d802d9a9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 14:25:09 +0800
Subject: [PATCH] 20210111-合并代码
---
HDL_ON/DAL/Server/NewApiRes.cs | 94 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index ed0dc98..c522247 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 鈻� 娉ㄥ唽 ____________________________
@@ -569,24 +590,7 @@
/// ON_LINE(0,"鍦ㄧ嚎"),
/// OFF_LINE(1,"涓嬬嚎"),;
/// </summary>
- public string gatewayStatus;
- /// <summary>
- /// 缃戝叧鏄惁鍦ㄧ嚎
- /// </summary>
- public bool GatewayOnline
- {
- get
- {
- if (gatewayStatus == "ON_LINE")
- {
- return true;
- }
- else
- {
- return false;
- }
- }
- }
+ public bool gatewayStatus;
///// <summary>
/////
@@ -1119,6 +1123,18 @@
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鐗堟湰妫�娴�
/// <summary>
/// AppVersionCheckObj
@@ -1344,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
@@ -1413,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