From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 08 五月 2020 17:46:44 +0800
Subject: [PATCH] 请合并最新代码，优化绑定信息
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 375 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 369 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 5004d73..7c602f5 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
@@ -34,8 +34,14 @@
/// </summary>
public string UserName = string.Empty;
/// <summary>
+ /// 璁板綍涓婁竴娆＄殑鐢ㄦ埛鏄电О(缁欎釜浜轰腑蹇冧慨鏀规樀绉版椂鐢ㄧ殑)
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public string OldUserName = string.Empty;
+ /// <summary>
/// DistributedMark
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string DistributedMark = string.Empty;
/// <summary>
/// 閭
@@ -56,7 +62,22 @@
/// <summary>
/// 鐧婚檰鏉冮檺缂栧彿鐨勭炕璇戝悕锛�1:涓昏处鍙疯嚜宸�(鏈汉) 2:璧嬩簣绠＄悊鍛樻潈闄愮殑鎴愬憳 3:鎴愬憳
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string AuthorityText = string.Empty;
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚鏁版嵁(涓存椂鐢�,浼氱疆绌�)
+ /// </summary>
+ public byte[] HeadImage = null;
+ /// <summary>
+ /// 鎵嬪娍瀵嗙爜(涓存椂鐢�,浼氱疆绌�)
+ /// </summary>
+ public string GesturePwd = string.Empty;
+ /// <summary>
+ /// 瀵嗙爜楠岃瘉(涓存椂鐢�,浼氱疆绌�)
+ /// </summary>
+ public string StringPwd = string.Empty;
+
+
/// <summary>
/// 鐢ㄦ埛鍥炬爣鏂囦欢
/// </summary>
@@ -68,9 +89,10 @@
[Newtonsoft.Json.JsonIgnore]
public bool UserIconFileChanged = false;
/// <summary>
- /// 鐢ㄦ埛澶村儚鏁版嵁
+ /// 鏄惁鍒濆鍖栫敤鎴蜂俊鎭垚鍔�
/// </summary>
- public byte[] HeadImage = null;
+ [Newtonsoft.Json.JsonIgnore]
+ public bool InitUserInfoSuccess = false;
}
/// <summary>
@@ -93,6 +115,17 @@
/// 鐢ㄦ埛鍚�
/// </summary>
public string UserName = string.Empty;
+ }
+
+ /// <summary>
+ /// 鏄电О淇℃伅
+ /// </summary>
+ public class NicknameInfo
+ {
+ /// <summary>
+ /// 鏄电О
+ /// </summary>
+ public string nickname = string.Empty;
}
#endregion
@@ -135,6 +168,10 @@
/// AccountType
/// </summary>
public int AccountType = 0;
+ /// <summary>
+ /// 鏄惁鎷ユ湁杩滅▼鎺у埗鏉冮檺
+ /// </summary>
+ public bool IsAllowRemoteCtrl = false;
}
/// <summary>
@@ -162,6 +199,10 @@
/// 鎵嬫満鍙�
/// </summary>
public string Phone = string.Empty;
+ /// <summary>
+ /// 澶村儚鏁版嵁
+ /// </summary>
+ public byte[] HeadImage = null;
}
#endregion
@@ -412,6 +453,10 @@
/// 鍥轰欢鍒嗗竷寮忓敮涓�,涔熸槸涓嬭浇鏃剁殑[涓嬭浇鍥轰欢鐨勫敮涓�鏍囪瘑]鍙傛暟
/// </summary>
public string DistributedMark = string.Empty;
+ /// <summary>
+ /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+ /// </summary>
+ public string CreatedOnUtc = string.Empty;
}
/// <summary>
@@ -473,6 +518,10 @@
/// 闀滃儚绫诲瀷
/// </summary>
public string ImagType = string.Empty;
+ /// <summary>
+ /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+ /// </summary>
+ public string CreatedOnUtc = string.Empty;
}
#endregion
@@ -772,7 +821,7 @@
/// <summary>
/// Page
/// </summary>
- public int Page = 0;
+ public int Page = 1;
/// <summary>
/// PageSize
/// </summary>
@@ -820,6 +869,10 @@
/// 涓婃姤鏃堕棿(hh:mm:ss)
/// </summary>
public string Time = string.Empty;
+ /// <summary>
+ /// 2020.04.13杩藉姞鏂板垎绫� 1:涓�鑸姤璀� 9000:闂ㄩ攣甯稿紑妯″紡鎶ヨ
+ /// </summary>
+ public int MsgDiv = 1;
}
#endregion
@@ -874,11 +927,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>
@@ -889,6 +942,26 @@
/// 璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧ID锛圧鏂囦欢閲岄潰鐨勶級
/// </summary>
public int BeloneTextId = R.MyInternationalizationString.UnknowDevice;
+ /// <summary>
+ /// 璁惧鐨勯粯璁ゅ娉ㄧ炕璇戝悕瀛桰D(涓汉涓績涓撶敤,Language鏂囦欢閲岄潰鐨�)
+ /// </summary>
+ public int DefultNameId
+ {
+ get
+ {
+ int value = ConcreteTextId + 20000;
+ //榛樿澶囨敞鍚嶇О鏄湪50000~59999
+ if (50000 <= value && value <= 59999)
+ {
+ return value;
+ }
+ return ConcreteTextId;
+ }
+ }
+ /// <summary>
+ /// 璁惧鐨勭被鍨嬬炕璇戝悕瀛桰D(涓汉涓績涓撶敤,Language鏂囦欢閲岄潰鐨�)
+ /// </summary>
+ public int ObjectTypeNameId = R.MyInternationalizationString.UnknowDevice;
}
#endregion
@@ -1000,4 +1073,294 @@
}
#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 MessageInfoPra : 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 = Common.Config.Instance.Home.Id;
+ /// <summary>
+ /// 涓婚
+ /// </summary>
+ public string Topic = null;
+ /// <summary>
+ /// 寮�濮嬫椂闂�
+ /// </summary>
+ public string BeginTime = null;
+ /// <summary>
+ /// 缁撴潫鏃堕棿
+ /// </summary>
+ public string EndTime = null;
+ /// <summary>
+ /// 椤垫暟
+ /// </summary>
+ public PageSettingInfo PageSetting = new PageSettingInfo();
+
+ public MessageInfoPra()
+ {
+ PageSetting.PageSize = 50;
+ }
+ }
+
+ /// <summary>
+ /// 娑堟伅涓績鐨勭粨鏋滆繑鍥炲��
+ /// </summary>
+ public class MessageCentetInfo
+ {
+ /// <summary>
+ /// 鍒楄〃鏁版嵁
+ /// </summary>
+ public List<MessageRecordInfo> PageData = null;
+ /// <summary>
+ /// PageIndex
+ /// </summary>
+ public int PageIndex = 0;
+ /// <summary>
+ /// PageSize
+ /// </summary>
+ public int PageSize = 0;
+ /// <summary>
+ /// TotalCount
+ /// </summary>
+ public int TotalCount = 0;
+ /// <summary>
+ /// TotalPages
+ /// </summary>
+ public int TotalPages = 0;
+ /// <summary>
+ /// HasPreviousPage
+ /// </summary>
+ public bool HasPreviousPage = false;
+ /// <summary>
+ /// HasNextPage
+ /// </summary>
+ public bool HasNextPage = false;
+ }
+
+ /// <summary>
+ /// 淇℃伅缁撴灉
+ /// </summary>
+ public class MessageRecordInfo
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ public string Id = string.Empty;
+ /// <summary>
+ /// 涓婚
+ /// </summary>
+ public string Topic = string.Empty;
+ /// <summary>
+ /// 缃戝叧涓婃姤鐨刯son
+ /// </summary>
+ public string PayloadJson = string.Empty;
+ /// <summary>
+ /// 鏄惁宸茶
+ /// </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;
+ /// <summary>
+ /// 鍥剧墖鍦板潃
+ /// </summary>
+ public string IconPath = string.Empty;
+ /// <summary>
+ /// 娑堟伅绫诲瀷
+ /// </summary>
+ public string MsgObjectText = string.Empty;
+ /// <summary>
+ /// 娑堟伅鏂囨湰(瀵瑰簲涓�鏉℃暟鎹噷闈㈠寘鍚涓姤璀�)
+ /// </summary>
+ public List<string> listMsg = new List<string>();
+ }
+
+ /// <summary>
+ /// 璁剧疆娑堟伅宸茶鐘舵�佺殑鍚姩鍙傛暟
+ /// </summary>
+ public class MessageReadStatuPra : 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 = Common.Config.Instance.Home.Id;
+ /// <summary>
+ /// ID
+ /// </summary>
+ public string Id = string.Empty;
+ /// <summary>
+ /// 宸茶鐘舵��
+ /// </summary>
+ public bool IsReading = true;
+ /// <summary>
+ /// 0:鏍囪鍏ㄩ儴宸茶銆�1:娓呯┖鎵�鏈夋秷鎭�
+ /// </summary>
+ public int TagAllOrClearType = 0;
+ }
+
+ #endregion
+
+ #region 鈻� 闅愬尶鍔熻兘绫籣_________________________
+
+ /// <summary>
+ /// 闅愬尶鍔熻兘
+ /// </summary>
+ public class HideOptionInfo
+ {
+ /// <summary>
+ /// 鏄惁鏄剧ず涓婚〉闅愯棌鑿滃崟(Debug鐢�): 1 -> 鏄剧ず
+ /// </summary>
+ public int CenterHideMenu = 0;
+ /// <summary>
+ /// 鏄惁鍑哄姏璇︾粏Log 1 -> 鍑哄姏
+ /// </summary>
+ public int DetailedLog = 0;
+ /// <summary>
+ /// 鏄剧ず璁惧鍘嗗彶鐗堟湰 1 -> 鏄剧ず
+ /// </summary>
+ public int DeviceHistory = 0;
+ /// <summary>
+ /// 妫�娴嬭兘鍚﹀箍鎾緱鍒扮綉鍏� 1->寮�鍚�
+ /// </summary>
+ public int CheckCanReceiveGateway = 0;
+ /// <summary>
+ /// 寮哄埗璺宠浆鐪熷疄璁惧鐣岄潰 1->璁惧鍒楄〃寮哄埗璺宠浆
+ /// </summary>
+ public int GotoRealDeviceForm = 0;
+ /// <summary>
+ /// 寮哄埗璺宠浆缃戝叧浜у搧鐣岄潰 1->缃戝叧鍒楄〃寮哄埗璺宠浆
+ /// </summary>
+ public int GotoGatewayProductInfoForm = 0;
+ }
+ #endregion
+
+ #region 鈻� 闂ㄩ攣鐨勬姤璀︾粨鏋淿_____________________
+
+ /// <summary>
+ /// 闂ㄩ攣鐨勬姤璀︾粨鏋�
+ /// </summary>
+ public class DoorLockAlarmsResult
+ {
+ /// <summary>
+ /// 鎶ヨ绫诲瀷
+ /// </summary>
+ public int AlarmCode = -1;
+ /// <summary>
+ /// Clusterid
+ /// </summary>
+ public int Clusterid = -1;
+ }
+
+ #endregion
+
+ #region 鈻� 鑷姩鍖栨帹閫佺粨鏋淿_____________________
+
+ /// <summary>
+ /// 鑷姩鍖栨帹閫佸唴瀹�
+ /// </summary>
+ public class LogicPushResult
+ {
+ /// <summary>
+ /// 鑷姩鍖朓D
+ /// </summary>
+ public int LogicId = -1;
+ /// <summary>
+ /// 鑷姩鍖栧悕绉�
+ /// </summary>
+ public string LogicName = string.Empty;
+ /// <summary>
+ /// 鑷姩鍖栨帹閫佸唴瀹�
+ /// </summary>
+ public string LogicCustomPushText = string.Empty;
+ /// <summary>
+ /// 闂ㄩ攣甯稿紑妯″紡鏁版嵁(鑷姩鍖栨帹閫�)
+ /// </summary>
+ public DoorNormallyOpenData ActionData = null;
+ }
+
+ /// <summary>
+ /// 闂ㄩ攣甯稿紑妯″紡鏁版嵁(鑷姩鍖栨帹閫�)
+ /// </summary>
+ public class DoorNormallyOpenData
+ {
+ /// <summary>
+ /// 8:甯稿紑妯″紡鐨勬暟鎹�
+ /// </summary>
+ public int Actiontype = -1;
+ /// <summary>
+ /// 闂ㄩ攣Mac鍦板潃
+ /// </summary>
+ public string MacStr = string.Empty;
+ /// <summary>
+ /// 闂ㄩ攣绔彛鍙�
+ /// </summary>
+ public int Epoint = -1;
+ /// <summary>
+ /// 璁剧疆鑷姩鍖栨椂锛屽彂閫佺殑閫忎紶鏁版嵁 055704010112:甯稿紑妯″紡鎵撳紑 055704010113:甯稿紑妯″紡鍏抽棴
+ /// </summary>
+ public string PassDataString = string.Empty;
+ }
+
+ #endregion
}
--
Gitblit v1.8.0