From bbaae33cad1dadaad27eeac712d30fff248bffa5 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 17 三月 2020 17:46:25 +0800
Subject: [PATCH] 2020-03-17-2

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

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 3167003..cf4ba8c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -14,7 +14,7 @@
         /// <summary>
         /// 鏄惁鏄瓙璐﹀彿杩涜鎿嶄綔
         /// </summary>
-        public bool IsOtherAccountCtrl = Common.Config.Instance.isAdministrator;
+        public bool IsOtherAccountCtrl = Common.Config.Instance.Home.IsOthreShare;
     }
 
     #endregion
@@ -36,6 +36,7 @@
         /// <summary>
         /// DistributedMark
         /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
         public string DistributedMark = string.Empty;
         /// <summary>
         /// 閭
@@ -58,9 +59,34 @@
         /// </summary>
         public string AuthorityText = string.Empty;
         /// <summary>
+        /// 鐢ㄦ埛澶村儚鏁版嵁(涓存椂鐢�,浼氱疆绌�)
+        /// </summary>
+        public byte[] HeadImage = null;
+        /// <summary>
+        /// 鎵嬪娍瀵嗙爜(涓存椂鐢�,浼氱疆绌�)
+        /// </summary>
+        public string GesturePwd = string.Empty;
+        /// <summary>
+        /// 瀵嗙爜楠岃瘉(涓存椂鐢�,浼氱疆绌�)
+        /// </summary>
+        public string StringPwd = string.Empty;
+
+
+        /// <summary>
         /// 鐢ㄦ埛鍥炬爣鏂囦欢
         /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
         public string UserIconFile = string.Empty;
+        /// <summary>
+        /// 鐢ㄦ埛鍥炬爣鏂囦欢鏄惁鏀瑰彉
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public bool UserIconFileChanged = false;
+        /// <summary>
+        /// 鏄惁鍒濆鍖栫敤鎴蜂俊鎭垚鍔�
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public bool InitUserInfoSuccess = false;
     }
 
     /// <summary>
@@ -83,6 +109,17 @@
         /// 鐢ㄦ埛鍚�
         /// </summary>
         public string UserName = string.Empty;
+    }
+
+    /// <summary>
+    /// 鏄电О淇℃伅
+    /// </summary>
+    public class NicknameInfo
+    {
+        /// <summary>
+        /// 鏄电О
+        /// </summary>
+        public string nickname = string.Empty;
     }
 
     #endregion
@@ -125,6 +162,10 @@
         /// AccountType
         /// </summary>
         public int AccountType = 0;
+        /// <summary>
+        /// 鏄惁鎷ユ湁杩滅▼鎺у埗鏉冮檺
+        /// </summary>
+        public bool IsAllowRemoteCtrl = false;
     }
 
     /// <summary>
@@ -152,6 +193,10 @@
         /// 鎵嬫満鍙�
         /// </summary>
         public string Phone = string.Empty;
+        /// <summary>
+        /// 澶村儚鏁版嵁
+        /// </summary>
+        public byte[] HeadImage = null;
     }
 
     #endregion
@@ -402,6 +447,10 @@
         /// 鍥轰欢鍒嗗竷寮忓敮涓�,涔熸槸涓嬭浇鏃剁殑[涓嬭浇鍥轰欢鐨勫敮涓�鏍囪瘑]鍙傛暟
         /// </summary>
         public string DistributedMark = string.Empty;
+        /// <summary>
+        /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+        /// </summary>
+        public string CreatedOnUtc = string.Empty;
     }
 
     /// <summary>
@@ -463,6 +512,10 @@
         /// 闀滃儚绫诲瀷
         /// </summary>
         public string ImagType = string.Empty;
+        /// <summary>
+        /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+        /// </summary>
+        public string CreatedOnUtc = string.Empty;
     }
 
     #endregion
@@ -762,7 +815,7 @@
         /// <summary>
         /// Page
         /// </summary>
-        public int Page = 0;
+        public int Page = 1;
         /// <summary>
         /// PageSize
         /// </summary>
@@ -891,21 +944,21 @@
     public class MemberShardInfoData
     {
         /// <summary>
-        /// 鎴愬憳鐨勫叏閮ㄥ垎浜暟鎹�,閲岄潰鍖呭惈鎵�鏈夌殑鏂囦欢(keys:鎴块棿鏂囦欢鍚�  value:鏂囦欢鍚�)
-        /// </summary>
-        public Dictionary<string, HashSet<string>> dicAllMemberShard = new Dictionary<string, HashSet<string>>();
-        /// <summary>
         /// 鍏ㄩ儴鐨勫垎浜枃浠剁殑涓婚敭(keys:鏂囦欢鍚�  value:涓婚敭)
         /// </summary>
         public Dictionary<string, string> dicAllShardKeys = new Dictionary<string, string>();
         /// <summary>
         /// 鍒嗕韩鎴块棿鐨勫璞�(瀹冩槸浠庝簯绔潵鐨�,keys:鏂囦欢鍚�)
         /// </summary>
-        public Dictionary<string, Common.Room> dicShardRoom = new Dictionary<string, Common.Room>();
+        public Dictionary<string, Room> dicShardRoom = new Dictionary<string, Common.Room>();
         /// <summary>
         /// 鍒嗕韩鐨勬ゼ灞�
         /// </summary>
         public Dictionary<string, string> dicShardFloor = new Dictionary<string, string>();
+        /// <summary>
+        /// 涓存椂鍙橀噺(杩欎釜涓滆タ涓簄ull,鍗充笉鏄柊鍒嗕韩鐨勬埧闂�,鍚﹀垯鏄柊鍒嗕韩鐨勬埧闂淬�傜敤瀹岃寰楃疆绌�)
+        /// </summary>
+        public Room TempRoom = null;
         /// <summary>
         /// 鏄惁闇�瑕佸埛鏂�
         /// </summary>
@@ -990,4 +1043,217 @@
     }
 
     #endregion
+
+    #region 鈻� 浣忓畢淇℃伅绫籣_________________________
+
+    /// <summary>
+    ///  缂栬緫浣忓畢鐨勫惎鍔ㄥ弬鏁�
+    /// </summary>
+    public class EditorResidencePra : 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 = "";
+        /// <summary>
+        /// Name
+        /// </summary>
+        public string Name = string.Empty;
+        /// <summary>
+        /// 缁忓害
+        /// </summary>
+        public double Longitude = 0;
+        /// <summary>
+        /// 绾害
+        /// </summary>
+        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>
+        /// 鏄惁宸茶(listMsg鍖归厤,瀵瑰簲涓�鏉℃暟鎹噷闈㈠寘鍚涓姤璀�)
+        /// </summary>
+        public List<bool> ListReading = new List<bool>();
+        /// <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 List<string> listMsg = new List<string>();
+    }
+
+    /// <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;
+        /// <summary>
+        /// 0:鏍囪鍏ㄩ儴宸茶銆�1:娓呯┖鎵�鏈夋秷鎭�
+        /// </summary>
+        public int TagAllOrClearType = 0;
+    }
+
+    #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;
+        /// <summary>
+        /// 妫�娴嬭兘鍚﹀箍鎾緱鍒扮綉鍏�
+        /// </summary>
+        public int CheckCanReceiveGateway = 0;
+    }
+    #endregion
 }

--
Gitblit v1.8.0