From cc0d80c7d86c6d0167269b3408c4b30c24ce84e9 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 16:55:37 +0800
Subject: [PATCH] ？？？？？？？

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

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index bde07d4..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,16 +59,6 @@
         /// </summary>
         public string AuthorityText = string.Empty;
         /// <summary>
-        /// 鐢ㄦ埛鍥炬爣鏂囦欢
-        /// </summary>
-        [Newtonsoft.Json.JsonIgnore]
-        public string UserIconFile = string.Empty;
-        /// <summary>
-        /// 鐢ㄦ埛鍥炬爣鏂囦欢鏄惁鏀瑰彉
-        /// </summary>
-        [Newtonsoft.Json.JsonIgnore]
-        public bool UserIconFileChanged = false;
-        /// <summary>
         /// 鐢ㄦ埛澶村儚鏁版嵁(涓存椂鐢�,浼氱疆绌�)
         /// </summary>
         public byte[] HeadImage = null;
@@ -79,6 +70,23 @@
         /// 瀵嗙爜楠岃瘉(涓存椂鐢�,浼氱疆绌�)
         /// </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>
@@ -439,6 +447,10 @@
         /// 鍥轰欢鍒嗗竷寮忓敮涓�,涔熸槸涓嬭浇鏃剁殑[涓嬭浇鍥轰欢鐨勫敮涓�鏍囪瘑]鍙傛暟
         /// </summary>
         public string DistributedMark = string.Empty;
+        /// <summary>
+        /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+        /// </summary>
+        public string CreatedOnUtc = string.Empty;
     }
 
     /// <summary>
@@ -500,6 +512,10 @@
         /// 闀滃儚绫诲瀷
         /// </summary>
         public string ImagType = string.Empty;
+        /// <summary>
+        /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+        /// </summary>
+        public string CreatedOnUtc = string.Empty;
     }
 
     #endregion
@@ -1161,6 +1177,10 @@
         /// </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;
@@ -1173,9 +1193,9 @@
         /// </summary>
         public string MsgObjectText = string.Empty;
         /// <summary>
-        /// 娑堟伅鏂囨湰
+        /// 娑堟伅鏂囨湰(瀵瑰簲涓�鏉℃暟鎹噷闈㈠寘鍚涓姤璀�)
         /// </summary>
-        public string MsgText = string.Empty;
+        public List<string> listMsg = new List<string>();
     }
 
     /// <summary>
@@ -1203,6 +1223,10 @@
         /// 宸茶鐘舵��
         /// </summary>
         public bool IsReading = true;
+        /// <summary>
+        /// 0:鏍囪鍏ㄩ儴宸茶銆�1:娓呯┖鎵�鏈夋秷鎭�
+        /// </summary>
+        public int TagAllOrClearType = 0;
     }
 
     #endregion
@@ -1226,6 +1250,10 @@
         /// 鏄剧ず璁惧鍘嗗彶鐗堟湰 1 -> 鏄剧ず
         /// </summary>
         public int DeviceHistory = 0;
+        /// <summary>
+        /// 妫�娴嬭兘鍚﹀箍鎾緱鍒扮綉鍏�
+        /// </summary>
+        public int CheckCanReceiveGateway = 0;
     }
     #endregion
 }

--
Gitblit v1.8.0