From d28071b18ede6fe5c4502a73d358a36acaa5f678 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 10:57:33 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath

---
 HDL_ON/DAL/Server/NewApiRes.cs |  130 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 121 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index ad8afe2..9b014e5 100644
--- 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;
     }
 
 
@@ -550,6 +570,23 @@
         /// OFF_LINE(1,"涓嬬嚎"),;
         /// </summary>
         public string gatewayStatus;
+        /// <summary>
+        /// 缃戝叧鏄惁鍦ㄧ嚎
+        /// </summary>
+        public bool GatewayOnline
+        {
+            get
+            {
+                if (gatewayStatus == "ON_LINE")
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
 
         ///// <summary>
         ///// 
@@ -841,9 +878,9 @@
     /// 鍒犻櫎瀛愯处鍙�
     /// </summary>
     [System.Serializable]
-    public class ChildDeleteObj: ChildBaseObj
+    public class ChildDeleteObj : ChildBaseObj
     {
-        
+
     }
 
     /// <summary>
@@ -912,7 +949,7 @@
     /// 鏇存柊瀛愯处鍙峰娉ㄥ悕瀛�
     /// </summary>
     [System.Serializable]
-    public class UpdateChildNickNameObj: ChildBaseObj
+    public class UpdateChildNickNameObj : ChildBaseObj
     {
         /// <summary>
         /// nickName
@@ -946,8 +983,23 @@
         /// 鏄惁鍏佽鍒涘缓鍦烘櫙
         /// </summary>
         public bool isAllowCreateScene;
-        
+
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [System.Serializable]
+    public class AccountObj
+    {
+        /// <summary>
+        /// 璐﹀彿
+        /// </summary>
+        public string account;
+
+    }
+
+    
     #endregion
 
     #region 鏁版嵁鍒嗕韩
@@ -1068,7 +1120,7 @@
     /// 
     /// </summary>
     [System.Serializable]
-    public class GetMessageListObj: PushIdObj
+    public class GetMessageListObj : PushIdObj
     {
         /// <summary>
         /// 浣忓畢涓婚敭id
@@ -1093,7 +1145,7 @@
         public string msgId;
     }
 
-   
+
 
     #endregion
 
@@ -1350,9 +1402,69 @@
 
     #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;
+
+    }
 
     //#region 鏃ф帴鍙�
     ///// <summary>

--
Gitblit v1.8.0