From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 02 四月 2020 19:51:31 +0800 Subject: [PATCH] 最新代码 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs index cf4ba8c..a22a1b6 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs @@ -917,11 +917,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> @@ -932,6 +932,27 @@ /// 璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧ID锛圧鏂囦欢閲岄潰鐨勶級 /// </summary> public int BeloneTextId = R.MyInternationalizationString.UnknowDevice; + /// <summary> + /// 璁惧鐨勯粯璁ゅ娉ㄧ炕璇戝悕瀛桰D(涓汉涓績涓撶敤,Language鏂囦欢閲岄潰鐨�) + /// </summary> + public int DefultNameId + { + get + { + int value = ConcreteTextId + 20000; + if (value >= 60000) + { + //澶т簬60000锛屽垯琛ㄧず杩欎釜涓滆タ涓嶆槸浠庢渤涓滅殑鍚嶇О鍒楄〃涓潵鐨�,瀹冩槸浠庣涓夋柟鍒楄〃鏉ョ殑 + //鐩存帴杩斿洖瀹冪殑瀹樻柟鍚嶅瓧鍗冲彲 + return ConcreteTextId; + } + return value; + } + } + /// <summary> + /// 璁惧鐨勭被鍨嬬炕璇戝悕瀛桰D(涓汉涓績涓撶敤,Language鏂囦欢閲岄潰鐨�) + /// </summary> + public int ObjectTypeNameId = R.MyInternationalizationString.UnknowDevice; } #endregion -- Gitblit v1.8.0