From f77a3add1e7ab266e473da9128bbe5758ba3a890 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 20 十二月 2020 19:29:03 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/DAL/Server/NewApiRes.cs | 138 ++++++++++++++++++++++++++++-----------------
1 files changed, 85 insertions(+), 53 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
old mode 100644
new mode 100755
index 80a2ac7..5ba1bf8
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -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>
/// 缁戝畾璁よ瘉(鎵嬫満/閭)
@@ -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,6 +564,12 @@
/// 璁惧鍙�
/// </summary>
public int deviceId;
+ /// <summary>
+ /// 缃戝叧鐘舵��
+ /// ON_LINE(0,"鍦ㄧ嚎"),
+ /// OFF_LINE(1,"涓嬬嚎"),;
+ /// </summary>
+ public bool gatewayStatus;
///// <summary>
/////
@@ -847,56 +876,6 @@
/// 浣忓畢ID
/// </summary>
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>
@@ -1361,7 +1340,7 @@
/// <summary>
/// 涓婁紶鍥剧墖
/// </summary>
- /// [System.Serializable]
+ [System.Serializable]
public class UploadImageObj
{
/// <summary>
@@ -1385,7 +1364,7 @@
/// <summary>
/// 鏌ヨ鍥剧墖璺緞
/// </summary>
- /// [System.Serializable]
+ [System.Serializable]
public class GetImageUrlObj
{
/// <summary>
@@ -1399,6 +1378,59 @@
#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