From e79b65b97a8ae1eae5ee172dea1b52d041006599 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:24:32 +0800
Subject: [PATCH] 2020-09-02-3
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 413 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 389 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 22fb634..ef0aaaa 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>
/// 閭
@@ -58,16 +64,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 +75,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>
@@ -101,6 +114,17 @@
/// 鐢ㄦ埛鍚�
/// </summary>
public string UserName = string.Empty;
+ }
+
+ /// <summary>
+ /// 鏄电О淇℃伅
+ /// </summary>
+ public class NicknameInfo
+ {
+ /// <summary>
+ /// 鏄电О
+ /// </summary>
+ public string nickname = string.Empty;
}
#endregion
@@ -143,6 +167,10 @@
/// AccountType
/// </summary>
public int AccountType = 0;
+ /// <summary>
+ /// 鏄惁鎷ユ湁杩滅▼鎺у埗鏉冮檺
+ /// </summary>
+ public bool IsAllowRemoteCtrl = false;
}
/// <summary>
@@ -201,6 +229,19 @@
/// 璁惧
/// </summary>
public ZigBee.Device.CommonDevice Device = null;
+ }
+
+ /// <summary>
+ /// 璁惧鍚嶅瓧鍐呭
+ /// </summary>
+ public class DeviceNameContent
+ {
+ public string A瀹樻柟鍚嶅瓧 = string.Empty;
+ public string A鎵�灞炲悕瀛� = string.Empty;
+ public string A澶囨敞鍚嶅瓧 = string.Empty;
+ public string A绫诲瀷鍚嶅瓧 = string.Empty;
+ public int ConcreteTypeValue = 0;
+ public int BeloneTypeValue = 0;
}
#endregion
@@ -265,6 +306,14 @@
/// 浜戠杩滅▼鍦ㄧ嚎鐘舵��
/// </summary>
public bool MqttOnlineStatus = false;
+ /// <summary>
+ /// 涓庢缃戝叧鍦ㄤ簯绔疎mq閫氫俊鏃讹紝璐熻浇鍔犺В鐨�16浣岮es瀵嗛挜
+ /// </summary>
+ public string AesKey;
+ /// <summary>
+ /// 缃戝叧瀵瑰簲鐨勫敮涓�鐮�
+ /// </summary>
+ public string MacMark;
}
/// <summary>
@@ -424,6 +473,10 @@
/// 鍥轰欢鍒嗗竷寮忓敮涓�,涔熸槸涓嬭浇鏃剁殑[涓嬭浇鍥轰欢鐨勫敮涓�鏍囪瘑]鍙傛暟
/// </summary>
public string DistributedMark = string.Empty;
+ /// <summary>
+ /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+ /// </summary>
+ public string CreatedOnUtc = string.Empty;
}
/// <summary>
@@ -485,6 +538,29 @@
/// 闀滃儚绫诲瀷
/// </summary>
public string ImagType = string.Empty;
+ /// <summary>
+ /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+ /// </summary>
+ public string CreatedOnUtc = string.Empty;
+ }
+
+ /// <summary>
+ /// 缃戝叧闇�瑕佸崌绾х殑淇℃伅
+ /// </summary>
+ public class GatewayNeedUpdateInfo
+ {
+ /// <summary>
+ /// 鍗囩骇鍥轰欢鐨勫叏璺緞
+ /// </summary>
+ public string FullFileName = string.Empty;
+ /// <summary>
+ /// 铏氭嫙椹卞姩鍙�
+ /// </summary>
+ public int DriveCode = -1;
+ /// <summary>
+ /// 1:Linux鐨勫崌绾у浐浠� 2:鍗忚皟鍣ㄧ殑鍗囩骇鍥轰欢 3:铏氭嫙椹卞姩鐨勫崌绾у浐浠�
+ /// </summary>
+ public int Div = -1;
}
#endregion
@@ -784,7 +860,7 @@
/// <summary>
/// Page
/// </summary>
- public int Page = 0;
+ public int Page = 1;
/// <summary>
/// PageSize
/// </summary>
@@ -832,6 +908,10 @@
/// 涓婃姤鏃堕棿(hh:mm:ss)
/// </summary>
public string Time = string.Empty;
+ /// <summary>
+ /// 2020.04.13杩藉姞鏂板垎绫� 1:涓�鑸姤璀� 9000:闂ㄩ攣甯稿紑妯″紡鎶ヨ
+ /// </summary>
+ public int MsgDiv = 1;
}
#endregion
@@ -886,21 +966,29 @@
/// </summary>
public bool IsHdlDevice = true;
/// <summary>
- /// 璁惧鐨勫叿浣撶被鍨嬬殑缈昏瘧鍚嶅瓧ID锛圧鏂囦欢閲岄潰鐨勶級
+ /// 璁惧鐨勫畼鏂瑰悕瀛�
/// </summary>
- public int ConcreteTextId = R.MyInternationalizationString.UnknowDevice;
+ public string ConcreteText = string.Empty;
/// <summary>
- /// 璁惧鐨勫叿浣撶被鍨�(鍊间负鑷畾涔夌殑鍊�,濂藉儚鍙互鏄暅鍍廔D)
+ /// 璁惧鐨勫叿浣撶被鍨�
/// </summary>
public DeviceConcreteType ConcreteType = DeviceConcreteType.UnKownDevice;
+ /// <summary>
+ /// 璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
+ /// </summary>
+ public string BeloneText = string.Empty;
/// <summary>
/// 璁惧鎵�灞炵被鍨�
/// </summary>
public DeviceBeloneType BeloneType = DeviceBeloneType.A鏈煡璁惧;
/// <summary>
- /// 璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧ID锛圧鏂囦欢閲岄潰鐨勶級
+ /// 璁惧鐨勯粯璁ゅ娉ㄧ炕璇戝悕瀛�
/// </summary>
- public int BeloneTextId = R.MyInternationalizationString.UnknowDevice;
+ public string DeviceDefultName = string.Empty;
+ /// <summary>
+ /// 璁惧鐨勭被鍨嬬炕璇戝悕瀛�
+ /// </summary>
+ public string ObjectTypeName = string.Empty;
}
#endregion
@@ -1050,6 +1138,81 @@
#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
@@ -1057,23 +1220,225 @@
/// <summary>
/// 涓婚敭
/// </summary>
- public string RegId = string.Empty;
+ public string Id = string.Empty;
/// <summary>
- /// 娑堟伅鍐呭
+ /// 涓婚
/// </summary>
- public string MsgContent = string.Empty;
+ public string Topic = string.Empty;
/// <summary>
- /// MsgType
+ /// 缃戝叧涓婃姤鐨刯son
/// </summary>
- public string MsgType = string.Empty;
+ public string PayloadJson = string.Empty;
/// <summary>
/// 鏄惁宸茶
/// </summary>
- public int IsRead = 0;
+ public bool IsReading = false;
+ /// <summary>
+ /// 鏄惁宸茶(listMsg鍖归厤,瀵瑰簲涓�鏉℃暟鎹噷闈㈠寘鍚涓姤璀�)
+ /// </summary>
+ public List<bool> ListReading = new List<bool>();
/// <summary>
/// 鏃堕棿 2019-09-10T13:11:55
/// </summary>
- public string MsgTime = string.Empty;
+ 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;
+ /// <summary>
+ /// 鑷姩鍖栧父寮�鏃堕棿鍙樻洿涓哄垎閽�,鑰屼笉鏄皬鏃� 1->寮哄埗鍙樻洿涓哄垎閽�
+ /// </summary>
+ public int DoorLockNomallyOpenTimeMode = 0;
+ /// <summary>
+ /// 鏄惁灏嗗彂閫佸強鎺ユ敹鍒扮殑鏁版嵁鍐欏叆鍒癓og涓� 1->鍐欏叆
+ /// </summary>
+ public int WriteSendAndReceveDataToFile = 0;
+ /// <summary>
+ /// 鏄惁灏哠ocketReceive鐨勬暟鎹啓鍏ュ埌Log涓� 1->鍐欏叆
+ /// </summary>
+ public int WriteSocketReceiveDataToFile = 0;
+ /// <summary>
+ /// 鏄惁寮�鍚皟璇旳pp鍔熻兘 1->寮�鍚�
+ /// </summary>
+ public int StartDebugApp = 0;
+ /// <summary>
+ /// 褰撹澶嘥ype涓嶄竴鏍锋椂,鏄惁鐢熸垚Log 1->鐢熸垚
+ /// </summary>
+ public int CheckDeviceType = 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
+
+ #region 鈻� 缃戝叧鍥炲鎺ユ敹绫籣_____________________
+
+ /// <summary>
+ /// 缃戝叧鍥炲鎺ユ敹绫�
+ /// </summary>
+ public class ReceiptGatewayResult
+ {
+ /// <summary>
+ /// 閿欒娑堟伅,濡傛灉娌℃湁閿欒,鍒欎负null(缃戝叧瓒呮椂涔熶负null)
+ /// </summary>
+ public string ErrorMsg = null;
+ /// <summary>
+ /// 閿欒娑堟伅鐨勭被鍨� -1:缃戝叧瀵硅薄涓㈠け 0:瓒呮椂缃戝叧娌℃湁鍥炲 1:姝ｅ父
+ /// </summary>
+ public int ErrorMsgDiv = 1;
+ /// <summary>
+ /// 鎺ユ敹鐨凞ata鏁版嵁
+ /// </summary>
+ public string ReceiptData = null;
+ /// <summary>
+ /// 鎺ユ敹鐨勬暟鎹�(澶氫釜杩斿洖涓婚涓撶敤)
+ /// </summary>
+ public string[] listReceiptData = null;
+ /// <summary>
+ /// 杩欎釜鏄綉鍏冲洖澶嶇殑鏁翠釜json鏁版嵁,涓暟涓巐istReceiptData涓�鑷�
+ /// </summary>
+ public string[] JsonData = null;
+ }
+
#endregion
}
--
Gitblit v1.8.0