From 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 19 十一月 2020 10:23:45 +0800
Subject: [PATCH] Evoyo.Home1.1.0120111601_Release
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 210 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index cef4eaa..5da69b1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -34,6 +34,11 @@
/// </summary>
public string UserName = string.Empty;
/// <summary>
+ /// 璁板綍涓婁竴娆＄殑鐢ㄦ埛鏄电О(缁欎釜浜轰腑蹇冧慨鏀规樀绉版椂鐢ㄧ殑)
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public string OldUserName = string.Empty;
+ /// <summary>
/// DistributedMark
/// </summary>
[Newtonsoft.Json.JsonIgnore]
@@ -226,6 +231,19 @@
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
#region 鈻� 缃戝叧淇℃伅绫籣_________________________
@@ -288,6 +306,14 @@
/// 浜戠杩滅▼鍦ㄧ嚎鐘舵��
/// </summary>
public bool MqttOnlineStatus = false;
+ /// <summary>
+ /// 涓庢缃戝叧鍦ㄤ簯绔疎mq閫氫俊鏃讹紝璐熻浇鍔犺В鐨�16浣岮es瀵嗛挜
+ /// </summary>
+ public string AesKey;
+ /// <summary>
+ /// 缃戝叧瀵瑰簲鐨勫敮涓�鐮�
+ /// </summary>
+ public string MacMark;
}
/// <summary>
@@ -481,7 +507,7 @@
public class FirmwareVersionInfo
{
/// <summary>
- /// 浜戠涓婇潰鐨勯偅涓悕瀛�
+ /// 浜戠涓婇潰鐨勯偅涓悕瀛�,濡傛灉鏄湰鍦扮┖璋冪殑妯″潡鏃�,瀹冧负鍏ㄨ矾寰�
/// </summary>
public string Name = string.Empty;
/// <summary>
@@ -509,13 +535,32 @@
/// </summary>
public string HardwareVersion = string.Empty;
/// <summary>
- /// 闀滃儚绫诲瀷
+ /// 闀滃儚绫诲瀷(褰撶瓑浜�-100鏃�,浠ｈ〃瀹冩槸绌鸿皟鐨勬湰鍦版ā鍧�)
/// </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
@@ -863,6 +908,10 @@
/// 涓婃姤鏃堕棿(hh:mm:ss)
/// </summary>
public string Time = string.Empty;
+ /// <summary>
+ /// 2020.04.13杩藉姞鏂板垎绫� 1:涓�鑸姤璀� 9000:闂ㄩ攣甯稿紑妯″紡鎶ヨ
+ /// </summary>
+ public int MsgDiv = 1;
}
#endregion
@@ -917,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
@@ -1177,6 +1234,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;
@@ -1189,9 +1250,9 @@
/// </summary>
public string MsgObjectText = string.Empty;
/// <summary>
- /// 娑堟伅鏂囨湰
+ /// 娑堟伅鏂囨湰(瀵瑰簲涓�鏉℃暟鎹噷闈㈠寘鍚涓姤璀�)
/// </summary>
- public string MsgText = string.Empty;
+ public List<string> listMsg = new List<string>();
}
/// <summary>
@@ -1246,6 +1307,146 @@
/// 鏄剧ず璁惧鍘嗗彶鐗堟湰 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;
+ /// <summary>
+ /// 鏄惁浣跨敤浠ュ墠鏃х殑璁惧鍒楄〃鑾峰彇鏂瑰紡 1->浣跨敤
+ /// </summary>
+ public int UseOldSearchDeviceMethord = 0;
+ /// <summary>
+ /// 鏄惁璁板綍涓婃姤鐨刧bs鍧愭爣 1->璁板綍
+ /// </summary>
+ public int WriteGpsPoint = 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