From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs |  133 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 122 insertions(+), 11 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 468de53..3c21f62 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -799,7 +799,7 @@
         /// <summary>
         /// Page
         /// </summary>
-        public int Page = 0;
+        public int Page = 1;
         /// <summary>
         /// PageSize
         /// </summary>
@@ -1065,6 +1065,81 @@
     #region 鈻� 娑堟伅绠＄悊绫籣_________________________
 
     /// <summary>
+    /// 鑾峰彇娑堟伅璁板綍鐨勮姹傚弬鏁�
+    /// </summary>
+    public class MessageInfoPra : IfacePraCommon
+    {
+        /// <summary>
+        /// RequestVersion
+        /// </summary>
+        public string RequestVersion = Common.CommonPage.RequestVersion;
+        /// <summary>
+        /// LoginAccessToken
+        /// </summary>
+        public string LoginAccessToken = Common.Config.Instance.Token;
+        /// <summary>
+        /// ZigbeeHomeId
+        /// </summary>
+        public string HomeId = Common.Config.Instance.Home.Id;
+        /// <summary>
+        /// 涓婚
+        /// </summary>
+        public string Topic = null;
+        /// <summary>
+        /// 寮�濮嬫椂闂�
+        /// </summary>
+        public string BeginTime = null;
+        /// <summary>
+        /// 缁撴潫鏃堕棿
+        /// </summary>
+        public string EndTime = null;
+        /// <summary>
+        /// 椤垫暟
+        /// </summary>
+        public PageSettingInfo PageSetting = new PageSettingInfo();
+
+        public MessageInfoPra()
+        {
+            PageSetting.PageSize = 10;
+        }
+    }
+
+    /// <summary>
+    /// 娑堟伅涓績鐨勭粨鏋滆繑鍥炲��
+    /// </summary>
+    public class MessageCentetInfo
+    {
+        /// <summary>
+        /// 鍒楄〃鏁版嵁
+        /// </summary>
+        public List<MessageRecordInfo> PageData = null;
+        /// <summary>
+        /// PageIndex
+        /// </summary>
+        public int PageIndex = 0;
+        /// <summary>
+        /// PageSize
+        /// </summary>
+        public int PageSize = 0;
+        /// <summary>
+        /// TotalCount
+        /// </summary>
+        public int TotalCount = 0;
+        /// <summary>
+        /// TotalPages
+        /// </summary>
+        public int TotalPages = 0;
+        /// <summary>
+        /// HasPreviousPage
+        /// </summary>
+        public bool HasPreviousPage = false;
+        /// <summary>
+        /// HasNextPage
+        /// </summary>
+        public bool HasNextPage = false;
+    }
+
+    /// <summary>
     /// 淇℃伅缁撴灉
     /// </summary>
     public class MessageRecordInfo
@@ -1074,26 +1149,62 @@
         /// </summary>
         public string Id = string.Empty;
         /// <summary>
-        /// 鎴戜篃涓嶇煡閬撹繖涓槸浠�涔堥
+        /// 涓婚
         /// </summary>
-        public string RegId = string.Empty;
+        public string Topic = string.Empty;
         /// <summary>
-        /// 娑堟伅鍐呭
+        /// 缃戝叧涓婃姤鐨刯son
         /// </summary>
-        public string MsgContent = string.Empty;
-        /// <summary>
-        /// MsgType
-        /// </summary>
-        public string MsgType = string.Empty;
+        public string PayloadJson = string.Empty;
         /// <summary>
         /// 鏄惁宸茶
         /// </summary>
-        public int IsRead = 0;
+        public bool IsReading = false;
         /// <summary>
         /// 鏃堕棿 2019-09-10T13:11:55
         /// </summary>
-        public string MsgTime = string.Empty;
+        public string CreatedOnUtc = string.Empty;
+        /// <summary>
+        /// 鍥剧墖鍦板潃
+        /// </summary>
+        public string IconPath = string.Empty;
+        /// <summary>
+        /// 娑堟伅绫诲瀷
+        /// </summary>
+        public string MsgObjectText = string.Empty;
+        /// <summary>
+        /// 娑堟伅鏂囨湰
+        /// </summary>
+        public string MsgText = string.Empty;
     }
+
+    /// <summary>
+    /// 璁剧疆娑堟伅宸茶鐘舵�佺殑鍚姩鍙傛暟
+    /// </summary>
+    public class MessageReadStatuPra : IfacePraCommon
+    {
+        /// <summary>
+        /// RequestVersion
+        /// </summary>
+        public string RequestVersion = Common.CommonPage.RequestVersion;
+        /// <summary>
+        /// LoginAccessToken
+        /// </summary>
+        public string LoginAccessToken = Common.Config.Instance.Token;
+        /// <summary>
+        /// ZigbeeHomeId
+        /// </summary>
+        public string HomeId = Common.Config.Instance.Home.Id;
+        /// <summary>
+        /// ID
+        /// </summary>
+        public string Id = string.Empty;
+        /// <summary>
+        /// 宸茶鐘舵��
+        /// </summary>
+        public bool IsReading = true;
+    }
+
     #endregion
 
     #region 鈻� 闅愬尶鍔熻兘绫籣_________________________

--
Gitblit v1.8.0