From c5a873df96e4a797426e4dd5eafe5b43f7aea564 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 19 十二月 2020 15:41:53 +0800
Subject: [PATCH] 20201218-2
---
HDL_ON/DAL/Server/NewApiRes.cs | 209 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 148 insertions(+), 61 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
old mode 100644
new mode 100755
index ee11cc6..5ba1bf8
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -17,7 +17,7 @@
[System.Serializable]
public class NullObj
{
-
+
}
#region 鈻� 鍏ㄧ悆鍖哄煙鍒楄〃 ____________________________
@@ -75,7 +75,7 @@
/// 楠岃瘉鐮侊紝鐭俊鐧诲綍鏃跺�欑敤
/// </summary>
public string verifyCode;
-
+
}
@@ -316,6 +316,10 @@
/// 鐧诲綍鍚�
/// </summary>
public string loginName;
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚
+ /// </summary>
+ public string memberHeadIcon;
}
@@ -332,6 +336,18 @@
}
+ /// <summary>
+ /// 鏇存柊涓汉澶村儚
+ /// </summary>
+ [System.Serializable]
+ public class UpdateMemberHeadIconRes
+ {
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚
+ /// </summary>
+ public string memberHeadIcon;
+
+ }
/// <summary>
/// 缁戝畾璁よ瘉(鎵嬫満/閭)
@@ -351,7 +367,7 @@
/// 楠岃瘉鍚�
/// </summary>
public string verifyCode;
-
+
}
@@ -379,6 +395,10 @@
/// 浣忓畢绫诲瀷
/// </summary>
public string homeType;
+ /// <summary>
+ /// 涓嶈嚜鍔ㄧ敓鎴愰粯璁や綇瀹�
+ /// </summary>
+ public bool autoGenerate = false;
}
@@ -513,7 +533,10 @@
/// </summary>
public string aesKey;
/// <summary>
- ///
+ /// BUSUDPGATEWAY,
+ /// AGATEWAY,
+ /// ZIGBEEGATEWAY,
+ /// KNXGATEWAY
/// </summary>
public string gatewayType;
/// <summary>
@@ -541,12 +564,18 @@
/// 璁惧鍙�
/// </summary>
public int deviceId;
+ /// <summary>
+ /// 缃戝叧鐘舵��
+ /// ON_LINE(0,"鍦ㄧ嚎"),
+ /// OFF_LINE(1,"涓嬬嚎"),;
+ /// </summary>
+ public bool gatewayStatus;
///// <summary>
/////
///// </summary>
//public string gwFirmwareVersion;
-
+
///// <summary>
/////
///// </summary>
@@ -832,9 +861,9 @@
/// 鍒犻櫎瀛愯处鍙�
/// </summary>
[System.Serializable]
- public class ChildDeleteObj: ChildBaseObj
+ public class ChildDeleteObj : ChildBaseObj
{
-
+
}
/// <summary>
@@ -849,61 +878,11 @@
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>
[System.Serializable]
- public class UpdateChildNickNameObj: ChildBaseObj
+ public class UpdateChildNickNameObj : ChildBaseObj
{
/// <summary>
/// nickName
@@ -937,8 +916,23 @@
/// 鏄惁鍏佽鍒涘缓鍦烘櫙
/// </summary>
public bool isAllowCreateScene;
-
+
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ [System.Serializable]
+ public class AccountObj
+ {
+ /// <summary>
+ /// 璐﹀彿
+ /// </summary>
+ public string account;
+
+ }
+
+
#endregion
#region 鏁版嵁鍒嗕韩
@@ -1059,7 +1053,7 @@
///
/// </summary>
[System.Serializable]
- public class GetMessageListObj: PushIdObj
+ public class GetMessageListObj : PushIdObj
{
/// <summary>
/// 浣忓畢涓婚敭id
@@ -1084,7 +1078,7 @@
public string msgId;
}
-
+
#endregion
@@ -1341,9 +1335,102 @@
#endregion
+
+ #region 鍥剧墖涓婁紶涓嬭浇
+ /// <summary>
+ /// 涓婁紶鍥剧墖
+ /// </summary>
+ [System.Serializable]
+ public class UploadImageObj
+ {
+ /// <summary>
+ /// 鍓嶇紑鏍囪瘑
+ /// </summary>
+ public string prefix;
+ /// <summary>
+ /// 鍏宠仈ID
+ /// </summary>
+ public string uid;
+ /// <summary>
+ /// 鏂囦欢鍚嶇О
+ /// </summary>
+ public string fileName;
+ /// <summary>
+ /// 鍥剧墖浜岃繘鍒舵祦
+ /// </summary>
+ public byte[] content;
+ }
+
+ /// <summary>
+ /// 鏌ヨ鍥剧墖璺緞
+ /// </summary>
+ [System.Serializable]
+ public class GetImageUrlObj
+ {
+ /// <summary>
+ /// 鍥剧墖涓嬭浇璺緞鏍囪瘑
+ /// </summary>
+ public string imageKey;
+ }
#endregion
+ #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>
+ [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