From 2029e64ec0491f7e511dc15bffaf821bfbabe2de Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 20 七月 2020 14:10:22 +0800
Subject: [PATCH] 上传一个很特别的新版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index e35c611..e99ab65 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 鈻� 缃戝叧淇℃伅绫籣_________________________
@@ -934,41 +947,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
--
Gitblit v1.8.0