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 | 102 +++++++++++++++++----------------------------------
1 files changed, 34 insertions(+), 68 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
old mode 100644
new mode 100755
index 9b014e5..5ba1bf8
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -569,24 +569,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>
/////
@@ -893,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>
@@ -1463,9 +1396,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