From bd46c57c77c276014db3192a4e2cc96e23c93202 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 21 二月 2020 13:08:47 +0800
Subject: [PATCH] 先上传个版本吧
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index bde07d4..cef4eaa 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
@@ -1203,6 +1219,10 @@
/// 宸茶鐘舵��
/// </summary>
public bool IsReading = true;
+ /// <summary>
+ /// 0:鏍囪鍏ㄩ儴宸茶銆�1:娓呯┖鎵�鏈夋秷鎭�
+ /// </summary>
+ public int TagAllOrClearType = 0;
}
#endregion
--
Gitblit v1.8.0