From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/DAL/Server/NewApiRes.cs | 357 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 294 insertions(+), 63 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 8b7a67a..055a093 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -49,6 +49,17 @@
public string regionUrl;
}
+ /// <summary>
+ /// 鍒嗛〉
+ /// </summary>
+ public class BasePagingObj
+ {
+ public int totalCount = 0;
+ public int totalPage = 0;
+ public int pageNo = 0;
+ public int pageSize = 0;
+ }
+
#endregion
#region 鈻� 鐧诲綍 ____________________________
@@ -134,6 +145,27 @@
/// 鐢ㄦ埛鍚嶅瓧
/// </summary>
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
@@ -428,7 +460,7 @@
/// <summary>
/// 浣忓畢鍦板潃
/// </summary>
- public string Address;
+ public string homeAddress;
}
@@ -523,38 +555,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 +910,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>
@@ -1085,6 +1067,15 @@
/// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
/// </summary>
public string software = SoftwareType.ON_Plus.ToString();
+ /// <summary>
+ /// 灏忓尯codes锛堜笉浼狅紝榛樿缁戝畾鎵�鏈変綇瀹呭拰灏忓尯鐨勬帹閫侊級
+ /// </summary>
+ public List<string> communityCodes;
+ /// <summary>
+ /// 鎸囧畾鎺ㄩ�佽瑷� 锛堢洰鍓嶈鍙傛暟杩樻病鐢級
+ /// 2021-09-13 澧炲姞褰撳墠APP浣跨敤鐨勮瑷�鍙傛暟锛� 鐩墠浜戠鎺ュ彛杩樻病鏀寔
+ /// </summary>
+ public string languageType;
}
/// <summary>
@@ -1114,6 +1105,14 @@
/// ""锛氬叏閮紱Default锛氬垎浜笌鍔熻兘锛汚larm锛氭姤璀︾被锛汸rompt锛氱郴缁熸秷鎭�
/// </summary>
public string pushType;
+ /// <summary>
+ /// 椤甸潰澶у皬
+ /// </summary>
+ public int pageSize = 100;
+ /// <summary>
+ /// 椤甸潰搴忓彿
+ /// </summary>
+ public int pageNo = 1;
}
/// <summary>
@@ -1126,6 +1125,10 @@
/// 娑堟伅璁板綍Id
/// </summary>
public string msgId;
+ /// <summary>
+ /// 鍒犻櫎鐗╀笟鍏憡瑕佽繖涓�
+ /// </summary>
+ public string pushType;
}
@@ -1150,6 +1153,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 +1392,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
@@ -1435,6 +1451,10 @@
public class JPushMessageInfo
{
/// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string HomeId;
+ /// <summary>
/// 鎺ㄩ�佹爣棰�
/// </summary>
public string Title;
@@ -1446,9 +1466,220 @@
/// 鎺ㄩ�侀檮鍔犳暟鎹�
/// </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>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
+ /// <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>
+ /// 鑾峰彇闊崇鍒楄〃
+ /// </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