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 | 92 +++++++++++++++++++++++++++++++++-------------
1 files changed, 66 insertions(+), 26 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index e35c611..5da69b1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -231,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 鈻� 缃戝叧淇℃伅绫籣_________________________
@@ -494,7 +507,7 @@
public class FirmwareVersionInfo
{
/// <summary>
- /// 浜戠涓婇潰鐨勯偅涓悕瀛�
+ /// 浜戠涓婇潰鐨勯偅涓悕瀛�,濡傛灉鏄湰鍦扮┖璋冪殑妯″潡鏃�,瀹冧负鍏ㄨ矾寰�
/// </summary>
public string Name = string.Empty;
/// <summary>
@@ -522,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
@@ -934,41 +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>
- /// 璁惧鐨勯粯璁ゅ娉ㄧ炕璇戝悕瀛桰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;
+ public string ObjectTypeName = string.Empty;
}
#endregion
@@ -1311,6 +1331,22 @@
/// 鏄惁灏哠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
@@ -1399,13 +1435,17 @@
/// </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