From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"

---
 HDL_ON/Common/R.cs | 1007 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 1,005 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index afb06d7..97bce1f 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,169 @@
 {
     public static class StringId
     {
+        /// <summary>
+        /// 椋庨噺
+        /// </summary>
+        public const int AirVolume = 479;
+        /// <summary>
+        /// 鎽嗗姩
+        /// </summary>
+        public const int Pattern = 478;
+        /// <summary>
+        /// 鎽嗗姩
+        /// </summary>
+        public const int HeadSwinging = 477;
+        /// <summary>
+        /// 娣诲姞浣忓畢
+        /// </summary>
+        public const int AddResidence = 476;
+        /// <summary>
+        /// 宸﹀彸鎵
+        /// </summary>
+        public const int Swing_Left_Right = 475;
+        /// <summary>
+        /// 涓婁笅鎵
+        /// </summary>
+        public const int Swing_Up_Down = 474;
+        /// <summary>
+        /// 鎵
+        /// </summary>
+        public const int Swing = 473;
+        /// <summary>
+        /// 瀹ゅ
+        /// </summary>
+        public const int Outdoor = 472;
+        /// <summary>
+        /// 姣背娉紶鎰熷櫒
+        /// </summary>
+        public const int SenesorMillimeterWave = 471;
+        /// <summary>
+        /// 闃叉姢涓�
+        /// </summary>
+        public const int UnderProtection=470;
+        /// <summary>
+        /// 鏈変汉杩涘叆
+        /// </summary>
+        public const int SomeoneIn = 469;
+        /// <summary>
+        /// 鏈変汉璺屽��
+        /// </summary>
+        public const int SomeoneFell = 468;
+        /// <summary>
+        /// 鎶曞奖浠�
+        /// </summary>
+        public const int PJT = 467;
+        /// <summary>
+        /// 鏈洪《鐩�
+        /// </summary>
+        public const int STB = 466;
+        /// <summary>
+        /// 鍒犻櫎璁惧
+        /// </summary>
+        public const int DeleteDevice = 465;
+        /// <summary>
+        /// 鍙互寮�濮嬩娇鐢ㄦ渤涓滄绫虫尝浜�
+        /// </summary>
+        public const int CanStartUsingZhaoguanMillimeterWave = 464;
+        /// <summary>
+        /// 璇疯緭鍏n鐮�
+        /// </summary>
+        public const int PlsEntrySNCode = 463;
+        /// <summary>
+        /// 鎮ㄥ綋鍓嶈繕鏈坊鍔犱换浣曡澶�
+        /// </summary>
+        public const int NotAddedAnyDevices = 462;
+        /// <summary>
+        /// 瀹ゅ唴瀹ゅ
+        /// </summary>
+        public const int InOutdoor = 461;
+        /// <summary>
+        /// 鏈湀鑳借��
+        /// </summary>
+        public const int EnergyConsumptionOfThisMonth = 460;
+        /// <summary>
+        /// 瀹炴椂鑳借��
+        /// </summary>
+        public const int RealTimeEnergyConsumption=459;
+        /// <summary>
+        /// 鏃ユ湡
+        /// </summary>
+        public const int Date = 458;
+        /// <summary>
+        /// 鑳借��
+        /// </summary>
+        public const int EnergyConsumption = 457;
+        /// <summary>
+        /// 鐢诲竷
+        /// </summary>
+        public const int Canvas = 456;
+        /// <summary>
+        /// 鍚嶇О涓嶈兘涓虹┖
+        /// </summary>
+        public const int NameCannotBeEmpty = 455;
+        /// <summary>
+        /// 甯冮槻淇℃伅
+        /// </summary>
+        public const int DeploymentInformation = 454;
+        /// <summary>
+        /// 鎶ヨ闈欓煶
+        /// </summary>
+        public const int AlarmMute = 453;
+        /// <summary>
+        /// 闃茬洍鎶ヨ
+        /// </summary>
+        public const int BurglarAlarm = 452;
+        /// <summary>
+        /// 24灏忔椂闃插尽
+        /// </summary>
+        public const int Defense24Hour = 451;
+        /// <summary>
+        /// 鐏惧甯冮槻
+        /// </summary>
+        public const int DisasterDefense = 450;
+        /// <summary>
+        /// 涓嶅彈鎾ら槻褰卞搷
+        /// </summary>
+        public const int UndoDefenseDoesNotAffect = 449;
+        public const int FixedDeployment = 448;
+        public const int VacationDefense = 447;
+        public const int AtHomeDefense = 446;
+        public const int HouseDefense = 445;
+        public const int SecurityCenter = 444;
+        public const int CustomDeployment = 443;
+        public const int GenerateScene = 442;
+        public const int ChooseCatchZone = 441;
+        public const int NextStep = 440;
+        public const int RealTimePowerConsumption = 439;
+        public const int EnvirSensorValueTip = 438;
+        public const int DeviceList = 437;
+        public const int AddedDevice = 436;
+        public const int RemoteControl = 435;
+        public const int TimeSwitch = 434;
+        public const int WaterValve = 433;
+        public const int Use3tyBrandListTip = 432;
+        public const int Not3tyBrandListTip = 431;
+        public const int MinuteUint = 430;
+        public const int HourUint = 429;
+        public const int AnionTime = 428;
+        public const int DisinfectTime = 427;
+        public const int WindDryTime = 426;
+        public const int HotDryTime = 425;
+        public const int Time = 424;
+        public const int Lightint = 423;
+        public const int Disinfect = 422;
+        public const int WindDry = 421;
+        public const int HotDry = 420;
+        public const int SensorNormalState = 419;
+        public const int InAlarm = 418;
+        public const int WaterLeakage = 417;
+        public const int Log = 416;
+        public const int Someone = 415;
+        public const int ControllerOn = 414;
+        public const int ControllerNotOn = 413;
+        public const int Add = 412;
+        public const int TipAddThirdPartyDeviceMsg = 411;
+        public const int TipNotThirdPartyDevice = 410;
         public const int FunctionBrand = 409;
         public const int ConfirmAdd = 408;
         public const int Reading = 407;
@@ -14,6 +177,7 @@
         public const int Retry = 402;
         public const int QRCodeIsInvalid = 401;
         public const int WellComBackHome = 400;
+        public const int DoReloadAgain = 381;
         public const int FunctionNotOpen = 380;
         public const int FadeSpeed = 379;
         public const int FadeTime = 378;
@@ -401,9 +565,706 @@
         public const int LoginByEmail = 4;
 
 
+        /// <summary>
+        /// 瀹ゅ唴婀垮害
+        /// </summary>
+        public const int IndoorHumidity = 1000;
+        /// <summary>
+        /// 绔ラ攣
+        /// </summary>
+        public const int V_chip = 1001;
+        /// <summary>
+        /// 璐熺瀛�
+        /// </summary>
+        public const int Anion = 1002;
+        /// <summary>
+        /// 鏉�鑿�
+        /// </summary>
+        public const int Sterilization = 1003;
+        /// <summary>
+        /// 鍔犳箍
+        /// </summary>
+        public const int Humidification = 1004;
+        /// <summary>
+        /// 婊よ姱澶嶄綅
+        /// </summary>
+        public const int FilterElementReset = 1005;
+        /// <summary>
+        /// 鐏厜
+        /// </summary>
+        public const int Lighting = 1006;
+        /// <summary>
+        /// 鑷姩妯″紡
+        /// </summary>
+        public const int AutoMode = 1007;
+        /// <summary>
+        /// 鎵嬪姩妯″紡
+        /// </summary>
+        public const int HandMode = 1008;
+        /// <summary>
+        /// 寮哄姴妯″紡
+        /// </summary>
+        public const int StrongMode = 1009;
+        /// <summary>
+        /// 鐫$湢妯″紡
+        /// </summary>
+        public const int SleepMode = 1010;
+        /// <summary>
+        /// 瀹氭椂
+        /// </summary>
+        public const int Timing = 1011;
+        /// <summary>
+        /// 閫夋嫨椋庨��
+        /// </summary>
+        public const int WindSpeedSelection = 1012;
+        /// <summary>
+        /// 妗�
+        /// </summary>
+        public const int Gear = 1013;
+        /// <summary>
+        /// 璇风‘璁ゆ槸鍚﹀凡瀹為檯閲嶇疆婊よ姱骞舵寜{0}鐓ц鏄庝功瑕佹眰鎿嶄綔璁惧杩涜婊よ姱{0}瀵垮懡閲嶆柊璁℃椂
+        /// </summary>
+        public const int FilterElementResetMsg = 1014;
+        /// <summary>
+        /// 浣庢。
+        /// </summary>
+        public const int LowGear = 1015;
+        /// <summary>
+        /// 涓。
+        /// </summary>
+        public const int MidGear = 1016;
+        /// <summary>
+        /// 楂樻。
+        /// </summary>
+        public const int HeightGear = 1017;
+        /// <summary>
+        /// 瀹氭椂璁剧疆
+        /// </summary>
+        public const int TimingSetting = 1018;
+        /// <summary>
+        /// 灏忔椂
+        /// </summary>
+        public const int Hour1 = 1019;
+        /// <summary>
+        /// 婊よ姱浣跨敤锛�
+        /// </summary>
+        public const int UseOfFilterElement = 1020;
+        /// <summary>
+        /// 绌烘皵鍑�鍖栧櫒
+        /// </summary>
+        public const int AirCleaner = 1021;
+        /// <summary>
+        /// 褰撳墠椋庨��
+        /// </summary>
+        public const int CurrentWindSpeed = 1022;
+        /// <summary>
+        /// 鍙栨秷瀹氭椂
+        /// </summary>
+        public const int CancelTiming = 1023;
+        /// <summary>
+        /// 鎵湴鏈哄櫒浜�
+        /// </summary>
+        public const int WeepRobot = 1024;
+        /// <summary>
+        /// 鍚稿姏璋冭妭
+        /// </summary>
+        public const int SuctionAdjustment = 1025;
+        /// <summary>
+        /// 鍚稿姏1妗�
+        /// </summary>
+        public const int SuctionOneGear = 1026;
+        /// <summary>
+        /// 鍚稿姏2妗�
+        /// </summary>
+        public const int SuctionTwoGear = 1027;
+        /// <summary>
+        /// 鍚稿姏3妗�
+        /// </summary>
+        public const int SuctionThreeGear = 1028;
+        /// <summary>
+        /// 鍏呯數
+        /// </summary>
+        public const int Charge = 1029;
+        /// <summary>
+        /// 澹伴煶
+        /// </summary>
+        public const int Voice = 1030;
+        /// <summary>
+        /// 闈欓煶
+        /// </summary>
+        public const int Mute = 1031;
+        /// <summary>
+        /// 娓呮壂妯″紡
+        /// </summary>
+        public const int CleanMode = 1032;
+        /// <summary>
+        /// 鑰楁潗绠$悊
+        /// </summary>
+        public const int ConsumablesManagement = 1033;
+        /// <summary>
+        /// 鍘嗗彶璁板綍
+        /// </summary>
+        public const int HistoryLog = 1034;
+        /// <summary>
+        /// 鑷姩娓呮壂
+        /// </summary>
+        public const int AutoClean = 1035;
+        /// <summary>
+        /// 闅忔満娓呮壂
+        /// </summary>
+        public const int RandomClean = 1036;
+        /// <summary>
+        /// 娌垮娓呮壂
+        /// </summary>
+        public const int WallClean = 1037;
+        /// <summary>
+        /// 铻烘棆娓呮壂
+        /// </summary>
+        public const int SpiralClean = 1038;
+        /// <summary>
+        /// 鎬绘竻娲侀潰绉�
+        /// </summary>
+        public const int TotalCleanArea = 1039;
+        /// <summary>
+        /// 鎬绘竻娲佹椂闂�
+        /// </summary>
+        public const int TotalCleaningTime = 1040;
+        /// <summary>
+        /// 杈瑰埛鍓╀綑瀵垮懡
+        /// </summary>
+        public const int RemainingLifeOfSideBrush = 1041;
+        /// <summary>
+        /// 婊氬埛鍓╀綑瀵垮懡
+        /// </summary>
+        public const int RemainingLifeOfRollerBrush = 1042;
+        /// <summary>
+        /// 婊ょ綉鍓╀綑瀵垮懡
+        /// </summary>
+        public const int RemainingLifeOfFilterScreen = 1043;
+        /// <summary>
+        /// 閲嶇疆杈瑰埛
+        /// </summary>
+        public const int ResetSideBrush = 1044;
+        /// <summary>
+        /// 閲嶇疆婊氬埛
+        /// </summary>
+        public const int ResetRollerBrush = 1045;
+        /// <summary>
+        /// 閲嶇疆婊ょ綉
+        /// </summary>
+        public const int ResetFilterScreen = 1046;
+        /// <summary>
+        /// 鏄惁閲嶇疆杈瑰埛
+        /// </summary>
+        public const int ResetSideBrushMsg = 1047;
+        /// <summary>
+        /// 鏄惁閲嶇疆婊氬埛
+        /// </summary>
+        public const int ResetRollerBrushMsg = 1048;
+        /// <summary>
+        /// 鏄惁閲嶇疆婊ょ綉
+        /// </summary>
+        public const int ResetFilterScreenMsg = 1049;
+        /// <summary>
+        /// 娣诲姞璁惧
+        /// </summary>
+        public const int AddDevice = 1050;
+        /// <summary>
+        /// mini鏅鸿兘閬ユ帶鍣�
+        /// </summary>
+        public const int MiniIntelligentRemoteControl = 1051;
+        /// <summary>
+        /// 娣诲姞绾㈠閬ユ帶
+        /// </summary>
+        public const int AddInfraredRemoteControl = 1052;
+        /// <summary>
+        /// 闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�10绉掞紝鎸囩ず鐏摑鑹插揩闂�
+        /// </summary>
+        public const int AddInfraredRemoteControlMsg1 = 1053;
+        /// <summary>
+        /// 璇风‘淇濇偍鐨勮摑鐗欏凡寮�鍚苟澶勪簬鍙互琚悳绱㈢姸鎬�
+        /// </summary>
+        public const int AddInfraredRemoteControlMsg2 = 1054;
+        /// <summary>
+        /// 涓嬩竴姝�
+        /// </summary>
+        public const int Next = 1055;
+        /// <summary>
+        /// 璁惧鎼滅储涓�...
+        /// </summary>
+        public const int SearchingDevice = 1056;
+        /// <summary>
+        /// 娌℃湁鍙戠幇绾㈠閬ユ帶鍣�
+        /// </summary>
+        public const int NoInfraredRemoteControlFound = 1057;
+        /// <summary>
+        /// 1銆佽妫�鏌ヨ澶囨槸鍚︽甯搁�氱數{0}2銆佽妫�鏌ヨ摑鐗欏姛鑳芥槸鍚︽甯稿紑鍚瘂0}3銆佽妫�鏌ユ寚绀虹伅鏄惁钃濊壊蹇棯鐘舵��
+        /// </summary>
+        public const int AddInfraredRemoteControlMsg3 = 1058;
+        /// <summary>
+        /// 閲嶆柊鎼滅储
+        /// </summary>
+        public const int ReSearch = 1059;
+        /// <summary>
+        /// 杩炴帴WiFi
+        /// </summary>
+        public const int ConnectWiFi = 1060;
+        /// <summary>
+        /// 鐩墠鍙敮鎸�2.4G WiFi缃戠粶{0}鏆備笉鏀寔甯︽湁涓枃瀛楃鐨刉iFi鍚嶇О
+        /// </summary>
+        public const int AddInfraredRemoteControlMsg4 = 1061;
+        /// <summary>
+        /// 瀵嗙爜
+        /// </summary>
+        public const int Password = 1062;
+        /// <summary>
+        /// 姝e湪杩炴帴涓�...
+        /// </summary>
+        public const int NowConnectting = 1063;
+        /// <summary>
+        /// 璇疯绾㈠閬ユ帶灏介噺鎺ヨ繎WIFI璺敱鍣�
+        /// </summary>
+        public const int AddInfraredRemoteControlMsg5 = 1064;
+        /// <summary>
+        /// 缃戠粶閾炬帴涓�
+        /// </summary>
+        public const int InTheNetworkLink = 1065;
+        /// <summary>
+        /// 涓婁紶鍒颁簯
+        /// </summary>
+        public const int UploadToCloud = 1066;
+        /// <summary>
+        /// 杩炴帴鎴愬姛
+        /// </summary>
+        public const int ConnectSuccess = 1067;
+        /// <summary>
+        /// 1銆佽妫�鏌ヨ澶囨槸鍚︽甯搁�氱數{0}2銆佽寮�鍚摑鐗欏姛鑳絳0}3銆佸苟闀挎寜鎸夐挳10s锛屾寚绀虹伅甯镐寒
+        /// </summary>
+        public const int AddInfraredRemoteControlMsg6 = 1068;
+        /// <summary>
+        /// 娣诲姞澶辫触
+        /// </summary>
+        public const int AddFail = 1069;
+        /// <summary>
+        /// 娣诲姞鎴愬姛
+        /// </summary>
+        public const int AddSuccess = 1070;
+        /// <summary>
+        /// 鍙互寮�濮嬩娇鐢ㄧ孩澶栭仴鎺у姛鑳斤紒
+        /// </summary>
+        public const int AddInfraredRemoteControlMsg7 = 1071;
+        /// <summary>
+        /// 寮�濮嬩娇鐢�
+        /// </summary>
+        public const int StartUse = 1072;
+        /// <summary>
+        /// 璇锋墦寮�钃濈墮
+        /// </summary>
+        public const int PleaseTurnOnBluetooth = 1073;
+        /// <summary>
+        /// 浣嶇疆淇℃伅(GBS)涓嶅彲鐢�
+        /// </summary>
+        public const int GbsIsNotAvailable = 1074;
+        /// <summary>
+        /// 缃戠粶涓嶅彲鐢�
+        /// </summary>
+        public const int NetworkIsNotAvailable = 1075;
+        /// <summary>
+        /// 閫夋嫨绾㈠閬ユ帶鍣�
+        /// </summary>
+        public const int ChooseInfraredRemoteControl = 1076;
+        /// <summary>
+        /// 鏂伴
+        /// </summary>
+        public const int AirFresh = 1077;
+        /// <summary>
+        /// 褰撳墠婊ょ綉鍓╀綑
+        /// </summary>
+        public const int ResidualFilterScreen = 1078;
+        /// <summary>
+        /// 鑺傝兘
+        /// </summary>
+        public const int Energy = 1079;
+        /// <summary>
+        /// 閫氶
+        /// </summary>
+        public const int Ventilated = 1080;
+        /// <summary>
+        /// 1妗�
+        /// </summary>
+        public const int OneGear = 1081;
+        /// <summary>
+        /// 2妗�
+        /// </summary>
+        public const int TwoGear = 1082;
+        /// <summary>
+        /// 3妗�
+        /// </summary>
+        public const int ThreeGear = 1083;
+        /// <summary>
+        /// 椋庨��1妗�
+        /// </summary>
+        public const int FanOneGear = 1084;
+        /// <summary>
+        /// 椋庨��2妗�
+        /// </summary>
+        public const int FanTwoGear = 1085;
+        /// <summary>
+        /// 椋庨��3妗�
+        /// </summary>
+        public const int FanThreeGear = 1086;
+        /// <summary>
+        /// 涓�閿紑閿�
+        /// </summary>
+        public const int OneKeyUnlocking = 1087;
+        /// <summary>
+        /// 涓存椂瀵嗙爜寮�閿�
+        /// </summary>
+        public const int TemporaryPasswordUnlocking = 1088;
+        /// <summary>
+        /// 宸茶繛鎺�
+        /// </summary>
+        public const int Connected = 1089;
+        /// <summary>
+        /// 鏈繛鎺�
+        /// </summary>
+        public const int UnConnected = 1090;
+        /// <summary>
+        /// 鐢熸垚涓存椂瀵嗙爜
+        /// </summary>
+        public const int CreatTemporaryPassword = 1091;
+        /// <summary>
+        /// 鐢熸晥鏃堕棿
+        /// </summary>
+        public const int EffectiveTime = 1092;
+        /// <summary>
+        /// 澶辨晥鏃堕棿
+        /// </summary>
+        public const int FailureTime = 1093;
+        /// <summary>
+        /// 閫夋嫨鏃堕棿
+        /// </summary>
+        public const int SelectTime = 1094;
+        /// <summary>
+        /// 閫夋嫨鏃ユ湡
+        /// </summary>
+        public const int SelectDate = 1095;
+        /// <summary>
+        /// 鐢熸垚
+        /// </summary>
+        public const int Generate = 1096;
+        /// <summary>
+        /// 涓存椂瀵嗙爜宸茬粡澶嶅埗
+        /// </summary>
+        public const int TempPsswordHasBeenCopy = 1097;
+        /// <summary>
+        /// 娓呴櫎褰撳墠涓存椂瀵嗙爜锛�
+        /// </summary>
+        public const int ClearTempPsswordMsg = 1098;
+        /// <summary>
+        /// 鐢熸晥鏃堕棿蹇呴』澶т簬澶辨晥鏃堕棿
+        /// </summary>
+        public const int EffectiveTimeMustBeOverFailureTime = 1099;
+        /// <summary>
+        /// 寮�閿佹柟寮忕鐞�
+        /// </summary>
+        public const int UnlockingManagement = 1100;
+        /// <summary>
+        /// 鍒犻櫎鎿嶄綔灏嗚鍚屾浜庡疄浣撻攣涓婃槸鍚﹁繕闇�瑕佸垹闄わ紵
+        /// </summary>
+        public const int DeleteUnlockingMethordMsg = 1101;
+        /// <summary>
+        /// 纭鍒犻櫎
+        /// </summary>
+        public const int ConfirmDeletion = 1102;
+        /// <summary>
+        /// 淇敼澶囨敞鍚嶇О
+        /// </summary>
+        public const int EditorRemarkName = 1103;
+        /// <summary>
+        /// 澶囨敞鍚嶇О涓嶈兘涓虹┖
+        /// </summary>
+        public const int RemarkNameCanNotEmpty = 1104;
+        /// <summary>
+        /// 鍒嗛厤鑷�
+        /// </summary>
+        public const int AssignTo = 1105;
+        /// <summary>
+        /// 妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勫満鏅�
+        /// </summary>
+        public const int NotHadCanSelectScene = 1106;
+        /// <summary>
+        /// 閫夋嫨鍦烘櫙
+        /// </summary>
+        public const int SelectScene = 1107;
+        /// <summary>
+        /// 閿佸凡鎵撳紑
+        /// </summary>
+        public const int LockIsOpened = 1108;
+        /// <summary>
+        /// 甯稿紑
+        /// </summary>
+        public const int AlwaysOn = 1109;
+        /// <summary>
+        /// 鏃舵晥鎬у父寮�璁剧疆
+        /// </summary>
+        public const int TimelyAlwaysOnSetting = 1110;
+        /// <summary>
+        /// 甯稿紑鑷姩鍖�
+        /// </summary>
+        public const int AutomationAlwaysOn = 1111;
+        /// <summary>
+        /// 鎵撳紑甯稿紑妯″紡
+        /// </summary>
+        public const int OpenAlwaysOnModel = 1112;
+        /// <summary>
+        /// 鍏抽棴甯稿紑妯″紡
+        /// </summary>
+        public const int CloseAlwaysOnModel = 1113;
+        /// <summary>
+        /// 缂栬緫
+        /// </summary>
+        public const int Edit = 1114;
+        /// <summary>
+        /// 甯稿紑妯″紡灏嗕簬{0}鍏抽棴
+        /// </summary>
+        public const int AlwaysOnWillCloseOnTime = 1115;
+        /// <summary>
+        /// 鏉′欢
+        /// </summary>
+        public const int Condtion = 1116;
+        /// <summary>
+        /// 鍔ㄤ綔
+        /// </summary>
+        public const int Action = 1117;
+        /// <summary>
+        /// 甯稿紑妯″紡
+        /// </summary>
+        public const int AlwaysOnModel = 1118;
+        /// <summary>
+        /// 閿�
+        /// </summary>
+        public const int Lock = 1119;
+        /// <summary>
+        /// 鐢ㄦ埛
+        /// </summary>
+        public const int User = 1120;
+        /// <summary>
+        /// 寮�閿佹柟寮�
+        /// </summary>
+        public const int UnlockingMode = 1121;
+        /// <summary>
+        /// 鎸囩汗
+        /// </summary>
+        public const int Fingerprints = 1122;
+        /// <summary>
+        /// 鍗�
+        /// </summary>
+        public const int Card = 1123;
+        /// <summary>
+        /// 閽ュ寵
+        /// </summary>
+        public const int Key = 1124;
+        /// <summary>
+        /// 淇℃伅绫诲瀷
+        /// </summary>
+        public const int MessageType = 1125;
+        /// <summary>
+        /// 寮�閿佷俊鎭�
+        /// </summary>
+        public const int UnlockingMessage = 1126;
+        /// <summary>
+        /// 鎶ヨ绫讳俊鎭�
+        /// </summary>
+        public const int AlarmMessage = 1127;
+        /// <summary>
+        /// 璁惧涓嶅湪绾�
+        /// </summary>
+        public const int DeviceNotOnline = 1128;
+        /// <summary>
+        /// 绗竴娆′娇鐢紝璇峰厛缁戝畾闂ㄩ攣瀵嗙爜
+        /// </summary>
+        public const int PleaseBindTheDoorPswFirst = 1129;
+        /// <summary>
+        /// 璇疯緭鍏ラ棬閿佺鐞嗗憳瀵嗙爜
+        /// </summary>
+        public const int PleaseInputDoorAdminPassword = 1130;
+        /// <summary>
+        /// 闂ㄩ攣缁戝畾鎴愬姛
+        /// </summary>
+        public const int BindDoorLockSuccess = 1131;
+        /// <summary>
+        /// 涓轰簡瀹夊叏锛岃璺宠浆鑷充釜浜轰腑蹇儃0}璁剧疆涓汉瀵嗙爜锛屽苟搴旂敤浜庨棬閿佸紑閿�
+        /// </summary>
+        public const int JumpToPersonalCentetToSetPasswordMsg = 1132;
+        /// <summary>
+        /// 璺宠浆
+        /// </summary>
+        public const int Jump = 1133;
+        /// <summary>
+        /// 璇风粯鍒跺浘妗�
+        /// </summary>
+        public const int PleaseDrawPattern = 1134;
+        /// <summary>
+        /// 璁剧疆甯稿紑妯″紡鍚巤0}鎮ㄧ殑闂ㄩ攣灏嗗浜庢墦寮�鐘舵�亄0}鏄惁缁х画寮�鍚�
+        /// </summary>
+        public const int OpenAlwayOnConfirmMsg = 1135;
+        /// <summary>
+        /// 纭寮�鍚�
+        /// </summary>
+        public const int ConfirmOpen = 1136;
+        /// <summary>
+        /// 澶辨晥璁剧疆
+        /// </summary>
+        public const int FailTimeSeetion = 1137;
+        /// <summary>
+        /// 甯稿紑妯″紡灏嗕簬{0}灏忔椂鍚庡け鏁�
+        /// </summary>
+        public const int AlwayOnWillCloseAtTimeMsg = 1138;
+        /// <summary>
+        /// 璇疯緭鍏ュけ鏁堟椂闂�
+        /// </summary>
+        public const int PleaseInputFailTime = 1139;
+        /// <summary>
+        /// 澶辨晥鏃堕棿涓嶈兘澶т簬72灏忔椂
+        /// </summary>
+        public const int InvalidTimeMoreThan72 = 1140;
+        /// <summary>
+        /// 澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂
+        /// </summary>
+        public const int InvalidTimeLessThan1 = 1141;
+        /// <summary>
+        /// 甯稿紑妯″紡鍏抽棴璁剧疆澶辨晥锛岃閲嶈瘯
+        /// </summary>
+        public const int AlwayOnFailTimeSettionFailMsg = 1142;
+        /// <summary>
+        /// 绠$悊鍛樿韩浠介獙璇佸け璐�,璇烽噸鏂扮櫥褰�
+        /// </summary>
+        public const int CheckAdminFailAndLoginAgain = 1143;
+        /// <summary>
+        /// 鎮ㄧ殑浣忓畢灏嗚繃鎴风粰鍏朵粬HDL璐﹀彿
+        /// </summary>
+        public const int YourHomeWillBeTransferredToOtherAccounts = 1144;
+        /// <summary>
+        /// 璇锋敞鎰忥細
+        /// </summary>
+        public const int Attention = 1145;
+        /// <summary>
+        /// 1.璇ヤ綇瀹呮偍鐨勬暟鎹紙浜戠鏁版嵁锛夊皢鍏ㄩ儴杞Щ缁欐柊鐨勬埛涓粄0}2.杩囨埛鍚庯紝鍘熸湁鐨勬垚鍛樺皢鑷姩瑙g粦璇ヤ綇瀹厈0}3.鏂版埛涓昏处鍙蜂负鏈夋晥鐨凥DL璐﹀彿{0}4.鎺ユ敹鏂硅处鍙蜂笌杞Щ鏂硅处鍙蜂笉鍙负鍚屼竴涓处鍙�
+        /// </summary>
+        public const int TransferreConfirmMsg1 = 1146;
+        /// <summary>
+        /// 纭杩囨埛
+        /// </summary>
+        public const int ConfirmTransferre = 1147;
+        /// <summary>
+        /// 璇疯緭鍏ユ帴鏀舵柟璐﹀彿
+        /// </summary>
+        public const int PleaseInputReceiverAccount = 1148;
+        /// <summary>
+        /// 涓汉璧勬枡
+        /// </summary>
+        public const int Profile = 1149;
+        /// <summary>
+        /// 纭杩囨埛{0}鐨勭鐞嗗憳璐﹀彿缁欒处鍙穥1}
+        /// </summary>
+        public const int TransferreConfirmMsg2 = 1150;
+        /// <summary>
+        /// 鐩爣璐﹀彿骞朵笉瀛樺湪
+        /// </summary>
+        public const int TargetAcountDoesNotExist = 1151;
+        /// <summary>
+        /// 涓嶈兘鑷繁杩囨埛缁欒嚜宸�
+        /// </summary>
+        public const int YouCannotTransferOwnershipToYourself = 1152;
+        /// <summary>
+        /// 缁堟
+        /// </summary>
+        public const int Terminate = 1153;
+        /// <summary>
+        /// 姝e湪杩囨埛缁欑敤鎴�,璇风◢鍚�...
+        /// </summary>
+        public const int IsTransferingPleaseWaitting = 1154;
+        /// <summary>
+        /// 鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢琛岀鐞嗗憳
+        /// </summary>
+        public const int CongratulationsXXBecomingNNAdministrator = 1155;
+        /// <summary>
+        /// 璇ヤ綇瀹呯殑淇℃伅灏嗗湪鎮ㄧ殑璐﹀彿涓垹闄�
+        /// </summary>
+        public const int ResidenceDataWillBeDeletedFromYourAccount = 1156;
+        /// <summary>
+        /// 杩囨埛澶辫触
+        /// </summary>
+        public const int TransferFail = 1157;
+        /// <summary>
+        /// 璇烽噸鏂板皾璇�
+        /// </summary>
+        public const int PleaseTryAgain = 1158;
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+        /// <summary>
+        /// 绠$悊鍛樻潈闄愯浆绉�
+        /// </summary>
+        public const int AdminAuthorityTransfer = 1159;
+        /// <summary>
+        /// 鎮ㄥ皢杞Щ鎮ㄧ殑绠$悊鍛樻潈闄愮粰鍏朵粬鎴愬憳
+        /// </summary>
+        public const int AdminAuthorityTransferMag1 = 1160;
+        /// <summary>
+        /// 1.璇ヤ綇瀹呮偍鐨勭鐞嗗憳鏁版嵁锛堜簯绔暟鎹級灏嗗叏閮ㄨ浆绉荤粰鏂扮殑绠$悊鍛榹0}2.鎮ㄧ殑鏁版嵁灏嗕細涓庣洰鏍囨垚鍛樹簰鎹紝鎮ㄧ殑鏉冮檺灏嗗彉鏇翠负鐩爣鎴愬憳鐨勬潈闄�
+        /// </summary>
+        public const int AdminAuthorityTransferMag2 = 1161;
+        /// <summary>
+        /// 纭杞Щ
+        /// </summary>
+        public const int ConfirmTransfer2 = 1162;
+        /// <summary>
+        /// 妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勬垚鍛�
+        /// </summary>
+        public const int NotHadMemberToSelect = 1163;
+        /// <summary>
+        /// 纭杞Щ{0}鐨勭鐞嗗憳鏉冮檺缁欒处鍙穥1}
+        /// </summary>
+        public const int TransferreConfirmMsg3 = 1164;
+        /// <summary>
+        /// 杩佺Щ鎴愬姛
+        /// </summary>
+        public const int TransferreSuccess1 = 1165;
+        /// <summary>
+        /// 杩佺Щ澶辫触
+        /// </summary>
+        public const int TransferreFail1 = 1166;
+        /// <summary>
+        /// 杩佺Щ鎴愬姛锛屾偍鐨勬潈闄愬皢鍙樹负鏅�氭垚鍛�
+        /// </summary>
+        public const int TransferreSuccessMsg1 = 1167;
+=======
 
+>>>>>>> parent of 3861152e (Merge branch 'tzy2' into newBranch1)
+=======
 
+>>>>>>> parent of 3861152e (Merge branch 'tzy2' into newBranch1)
+=======
 
+>>>>>>> parent of 3861152e (Merge branch 'tzy2' into newBranch1)
+
+        public const int keshiduijiang = 4000;
+        public const int tonghuajilu = 4001;
+        public const int baolu30 = 4002;
+        public const int menkoujihujiao = 4003;
+        public const int yijieting = 4004;
+        public const int yikaisuo = 4005;
+        public const int nian = 4006;
+        public const int laizi = 4007;
+        public const int hujiao = 4008;
+        public const int weikaisuo = 4009;
+        public const int weijieting = 4010;
+        public const int yijujue = 4011;
+        public const int peizhicanshuyouyichang = 4012;
+        public const int menjinerweima = 4013;
+        public const int linshimima = 4014;
 
         public const int a31Music = 5000;
         public const int merge = 5001;
@@ -454,6 +1315,100 @@
         public const int volumeAdjustment = 5046;
         public const int qqMsuicTip = 5047;
 
+
+        public const int zhengchang = 6000;
+        public const int shebeizhuangtai = 6001;
+        public const int ge = 6002;
+        public const int dangqianhongwaishebei = 6003;
+        public const int yitianjiayaokongqi = 6004;
+        public const int kongtiao = 6005;
+        public const int dianshi = 6006;
+        public const int fengshan = 6007;
+        public const int jidinghe = 6008;
+        public const int dvd = 6009;
+        public const int touyingyi = 6010;
+        public const int zidingyi = 6011;
+        public const int hongwaiyaokong = 6012;
+        public const int shebeigaunli = 6013;
+        public const int tianjiayaokongqi = 6014;
+        public const int zaixianhwb= 6015;
+        public const int lixian = 6016;
+        public const int banbenhao = 6017;
+        public const int shuruyaokongqimingcheng = 6018;
+        public const int fengleichazhao = 6019;
+        public const int tuijiananjian = 6020;
+        public const int anjianmingcheng = 6021;
+        public const int xiayibu= 6022;
+        public const int dianyuan = 6023;
+        public const int yinliangjia = 6024;
+        public const int yinliangjian = 6025;
+        public const int pindaojia = 6026;
+        public const int pindaojian = 6027;
+        public const int shang = 6028;
+        public const int xia = 6029;
+        public const int zuo = 6030;
+        public const int you = 6031;
+        public const int jingyin = 6032;
+        public const int queren = 6034;
+        public const int bofang = 6035;
+        public const int tuichu = 6037;
+        public const int caidan = 6038;
+        public const int zanting = 6039;
+        public const int fanhui = 6040;
+        public const int tingzhi = 6041;
+        public const int zhuye = 6042;
+        public const int kuaijin = 6043;
+        public const int kuaitui = 6044;
+        public const int dingshi = 6045;
+        public const int fuzhiyaokonggongnneg = 6046;
+        public const int duizhunanxiaanniu = 6047;
+        public const int zhinengyaokongqi = 6048;
+        public const int tianjiaanniu = 6049;
+        public const int paixu = 6050;
+        public const int wancheng = 6051;
+        public const int tianjiachenggong = 6052;
+        public const int kedaofenlei = 6053;
+        public const int suoshufenlei = 6054;
+        public const int yaokongqimingcheng = 6055;
+        public const int suoshuquyu = 6056;
+        public const int jixutianjia = 6057;
+        public const int dianqi = 6058;
+        public const int tianjiashibai = 6059;
+        public const int chongshii = 6060;
+        public const int pipeiyaokongqi = 6061;
+        public const int dianjianniu = 6062;
+        public const int shifouyouxiangying = 6063;
+        public const int kongzhishibai = 6064;
+        public const int kongzhichenggong = 6065;
+        public const int kaiguankai = 6066; 
+        public const int moshizhileng = 6067;   
+        public const int fengsuzhongfeng = 6068; 
+        public const int wendu26 = 6069;
+        public const int shanchushebei = 6070;
+        public const int xiugaimingzi = 6071;
+        public const int querenshanchu = 6072;
+        public const int quxiao = 6073;
+        public const int bunengchaoguo10 = 6074;
+        public const int yaokongqiquyu = 6075;
+        public const int bianjixinxi = 6076;
+        public const int banbenshengji = 6077;
+        public const int xitongweihuzhong = 6078;
+        public const int huoqushujushibao = 6079;
+        public const int zanshibuzhichigaigongneng = 6080;
+        public const int xuanzehongwaipinpai= 6081;
+        public const int yaotou = 6082;
+        public const int disu = 6083;
+        public const int zhongsu = 6084;
+        public const int gaosu = 6085;
+        public const int zidong = 6086;
+        public const int wendujia = 6087;
+        public const int wendujian = 6088;
+        public const int kongqijinghauqi = 6089;
+        public const int reshuiqi = 6090;
+        public const int bucunzaichanpin = 6091;
+        public const int shebeibucunzai = 6092;
+        public const int shebeibuzaixian = 6093;
+        public const int wangguanshebeibuzaixian = 6094;
 
         public const int newAutomation = 7000;
         public const int editAutomation = 7001;
@@ -563,8 +1518,34 @@
         public const int pmqingdu= 7105;
         public const int pmzhongdu = 7106;
         public const int pmzhongduwuran= 7107;
-
-
+        public const int xieluoandwuxieluo=7108;
+        public const int xieluo = 7109;
+        public const int wuxieluo = 7110;
+        public const int luoshuiandwuluoshui = 7111;
+        public const int luoshui = 7112;
+        public const int wuluoshui = 7113;
+        public const int yourenandwuren = 7114;
+        public const int youren = 7115;
+        public const int wuren = 7116;
+        public const int kaiqiandbihe = 7117;
+        public const int kaiqi = 7118;
+        public const int bihe = 7119;
+        public const int fangchaigongneng = 7120;
+        public const int zaixian = 7121;
+        public const int buzaixian = 7122;
+        public const int kongqizhiliang = 7123;
+        public const int kongqiyou= 7124;
+        public const int kongqiliang = 7125;
+        public const int kongqicha = 7126;
+        public const int fasongtongzhi = 7127;
+        public const int tongzhineirong = 7128;
+        public const int xianzhichangdu = 7129;
+        public const int zhanghaoxuanze = 7130;
+        public const int apptuisong = 7131;
+        public const int zidontghua = 7132;
+        public const int yizhixing = 7133;
+        public const int mubiaozhuangtai = 7134;
+        public const int diedao = 7135;
 
         #region LE鏂板
         /// <summary>
@@ -823,6 +1804,28 @@
         /// 杩樻湁{0}娆℃満浼氥��
         /// </summary>
         public const int AFewMoreChances = 9063;
+        /// <summary>
+        /// 鏅鸿兘闊崇
+        /// </summary>
+        public const int SmartSpeaker = 9064;
+        /// <summary>
+        /// 鏁版嵁绠$悊
+        /// </summary>
+        public const int DataManagement = 9065;
+        /// <summary>
+        /// 澶囨敞
+        /// </summary>
+        public const int Remarks = 9066;
+        /// <summary>
+        /// 澶囨敞涓嶈兘涓虹┖
+        /// </summary>
+        public const int RemarksCannotBeBlank = 9067;
+        /// <summary>
+        /// 鏄惁瑙i櫎缁戝畾锛�
+        /// </summary>
+        public const int DoYouWantToUnbind = 9068;
+
+
 
         #region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
         /// <summary>

--
Gitblit v1.8.0