From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4

---
 ZigbeeApp/Shared/R.cs |  446 +++++++++++++++++++++++++------------------------------
 1 files changed, 200 insertions(+), 246 deletions(-)

diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100644
new mode 100755
index 8267aec..1d4ae1d
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -350,7 +350,7 @@
         /// </summary>
         public const int AddFreshAirModulPanelMsg = 239;
         /// <summary>
-        /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵 
+        /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
         /// </summary>
         public const int SetDoorLockNomallyOpen = 241;
         /// <summary>
@@ -622,6 +622,82 @@
         /// 闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
         /// </summary>
         public const int LongPressButtonSwitch = 327;
+        /// <summary>
+        /// 鏈�澶氬彲娣诲姞{0}涓�
+        /// </summary>
+        public const int AddMoreTip = 328;
+        /// <summary>
+        /// 缁戝畾
+        /// </summary>
+        public const int Bind = 329;
+        /// <summary>
+        /// 330=璇ヨ澶囨槸缁х數鍣紝褰撳墠鍙敮鎸佸甫鏈夎皟鍏夌殑鐏厜缁戝畾
+        /// </summary>
+        public readonly static int CanSelectDimmer = 330;
+        /// <summary>
+        /// 璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏夌粦瀹�
+        /// </summary>
+        public readonly static int CanSelectRelay = 331;
+        /// <summary>
+        /// 绌鸿皟鐩爣
+        /// </summary>
+        public const int AcTargets = 332;
+        /// <summary>
+        /// 涓嶇粦瀹氫换浣曠洰鏍�
+        /// </summary>
+        public const int BindEmptyTargets = 333;
+        /// <summary>
+        /// /鐫$湢鏃堕棿
+        /// </summary>
+        public const int SleepTime = 334;
+        /// <summary>
+        /// 璀﹀憡锛佹暟鎹嚭閿欙紝蹇呴』鍒锋柊鍒楄〃锛屽惁鍒欐帶鍒剁幇璞¢敊涔�
+        /// </summary>
+        public const int UpdateBindList = 335;
+        /// <summary>
+        /// 鍚屾
+        /// </summary>
+        public const int Synchronization = 336;
+        /// <summary>
+        /// 鍚屾澶辫触
+        /// </summary>
+        public const int SynchronizationFailed = 337;
+        /// <summary>
+        /// 鏁版嵁鏍℃
+        /// </summary>
+        public const int DataCorrection = 338;
+        /// <summary>
+        ///  339=鐭娓╁害澶辫触
+        /// </summary>
+        public const int DataCorrectionFailed = 339;
+        /// <summary>
+        ///  340=鐭闈㈡澘鍐呯疆鐨勬俯搴︽垨婀垮害浼犳劅鍣ㄨ鏁�
+        /// </summary>
+        public const int DataCorrectionTip = 340;
+        /// <summary>
+        ///  341=璇疯緭鍏ユ纭殑鏁板��
+        /// </summary>
+        public const int NumTip = 341;
+        /// <summary>
+        ///  342=璇疯緭鍏ユ纭殑娓╁害鍊�
+        /// </summary>
+        public const int TNumTip = 342;
+        /// <summary>
+        ///  343=璇疯緭鍏ユ纭殑婀垮害鍊�
+        /// </summary>
+        public const int HNumTip = 343;
+        /// <summary>
+        ///  344=娉ㄦ剰缁戝畾鐩爣鐨勫悕绉颁笉瓒呰繃6涓眽瀛梴0}鎴�20涓瓧姣嶅拰鏁板瓧鍝︼紝鍚﹀垯闈㈡澘灏唟0}鏃犳硶鏄剧ず
+        /// </summary>
+        public const int BindRemarkTip1 = 344;
+        /// <summary>
+        ///  345=鐩爣鍚嶇О澶暱
+        /// </summary>
+        public const int BindRemarkTip2 = 345;
+        /// <summary>
+        ///  346=鐭ラ亾浜�
+        /// </summary>
+        public const int Iknown = 346;
 
         public readonly static int cancel = 5097;
         public readonly static int confrim = 5098;
@@ -918,7 +994,7 @@
 
 
         /// <summary>
-        /// HDL Home
+        /// Evoyo Home
         /// </summary>
         public const int AppName = 10000;
         /// <summary>
@@ -2951,7 +3027,7 @@
         /// </summary>
         public const int uCarbonMonoxideRevealed = 15393;
         /// <summary>
-        /// 鏈変笉鏄庣墿浣撶粡杩�
+        /// 鏈変汉缁忚繃
         /// </summary>
         public const int uHadUnKnowObjectPassed = 15394;
         /// <summary>
@@ -5483,7 +5559,7 @@
         /// </summary>
         public const int uWorkRoom = 16060;
         /// <summary>
-        /// 鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+        /// 鐢垫満鏁版嵁寮傚父,纭宸茬粡瀹夎瀵艰建鍚�,璇烽噸缃數鏈�
         /// </summary>
         public const int uCurtainDataIsErrorPleaseResetCurtain = 16061;
         /// <summary>
@@ -5739,7 +5815,7 @@
         /// </summary>
         public const int uAddMiniGateway = 16124;
         /// <summary>
-        /// 鎻掔數鍚�,闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+        /// 鎻掔數鍚�,闀挎寜缃戝叧寮�鍏抽敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
         /// </summary>
         public const int uAddMiniGatewayMsg1 = 16125;
         /// <summary>
@@ -5766,8 +5842,114 @@
         /// 灏忓鐏紑鍏�
         /// </summary>
         public const int uMiniLightSwitch = 16133;
-
-
+        /// <summary>
+        /// 璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
+        /// </summary>
+        public const int uSetDeviceFunctionTypeFail = 16134;
+        /// <summary>
+        /// 鑾峰彇鍦烘櫙鍒楄〃澶辫触,缃戝叧鍥炲瓒呮椂
+        /// </summary>
+        public const int uGetSceneListFailAndTimeOut = 16135;
+        /// <summary>
+        /// 闇�閲嶆柊缁戝畾
+        /// </summary>
+        public const int uNeedToRebind = 16136;
+        /// <summary>
+        /// 鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
+        /// </summary>
+        public const int uUnKnownErrorAndLostData = 16137;
+        /// <summary>
+        /// 鐑熼浘浼犳劅鍣�
+        /// </summary>
+        public const int uSensorFire = 16138;
+        /// <summary>
+        /// 姘翠镜浼犳劅鍣�
+        /// </summary>
+        public const int uSensorWater = 16139;
+        /// <summary>
+        /// 鐕冩皵浼犳劅鍣�
+        /// </summary>
+        public const int uSensorCarbonMonoxide = 16140;
+        /// <summary>
+        /// 绱ф�ユ寜閽�
+        /// </summary>
+        public const int uSensorEmergencyButton = 16141;
+        /// <summary>
+        /// 闂ㄧ獥浼犳劅鍣�
+        /// </summary>
+        public const int uSensorDoorWindow = 16142;
+        /// <summary>
+        /// 閽ュ寵鎵�
+        /// </summary>
+        public const int uKeyfob = 16143;
+        /// <summary>
+        /// 鑹插�煎彿涓�6浣嶏紙鐢变换鎰忔暟瀛�+瀛楁瘝缁勫悎锛�
+        /// </summary>
+        public const int uColorLengthMsg = 16144;
+        /// <summary>
+        /// 闀挎寜姝ゆ寜閿�
+        /// </summary>
+        public const int uLongPressThisButton = 16145;
+        /// <summary>
+        /// Mini缃戝叧鏈�澶у彧鑳芥坊鍔�16涓澶�
+        /// </summary>
+        public const int uMiniGatewayMaxDeviceCountMsg = 16146;
+        /// <summary>
+        /// 寮�鍏抽敭
+        /// </summary>
+        public const int uSwitchButton = 16147;
+        /// <summary>
+        /// 杩囨埛
+        /// </summary>
+        public const int uTransfer = 16148;
+        /// <summary>
+        /// 浣忓畢杩囨埛
+        /// </summary>
+        public const int uTransferOfResidence = 16149;
+        /// <summary>
+        /// 杞Щ浣忓畢鍒板叾浠朎voyo
+        /// </summary>
+        public const int uTransferOfResidenceToOtherEvoyoAccount1 = 16150;
+        /// <summary>
+        /// Home璐﹀彿
+        /// </summary>
+        public const int uTransferOfResidenceToOtherEvoyoAccount2 = 16151;
+        /// <summary>
+        /// 璇ユ搷浣滀笉鍙�嗭紝璇锋敞鎰忥細
+        /// </summary>
+        public const int uThisOperationIsIrreversiblePleaseNote = 16152;
+        /// <summary>
+        /// 1.鎺ユ敹鏂逛负Evoyo Home鏈夋晥娉ㄥ唽璐﹀彿
+        /// </summary>
+        public const int uTheReceiverIsValidAccountForEvoyoHome = 16153;
+        /// <summary>
+        /// 2.鎺ユ敹鏂逛笌杩囨埛鏂逛笉鍙互涓哄悓涓�涓处鍙�
+        /// </summary>
+        public const int uTheReceiverAndTheTransferPartyCannotBeTheSameAccount = 16154;
+        /// <summary>
+        /// 3.杩囨埛鎴愬姛鍚庯紝灏嗗彇娑堣繃鎴锋柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈
+        /// </summary>
+        public const int uIfTheTransferIsSuccessfulTheRightToUseTheHouseWillBeCancelled = 16155;
+        /// <summary>
+        /// 杩囨埛璐﹀彿
+        /// </summary>
+        public const int uTransferResidenceAccount = 16156;
+        /// <summary>
+        /// 璇疯緭鍏ユ帴鏀舵柟鐨勬墜鏈哄彿鎴朎mail
+        /// </summary>
+        public const int uPleaseInputReceiverPhoneOrEmail = 16157;
+        /// <summary>
+        /// 鏌ョ湅
+        /// </summary>
+        public const int uSearch1 = 16158;
+        /// <summary>
+        /// 瀹氭椂鑷姩鍏抽棴
+        /// </summary>
+        public const int uAutomaticTimingOff = 16159;
+        /// <summary>
+        /// 涓嶅叧闂�
+        /// </summary>
+        public const int uNotClose = 16160;
 
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -5992,7 +6174,7 @@
         /// </summary>
         public const int uAddFangyueEightButtonPanelMsg = 21020;
         /// <summary>
-        /// 鏂规偊鐜闈㈡澘 -> 鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+        /// 鏂规偊鐜闈㈡澘 ->鎸変綇闈㈡澘鍔熻兘鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
         /// </summary>
         public const int uAddFangyueEnvironmentPanelMsg = 21021;
         /// <summary>
@@ -6003,191 +6185,13 @@
         /// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
         /// </summary>
         public const int uAddSensorCeilingGasMsg = 21023;
+        /// <summary>
+        /// 鐞冨瀷绉诲姩浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+        /// </summary>
+        public const int uAddSensorSphericalMotionMsg = 21024;
 
 
-        //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
-        /// <summary>
-        /// 闀滃儚ID涓�1305(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱揣鎬ユ寜閽�
-        /// </summary>
-        public const int uDeviceModelId1305 = 30000;
-        /// <summary>
-        /// 闀滃儚ID涓�1300(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱噧姘斾紶鎰熷櫒
-        /// </summary>
-        public const int uDeviceModelId1300 = 30001;
-        /// <summary>
-        /// 闀滃儚ID涓�1302(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱儫闆句紶鎰熷櫒
-        /// </summary>
-        public const int uDeviceModelId1302 = 30002;
-        /// <summary>
-        /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭按娴镐紶鎰熷櫒
-        /// </summary>
-        public const int uDeviceModelId1304 = 30003;
-        /// <summary>
-        /// 閽ュ寵鎵�
-        /// </summary>
-        public const int uKeyfob = 30004;
-        /// <summary>
-        /// 闀滃儚ID涓�1301(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氶棬绐椾紶鎰熷櫒
-        /// </summary>
-        public const int uDeviceModelId1301 = 30005;
-        /// <summary>
-        /// 闀滃儚ID涓�4100鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭櫤鑳界┖寮�
-        /// </summary>
-        public const int uDeviceModelId4100 = 30006;
-        /// <summary>
-        /// 闀滃儚ID涓�100鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歓igbee鏅鸿兘寮�鍚堝笜鐢垫満
-        /// </summary>
-        public const int uDeviceModelId100 = 30007;
-        /// <summary>
-        /// 闀滃儚ID涓�200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�4璺户鐢靛櫒搴曞骇)
-        /// </summary>
-        public const int uDeviceModelId200 = 30008;
-        /// <summary>
-        /// 闀滃儚ID涓�1200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�220Pir浼犳劅鍣�
-        /// </summary>
-        public const int uDeviceModelId1200 = 30009;
-        /// <summary>
-        /// 闀滃儚ID涓�1鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1浠igbee缃戝叧(146搴曠洅澧欒妯″紡)
-        /// </summary>
-        public const int uDeviceModelId1 = 30010;
-        /// <summary>
-        /// 闀滃儚ID涓�201鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�3鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�3璺户鐢靛櫒搴曞骇)
-        /// </summary>
-        public const int uDeviceModelId201 = 30011;
-        /// <summary>
-        /// 闀滃儚ID涓�202鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�2鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�2璺户鐢靛櫒搴曞骇)
-        /// </summary>
-        public const int uDeviceModelId202 = 30012;
-        /// <summary>
-        /// 闀滃儚ID涓�2300鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�3璺户鐢靛櫒灏忔ā鍧�
-        /// </summary>
-        public const int uDeviceModelId2300 = 30013;
-        /// <summary>
-        /// 闀滃儚ID涓�6鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1浠igbee缃戝叧(楂樼骇缃戝叧妗岄潰妯″紡)
-        /// </summary>
-        public const int uDeviceModelId6 = 30014;
-        /// <summary>
-        /// 闀滃儚ID涓�0鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氳皟璇曡澶�
-        /// </summary>
-        public const int uDeviceModelId0 = 30015;
-        /// <summary>
-        /// 闀滃儚ID涓�101鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歓igbee鏅鸿兘绠$姸鐢垫満
-        /// </summary>
-        public const int uDeviceModelId101 = 30016;
-        /// <summary>
-        /// 闀滃儚ID涓�3900鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氫腑缁у櫒
-        /// </summary>
-        public const int uDeviceModelId3900 = 30017;
-        /// <summary>
-        /// 闀滃儚ID涓�203鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�12鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�1璺户鐢靛櫒搴曞骇)
-        /// </summary>
-        public const int uDeviceModelId203 = 30018;
-        /// <summary>
-        /// 闀滃儚ID涓�210鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(鍙甫鐢垫簮搴曞骇)
-        /// </summary>
-        public const int uDeviceModelId210 = 30019;
-        /// <summary>
-        /// 闀滃儚ID涓�1303(鏆傚畾)鐨勫畼鏂圭殑榛樿鍚嶅瓧锛氱孩澶栦紶鎰熷櫒
-        /// </summary>
-        public const int uDeviceModelId1303 = 30020;
-        /// <summary>
-        /// 闀滃儚ID涓�2500鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1璺皟鍏夊櫒灏忔ā鍧�
-        /// </summary>
-        public const int uDeviceModelId2500 = 30021;
-        /// <summary>
-        /// 闀滃儚ID涓�4200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee杞琤uspro鍗忚杞崲鍣�
-        /// </summary>
-        public const int uDeviceModelId4200 = 30022;
-        /// <summary>
-        /// 闀滃儚ID涓�4201鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee杞�485鍗忚杞崲鍣�
-        /// </summary>
-        public const int uDeviceModelId4201 = 30023;
-        /// <summary>
-        /// 闀滃儚ID涓�3600鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee绌鸿皟缃戝叧妯″潡
-        /// </summary>
-        public const int uDeviceModelId3600 = 30024;
-        /// <summary>
-        /// 闀滃儚ID涓�2800鐨勮澶囩殑瀹樻柟鍚嶅瓧锛欻06C
-        /// </summary>
-        public const int uDeviceModelId2800 = 30025;
-        /// <summary>
-        /// 闀滃儚ID涓�220鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�4鎸夐敭闈㈡澘
-        /// </summary>
-        public const int uDeviceModelId220 = 30026;
-        /// <summary>
-        /// 闀滃儚ID涓�221鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�3鎸夐敭闈㈡澘
-        /// </summary>
-        public const int uDeviceModelId221 = 30027;
-        /// <summary>
-        /// 闀滃儚ID涓�222鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�2鎸夐敭闈㈡澘
-        /// </summary>
-        public const int uDeviceModelId222 = 30028;
-        /// <summary>
-        /// 闀滃儚ID涓�240鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮�2鎸夐敭杞昏Е寮忛潰鏉�
-        /// </summary>
-        public const int uDeviceModelId240 = 30029;
-        /// <summary>
-        /// 闀滃儚ID涓�241鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮�4鎸夐敭杞昏Е寮忛潰鏉�
-        /// </summary>
-        public const int uDeviceModelId241 = 30030;
-        /// <summary>
-        /// 闀滃儚ID涓�242鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮�8鎸夐敭杞昏Е寮忛潰鏉�
-        /// </summary>
-        public const int uDeviceModelId242 = 30031;
-        /// <summary>
-        /// 闀滃儚ID涓�250鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮︽柊椋庨潰鏉�
-        /// </summary>
-        public const int uDeviceModelId250 = 30032;
-        /// <summary>
-        /// 闀滃儚ID涓�253鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮︾幆澧冮潰鏉�
-        /// </summary>
-        public const int uDeviceModelId253 = 30033;
-        /// <summary>
-        /// 闀滃儚ID涓�224鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�4鎸夐敭鍦烘櫙闈㈡澘
-        /// </summary>
-        public const int uDeviceModelId224 = 30034;
-        /// <summary>
-        /// 闀滃儚ID涓�226鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�2璺獥甯橀潰鏉�
-        /// </summary>
-        public const int uDeviceModelId226 = 30035;
-        /// <summary>
-        /// 闀滃儚ID涓�256鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮�/2璺獥甯橀潰鏉�-Z
-        /// </summary>
-        public const int uDeviceModelId256 = 30036;
-        /// <summary>
-        /// 闀滃儚ID涓�2802鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歋-one
-        /// </summary>
-        public const int uDeviceModelId2802 = 30037;
-        /// <summary>
-        /// 闀滃儚ID涓�2310鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庡皬妯″潡
-        /// </summary>
-        public const int uDeviceModelId2310 = 30038;
-        /// <summary>
-        /// 闀滃儚ID涓�1306鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee鍚搁《鐕冩皵浼犳劅鍣�
-        /// </summary>
-        public const int uDeviceModelId1306 = 30039;
-        /// <summary>
-        /// 闀滃儚ID涓�1307鐨勮澶囩殑榛樿鍚嶅瓧锛歅M2.5绌烘皵璐ㄩ噺浼犳劅鍣�
-        /// </summary>
-        public const int uDeviceModelId1307 = 30040;
-        /// <summary>
-        /// 闀滃儚ID涓�212鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾﹀鍔熻兘闈㈡澘
-        /// </summary>
-        public const int uDeviceModelId212 = 30041;
-        /// <summary>
-        /// 闀滃儚ID涓�230鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾︾幆澧冮潰鏉�
-        /// </summary>
-        public const int uDeviceModelId230 = 30042;
-        /// <summary>
-        /// 闀滃儚ID涓�11鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歁ini缃戝叧
-        /// </summary>
-        public const int uDeviceModelId11 = 30043;
-        /// <summary>
-        /// 闀滃儚ID涓�20000鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氳壊娓╃伅
-        /// </summary>
-        public const int uDeviceModelId20000 = 30044;
-
-        //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
+        //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮� 娉細杩欎簺鎵�灞濱D宸茬粡涓嶅啀缁存姢鈽呪槄鈽呪槄
         /// <summary>
         /// 鑷畾涔夎澶囨墍灞濱D涓�100鐨勭炕璇戝悕瀛楋細閬槼
         /// </summary>
@@ -6197,53 +6201,9 @@
         /// </summary>
         public const int uDeviceBelongId200 = 40001;
         /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�1200鐨勭炕璇戝悕瀛楋細浼犳劅鍣�
-        /// </summary>
-        public const int uDeviceBelongId1200 = 40002;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�2300鐨勭炕璇戝悕瀛楋細缁х數鍣�
-        /// </summary>
-        public const int uDeviceBelongId2300 = 40003;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�2500鐨勭炕璇戝悕瀛楋細璋冨厜鍣�
-        /// </summary>
-        public const int uDeviceBelongId2500 = 40004;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�2800鐨勭炕璇戝悕瀛楋細闂ㄩ攣
-        /// </summary>
-        public const int uDeviceBelongId2800 = 40005;
-        /// <summary>
         /// 鑷畾涔夎澶囨墍灞濱D涓�3600鐨勭炕璇戝悕瀛楋細绌鸿皟
         /// </summary>
         public const int uDeviceBelongId3600 = 40006;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�3900鐨勭炕璇戝悕瀛楋細涓户鍣�
-        /// </summary>
-        public const int uDeviceBelongId3900 = 40007;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�4100鐨勭炕璇戝悕瀛楋細鏅鸿兘绌哄紑
-        /// </summary>
-        public const int uDeviceBelongId4100 = 40008;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�4200鐨勭炕璇戝悕瀛楋細杞崲鍣�
-        /// </summary>
-        public const int uDeviceBelongId4200 = 40009;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�9鐨勭炕璇戝悕瀛楋細褰╃伅
-        /// </summary>
-        public const int uDeviceBelongId9 = 40010;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�10鐨勭炕璇戝悕瀛楋細娓╂箍搴︿紶鎰熷櫒
-        /// </summary>
-        public const int uDeviceBelongId10 = 40011;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�11鐨勭炕璇戝悕瀛楋細娓╁害浼犳劅鍣�
-        /// </summary>
-        public const int uDeviceBelongId11 = 40012;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�12鐨勭炕璇戝悕瀛楋細婀垮害浼犳劅鍣�
-        /// </summary>
-        public const int uDeviceBelongId12 = 40013;
         /// <summary>
         /// 鑷畾涔夎澶囨墍灞濱D涓�13鐨勭炕璇戝悕瀛楋細寮�鍏�
         /// </summary>
@@ -6256,21 +6216,11 @@
         /// 鑷畾涔夎澶囨墍灞濱D涓�15鐨勭炕璇戝悕瀛楋細鐏厜
         /// </summary>
         public const int uDeviceBelongId15 = 40016;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�16鐨勭炕璇戝悕瀛楋細骞叉帴鐐�
-        /// </summary>
-        public const int uDeviceBelongId16 = 40017;
         /// <summary>
         /// 鑷畾涔夎澶囨墍灞濱D涓�2310鐨勭炕璇戝悕瀛楋細鏂伴
         /// </summary>
         public const int uDeviceBelongId2310 = 40018;
-        /// <summary>
-        /// 鑷畾涔夎澶囨墍灞濱D涓�1307鐨勭炕璇戝悕瀛楋細绌烘皵璐ㄩ噺
-        /// </summary>
-        public const int uDeviceBelongId1307 = 40019;
 
-        //鈽呪槄鈽呪槄妯″潡ID鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
-        //鈽呪槄鈽呪槄妯″潡ID鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄坊鍔犳柊璁惧鐣岄潰閭i噷鏄剧ず鐨勫悕瀛�,浠�70000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>
@@ -6388,7 +6338,11 @@
         /// <summary>
         /// 绠�绾︾幆澧冮潰鏉�
         /// </summary>
-        public const int uDeviceDirectionName29 = 70028;
+        public const int uDeviceDirectionName29 = 70028;
+        /// <summary>
+        /// 鐞冨瀷绉诲姩浼犳劅鍣�
+        /// </summary>
+        public const int uDeviceDirectionName30 = 70029;
 
     }
 }

--
Gitblit v1.8.0