From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/DAL/Server/NewApiRes.cs | 242 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 229 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
old mode 100755
new mode 100644
index 5ba1bf8..4d5cf58
--- 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 鈻� 娉ㄥ唽 ____________________________
@@ -428,7 +449,7 @@
/// <summary>
/// 浣忓畢鍦板潃
/// </summary>
- public string Address;
+ public string homeAddress;
}
@@ -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>
/// 瀛愮綉鍙�
@@ -1102,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
@@ -1327,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
@@ -1385,6 +1419,10 @@
public class JPushMessageInfo
{
/// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string HomeId;
+ /// <summary>
/// 鎺ㄩ�佹爣棰�
/// </summary>
public string Title;
@@ -1400,6 +1438,11 @@
/// 淇℃伅绫诲瀷
/// </summary>
public string messageType = "";
+ /// <summary>
+ /// 鎵╁睍鏁版嵁鍐呭
+ /// </summary>
+ public string expantContent = "";
+
}
@@ -1423,6 +1466,10 @@
public class ExpandData
{
/// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
+ /// <summary>
/// 闄勫姞鍐呭
/// </summary>
public string expantContent;
@@ -1432,6 +1479,175 @@
public string messageType;
}
+ /// <summary>
+ /// 钀ょ煶浜戝瓙璐﹀彿token
+ /// </summary>
+ [System.Serializable]
+ public class EZChildAccessToken
+ {
+ /// <summary>
+ /// token
+ /// </summary>
+ public string accessToken;
+ /// <summary>
+ /// 杩囨湡鏃堕棿
+ /// </summary>
+ public string expireTime;
+ }
+
+
+ #region 闊崇
+ /// <summary>
+ /// 鑾峰彇闊崇鍒楄〃
+ /// </summary>
+ [System.Serializable]
+ public class GetSpeakerObj : HomeIdObj
+ {
+ /// <summary>
+ /// 骞冲彴鍚嶇О
+ /// </summary>
+ public string platformName;
+ /// <summary>
+ /// 椤甸潰澶у皬
+ /// </summary>
+ public int pageSize = 100;
+ /// <summary>
+ /// 椤甸潰搴忓彿
+ /// </summary>
+ public int pageNo = 1;
+ }
+
+
+ [System.Serializable]
+ public class SpeakerObj : HomeIdObj
+ {
+ /// <summary>
+ /// 璁板綍鐨勪富閿甶d
+ /// </summary>
+ public string tokenId;
+ }
+
+ /// <summary>
+ /// 鏇存柊闊崇澶囨敞
+ /// </summary>
+ [System.Serializable]
+ public class UpdateSpeakerRemarkObj : SpeakerObj
+ {
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string remark;
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇闊崇鍒嗛厤鐨勮澶囧拰鍦烘櫙鍒楄〃
+ /// </summary>
+ [System.Serializable]
+ public class GetSpeakerDeviceListObj : HomeIdObj
+ {
+ /// <summary>
+ /// 璁板綍鐨勪富閿甶d
+ /// </summary>
+ public string tokenId;
+
+ }
+
+ /// <summary>
+ /// 閰嶇疆鐨勮闊宠澶囧拰鍦烘櫙鏁版嵁
+ /// </summary>
+ [System.Serializable]
+ public class SpeakerTargetInfo
+ {
+ /// <summary>
+ /// 鎺у埗鐨勭洰鏍嘔d锛屼簯绔殑璁惧Id鎴栬�呭満鏅疘d
+ /// </summary>
+ public string targetId;
+ /// <summary>
+ /// 鏄惁鏄澶囷紝鍦烘櫙涓篺alse
+ /// </summary>
+ public bool isDevice;
+ /// <summary>
+ /// 鐩爣鍚嶇О
+ /// </summary>
+ public string targetName;
+ /// <summary>
+ /// 鎵╁睍鍙傛暟褰撳墠rowview鏄惁閫変腑
+ /// </summary>
+ public bool IsSelect;
+ }
+
+ //[System.Serializable]
+ //public class SpeakerTargetInfoRow: SpeakerTargetInfo
+ //{
+ // /// <summary>
+ // /// 褰撳墠rowview鏄惁閫変腑
+ // /// </summary>
+ // public bool isSelect;
+ //}
+
+
+ /// <summary>
+ /// 鏇存柊闊崇鎺у埗鐨勮澶囧拰鍦烘櫙鐩爣
+ /// </summary>
+ [System.Serializable]
+ public class UpdateSpeakerDeviceListObj : SpeakerObj
+ {
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public List<SpeakerTargetInfo> targetInfos;
+ }
+
+ /// <summary>
+ /// 鏇存柊闊崇鎺у埗鐨勮澶囧拰鍦烘櫙鐩爣
+ /// </summary>
+ [System.Serializable]
+ public class SpeakerListRes
+ {
+ /// <summary>
+ /// 闊崇鍒楄〃
+ /// </summary>
+ public List<SpeakerInfo> list;
+ }
+
+ /// <summary>
+ /// 闊崇淇℃伅
+ /// </summary>
+ [System.Serializable]
+ public class SpeakerInfo
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public string platformName { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string remark { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string tokenId { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string userId { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string userRegion { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string homeId { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string homeRegion { get; set; }
+ }
+ #endregion
+
//#region 鏃ф帴鍙�
///// <summary>
/////
--
Gitblit v1.8.0