From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 20 +++++++++++++++-----
1 files changed, 15 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..5004d73 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -60,7 +60,17 @@
/// <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>
@@ -891,22 +901,22 @@
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>
public bool Refresh = true;
--
Gitblit v1.8.0