From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码

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

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 113ad7b..bde07d4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -103,6 +103,17 @@
         public string UserName = string.Empty;
     }
 
+    /// <summary>
+    /// 鏄电О淇℃伅
+    /// </summary>
+    public class NicknameInfo
+    {
+        /// <summary>
+        /// 鏄电О
+        /// </summary>
+        public string nickname = string.Empty;
+    }
+
     #endregion
 
     #region 鈻� 鎴愬憳淇℃伅绫籣_________________________
@@ -143,6 +154,10 @@
         /// AccountType
         /// </summary>
         public int AccountType = 0;
+        /// <summary>
+        /// 鏄惁鎷ユ湁杩滅▼鎺у埗鏉冮檺
+        /// </summary>
+        public bool IsAllowRemoteCtrl = false;
     }
 
     /// <summary>
@@ -784,7 +799,7 @@
         /// <summary>
         /// Page
         /// </summary>
-        public int Page = 0;
+        public int Page = 1;
         /// <summary>
         /// PageSize
         /// </summary>
@@ -1046,4 +1061,171 @@
         public double Latitude = 0;
     }
     #endregion
+
+    #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 = 50;
+        }
+    }
+
+    /// <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
+    {
+        /// <summary>
+        /// 涓婚敭
+        /// </summary>
+        public string Id = string.Empty;
+        /// <summary>
+        /// 涓婚
+        /// </summary>
+        public string Topic = string.Empty;
+        /// <summary>
+        /// 缃戝叧涓婃姤鐨刯son
+        /// </summary>
+        public string PayloadJson = string.Empty;
+        /// <summary>
+        /// 鏄惁宸茶
+        /// </summary>
+        public bool IsReading = false;
+        /// <summary>
+        /// 鏃堕棿 2019-09-10T13:11:55
+        /// </summary>
+        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 鈻� 闅愬尶鍔熻兘绫籣_________________________
+
+    /// <summary>
+    /// 闅愬尶鍔熻兘
+    /// </summary>
+    public class HideOptionInfo
+    {
+        /// <summary>
+        /// 鏄惁鏄剧ず涓婚〉闅愯棌鑿滃崟(Debug鐢�): 1 -> 鏄剧ず
+        /// </summary>
+        public int CenterHideMenu = 0;
+        /// <summary>
+        /// 鏄惁鍑哄姏璇︾粏Log 1 -> 鍑哄姏
+        /// </summary>
+        public int DetailedLog = 0;
+        /// <summary>
+        /// 鏄剧ず璁惧鍘嗗彶鐗堟湰 1 -> 鏄剧ず
+        /// </summary>
+        public int DeviceHistory = 0;
+    }
+    #endregion
 }

--
Gitblit v1.8.0