From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）

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

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 3167003..22fb634 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -60,7 +60,25 @@
         /// <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;
+        /// <summary>
+        /// 鎵嬪娍瀵嗙爜(涓存椂鐢�,浼氱疆绌�)
+        /// </summary>
+        public string GesturePwd = string.Empty;
+        /// <summary>
+        /// 瀵嗙爜楠岃瘉(涓存椂鐢�,浼氱疆绌�)
+        /// </summary>
+        public string StringPwd = string.Empty;
     }
 
     /// <summary>
@@ -152,6 +170,10 @@
         /// 鎵嬫満鍙�
         /// </summary>
         public string Phone = string.Empty;
+        /// <summary>
+        /// 澶村儚鏁版嵁
+        /// </summary>
+        public byte[] HeadImage = null;
     }
 
     #endregion
@@ -891,21 +913,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 +1012,68 @@
     }
 
     #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 MessageRecordInfo
+    {
+        /// <summary>
+        /// 涓婚敭
+        /// </summary>
+        public string RegId = string.Empty;
+        /// <summary>
+        /// 娑堟伅鍐呭
+        /// </summary>
+        public string MsgContent = string.Empty;
+        /// <summary>
+        /// MsgType
+        /// </summary>
+        public string MsgType = string.Empty;
+        /// <summary>
+        /// 鏄惁宸茶
+        /// </summary>
+        public int IsRead = 0;
+        /// <summary>
+        /// 鏃堕棿 2019-09-10T13:11:55
+        /// </summary>
+        public string MsgTime = string.Empty;
+    }
+    #endregion
 }

--
Gitblit v1.8.0