From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 211 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 196 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..e35c611 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>
@@ -280,6 +293,14 @@
/// 浜戠杩滅▼鍦ㄧ嚎鐘舵��
/// </summary>
public bool MqttOnlineStatus = false;
+ /// <summary>
+ /// 涓庢缃戝叧鍦ㄤ簯绔疎mq閫氫俊鏃讹紝璐熻浇鍔犺В鐨�16浣岮es瀵嗛挜
+ /// </summary>
+ public string AesKey;
+ /// <summary>
+ /// 缃戝叧瀵瑰簲鐨勫敮涓�鐮�
+ /// </summary>
+ public string MacMark;
}
/// <summary>
@@ -439,6 +460,10 @@
/// 鍥轰欢鍒嗗竷寮忓敮涓�,涔熸槸涓嬭浇鏃剁殑[涓嬭浇鍥轰欢鐨勫敮涓�鏍囪瘑]鍙傛暟
/// </summary>
public string DistributedMark = string.Empty;
+ /// <summary>
+ /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+ /// </summary>
+ public string CreatedOnUtc = string.Empty;
}
/// <summary>
@@ -500,6 +525,10 @@
/// 闀滃儚绫诲瀷
/// </summary>
public string ImagType = string.Empty;
+ /// <summary>
+ /// 鏃ユ湡(鍚庨潰杩藉姞鐨� utc鏃堕棿)
+ /// </summary>
+ public string CreatedOnUtc = string.Empty;
}
#endregion
@@ -847,6 +876,10 @@
/// 涓婃姤鏃堕棿(hh:mm:ss)
/// </summary>
public string Time = string.Empty;
+ /// <summary>
+ /// 2020.04.13杩藉姞鏂板垎绫� 1:涓�鑸姤璀� 9000:闂ㄩ攣甯稿紑妯″紡鎶ヨ
+ /// </summary>
+ public int MsgDiv = 1;
}
#endregion
@@ -901,11 +934,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 +949,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
@@ -1161,6 +1214,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 +1230,9 @@
/// </summary>
public string MsgObjectText = string.Empty;
/// <summary>
- /// 娑堟伅鏂囨湰
+ /// 娑堟伅鏂囨湰(瀵瑰簲涓�鏉℃暟鎹噷闈㈠寘鍚涓姤璀�)
/// </summary>
- public string MsgText = string.Empty;
+ public List<string> listMsg = new List<string>();
}
/// <summary>
@@ -1203,6 +1260,10 @@
/// 宸茶鐘舵��
/// </summary>
public bool IsReading = true;
+ /// <summary>
+ /// 0:鏍囪鍏ㄩ儴宸茶銆�1:娓呯┖鎵�鏈夋秷鎭�
+ /// </summary>
+ public int TagAllOrClearType = 0;
}
#endregion
@@ -1226,6 +1287,126 @@
/// 鏄剧ず璁惧鍘嗗彶鐗堟湰 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;
}
#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>
+ /// 鎺ユ敹鐨勬暟鎹�
+ /// </summary>
+ public string ReceiptData = null;
+ /// <summary>
+ /// 鎺ユ敹鐨勬暟鎹�(澶氫釜杩斿洖涓婚涓撶敤)
+ /// </summary>
+ public string[] listReceiptData = null;
+ }
+
+ #endregion
}
--
Gitblit v1.8.0