From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 17 十二月 2019 17:21:07 +0800 Subject: [PATCH] 合并一个版本 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 123 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs index da3d02d..468de53 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> @@ -83,6 +101,17 @@ /// 鐢ㄦ埛鍚� /// </summary> public string UserName = string.Empty; + } + + /// <summary> + /// 鏄电О淇℃伅 + /// </summary> + public class NicknameInfo + { + /// <summary> + /// 鏄电О + /// </summary> + public string nickname = string.Empty; } #endregion @@ -125,6 +154,10 @@ /// AccountType /// </summary> public int AccountType = 0; + /// <summary> + /// 鏄惁鎷ユ湁杩滅▼鎺у埗鏉冮檺 + /// </summary> + public bool IsAllowRemoteCtrl = false; } /// <summary> @@ -152,6 +185,10 @@ /// 鎵嬫満鍙� /// </summary> public string Phone = string.Empty; + /// <summary> + /// 澶村儚鏁版嵁 + /// </summary> + public byte[] HeadImage = null; } #endregion @@ -990,4 +1027,90 @@ } #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 Id = string.Empty; + /// <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 + + #region 鈻� 闅愬尶鍔熻兘绫籣_________________________ + + /// <summary> + /// 闅愬尶鍔熻兘 + /// </summary> + public class HideOptionInfo + { + /// <summary> + /// 鏄惁鏄剧ず涓婚〉闅愯棌鑿滃崟(Debug鐢�): 1 -> 鏄剧ず + /// </summary> + public int CenterHideMenu = 0; + /// <summary> + /// 鏄惁鍑哄姏璇︾粏Log 1 -> 鍑哄姏 + /// </summary> + public int DetailedLog = 0; + } + #endregion } -- Gitblit v1.8.0