From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 19:51:31 +0800
Subject: [PATCH] 最新代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 79 ++++++++++++++++++++++++++++++++-------
1 files changed, 64 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index bde07d4..a22a1b6 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
@@ -901,11 +917,11 @@
/// </summary>
public bool IsHdlDevice = true;
/// <summary>
- /// 璁惧鐨勫叿浣撶被鍨嬬殑缈昏瘧鍚嶅瓧ID锛圧鏂囦欢閲岄潰鐨勶級
+ /// 璁惧鐨勫叿浣撶被鍨嬬殑缈昏瘧鍚嶅瓧ID,涔熷彨瀹樻柟鍚嶅瓧锛圧鏂囦欢閲岄潰鐨勶級
/// </summary>
public int ConcreteTextId = R.MyInternationalizationString.UnknowDevice;
/// <summary>
- /// 璁惧鐨勫叿浣撶被鍨�(鍊间负鑷畾涔夌殑鍊�,濂藉儚鍙互鏄暅鍍廔D)
+ /// 璁惧鐨勫叿浣撶被鍨�,涔熷彨瀹樻柟绫诲瀷(鍊间负鑷畾涔夌殑鍊�,濂藉儚鍙互鏄暅鍍廔D)
/// </summary>
public DeviceConcreteType ConcreteType = DeviceConcreteType.UnKownDevice;
/// <summary>
@@ -916,6 +932,27 @@
/// 璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧ID锛圧鏂囦欢閲岄潰鐨勶級
/// </summary>
public int BeloneTextId = R.MyInternationalizationString.UnknowDevice;
+ /// <summary>
+ /// 璁惧鐨勯粯璁ゅ娉ㄧ炕璇戝悕瀛桰D(涓汉涓績涓撶敤,Language鏂囦欢閲岄潰鐨�)
+ /// </summary>
+ public int DefultNameId
+ {
+ get
+ {
+ int value = ConcreteTextId + 20000;
+ if (value >= 60000)
+ {
+ //澶т簬60000锛屽垯琛ㄧず杩欎釜涓滆タ涓嶆槸浠庢渤涓滅殑鍚嶇О鍒楄〃涓潵鐨�,瀹冩槸浠庣涓夋柟鍒楄〃鏉ョ殑
+ //鐩存帴杩斿洖瀹冪殑瀹樻柟鍚嶅瓧鍗冲彲
+ return ConcreteTextId;
+ }
+ return value;
+ }
+ }
+ /// <summary>
+ /// 璁惧鐨勭被鍨嬬炕璇戝悕瀛桰D(涓汉涓績涓撶敤,Language鏂囦欢閲岄潰鐨�)
+ /// </summary>
+ public int ObjectTypeNameId = R.MyInternationalizationString.UnknowDevice;
}
#endregion
@@ -1161,6 +1198,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 +1214,9 @@
/// </summary>
public string MsgObjectText = string.Empty;
/// <summary>
- /// 娑堟伅鏂囨湰
+ /// 娑堟伅鏂囨湰(瀵瑰簲涓�鏉℃暟鎹噷闈㈠寘鍚涓姤璀�)
/// </summary>
- public string MsgText = string.Empty;
+ public List<string> listMsg = new List<string>();
}
/// <summary>
@@ -1203,6 +1244,10 @@
/// 宸茶鐘舵��
/// </summary>
public bool IsReading = true;
+ /// <summary>
+ /// 0:鏍囪鍏ㄩ儴宸茶銆�1:娓呯┖鎵�鏈夋秷鎭�
+ /// </summary>
+ public int TagAllOrClearType = 0;
}
#endregion
@@ -1226,6 +1271,10 @@
/// 鏄剧ず璁惧鍘嗗彶鐗堟湰 1 -> 鏄剧ず
/// </summary>
public int DeviceHistory = 0;
+ /// <summary>
+ /// 妫�娴嬭兘鍚﹀箍鎾緱鍒扮綉鍏�
+ /// </summary>
+ public int CheckCanReceiveGateway = 0;
}
#endregion
}
--
Gitblit v1.8.0