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 | 863 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 686 insertions(+), 177 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index a04ca38..97bce1f 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,135 @@
{
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;
@@ -436,40 +565,40 @@
public const int LoginByEmail = 4;
- /// <summary>
- /// 瀹ゅ唴婀垮害
+ /// <summary>
+ /// 瀹ゅ唴婀垮害
/// </summary>
public const int IndoorHumidity = 1000;
- /// <summary>
- /// 绔ラ攣
+ /// <summary>
+ /// 绔ラ攣
/// </summary>
public const int V_chip = 1001;
- /// <summary>
- /// 璐熺瀛�
+ /// <summary>
+ /// 璐熺瀛�
/// </summary>
public const int Anion = 1002;
- /// <summary>
- /// 鏉�鑿�
+ /// <summary>
+ /// 鏉�鑿�
/// </summary>
public const int Sterilization = 1003;
- /// <summary>
- /// 鍔犳箍
+ /// <summary>
+ /// 鍔犳箍
/// </summary>
- public const int Humidification = 1004;
- /// <summary>
- /// 婊よ姱澶嶄綅
+ public const int Humidification = 1004;
+ /// <summary>
+ /// 婊よ姱澶嶄綅
/// </summary>
- public const int FilterElementReset = 1005;
- /// <summary>
- /// 鐏厜
+ public const int FilterElementReset = 1005;
+ /// <summary>
+ /// 鐏厜
/// </summary>
- public const int Lighting = 1006;
- /// <summary>
- /// 鑷姩妯″紡
+ public const int Lighting = 1006;
+ /// <summary>
+ /// 鑷姩妯″紡
/// </summary>
- public const int AutoMode = 1007;
- /// <summary>
- /// 鎵嬪姩妯″紡
+ public const int AutoMode = 1007;
+ /// <summary>
+ /// 鎵嬪姩妯″紡
/// </summary>
public const int HandMode = 1008;
/// <summary>
@@ -484,96 +613,96 @@
/// 瀹氭椂
/// </summary>
public const int Timing = 1011;
- /// <summary>
- /// 閫夋嫨椋庨��
+ /// <summary>
+ /// 閫夋嫨椋庨��
/// </summary>
- public const int WindSpeedSelection = 1012;
- /// <summary>
- /// 妗�
+ public const int WindSpeedSelection = 1012;
+ /// <summary>
+ /// 妗�
/// </summary>
- public const int Gear = 1013;
- /// <summary>
- /// 璇风‘璁ゆ槸鍚﹀凡瀹為檯閲嶇疆婊よ姱骞舵寜{0}鐓ц鏄庝功瑕佹眰鎿嶄綔璁惧杩涜婊よ姱{0}瀵垮懡閲嶆柊璁℃椂
+ public const int Gear = 1013;
+ /// <summary>
+ /// 璇风‘璁ゆ槸鍚﹀凡瀹為檯閲嶇疆婊よ姱骞舵寜{0}鐓ц鏄庝功瑕佹眰鎿嶄綔璁惧杩涜婊よ姱{0}瀵垮懡閲嶆柊璁℃椂
/// </summary>
- public const int FilterElementResetMsg = 1014;
- /// <summary>
- /// 浣庢。
+ public const int FilterElementResetMsg = 1014;
+ /// <summary>
+ /// 浣庢。
/// </summary>
- public const int LowGear = 1015;
- /// <summary>
- /// 涓。
+ public const int LowGear = 1015;
+ /// <summary>
+ /// 涓。
/// </summary>
- public const int MidGear = 1016;
- /// <summary>
- /// 楂樻。
+ public const int MidGear = 1016;
+ /// <summary>
+ /// 楂樻。
/// </summary>
public const int HeightGear = 1017;
- /// <summary>
- /// 瀹氭椂璁剧疆
+ /// <summary>
+ /// 瀹氭椂璁剧疆
/// </summary>
public const int TimingSetting = 1018;
- /// <summary>
- /// 灏忔椂
+ /// <summary>
+ /// 灏忔椂
/// </summary>
public const int Hour1 = 1019;
- /// <summary>
- /// 婊よ姱浣跨敤锛�
+ /// <summary>
+ /// 婊よ姱浣跨敤锛�
/// </summary>
public const int UseOfFilterElement = 1020;
- /// <summary>
- /// 绌烘皵鍑�鍖栧櫒
+ /// <summary>
+ /// 绌烘皵鍑�鍖栧櫒
/// </summary>
public const int AirCleaner = 1021;
- /// <summary>
- /// 褰撳墠椋庨��
+ /// <summary>
+ /// 褰撳墠椋庨��
/// </summary>
- public const int CurrentWindSpeed = 1022;
- /// <summary>
- /// 鍙栨秷瀹氭椂
+ public const int CurrentWindSpeed = 1022;
+ /// <summary>
+ /// 鍙栨秷瀹氭椂
/// </summary>
- public const int CancelTiming = 1023;
- /// <summary>
- /// 鎵湴鏈哄櫒浜�
+ public const int CancelTiming = 1023;
+ /// <summary>
+ /// 鎵湴鏈哄櫒浜�
/// </summary>
public const int WeepRobot = 1024;
- /// <summary>
- /// 鍚稿姏璋冭妭
+ /// <summary>
+ /// 鍚稿姏璋冭妭
/// </summary>
public const int SuctionAdjustment = 1025;
- /// <summary>
- /// 鍚稿姏1妗�
+ /// <summary>
+ /// 鍚稿姏1妗�
/// </summary>
public const int SuctionOneGear = 1026;
- /// <summary>
- /// 鍚稿姏2妗�
+ /// <summary>
+ /// 鍚稿姏2妗�
/// </summary>
public const int SuctionTwoGear = 1027;
- /// <summary>
- /// 鍚稿姏3妗�
+ /// <summary>
+ /// 鍚稿姏3妗�
/// </summary>
public const int SuctionThreeGear = 1028;
- /// <summary>
- /// 鍏呯數
+ /// <summary>
+ /// 鍏呯數
/// </summary>
public const int Charge = 1029;
- /// <summary>
- /// 澹伴煶
+ /// <summary>
+ /// 澹伴煶
/// </summary>
- public const int Voice = 1030;
- /// <summary>
- /// 闈欓煶
+ public const int Voice = 1030;
+ /// <summary>
+ /// 闈欓煶
/// </summary>
- public const int Mute = 1031;
- /// <summary>
- /// 娓呮壂妯″紡
+ public const int Mute = 1031;
+ /// <summary>
+ /// 娓呮壂妯″紡
/// </summary>
public const int CleanMode = 1032;
- /// <summary>
- /// 鑰楁潗绠＄悊
+ /// <summary>
+ /// 鑰楁潗绠＄悊
/// </summary>
public const int ConsumablesManagement = 1033;
- /// <summary>
- /// 鍘嗗彶璁板綍
+ /// <summary>
+ /// 鍘嗗彶璁板綍
/// </summary>
public const int HistoryLog = 1034;
/// <summary>
@@ -635,156 +764,491 @@
/// <summary>
/// 鏄惁閲嶇疆婊ょ綉
/// </summary>
- public const int ResetFilterScreenMsg = 1049;
+ public const int ResetFilterScreenMsg = 1049;
/// <summary>
/// 娣诲姞璁惧
/// </summary>
public const int AddDevice = 1050;
- /// <summary>
- /// mini鏅鸿兘閬ユ帶鍣�
+ /// <summary>
+ /// mini鏅鸿兘閬ユ帶鍣�
/// </summary>
- public const int MiniIntelligentRemoteControl = 1051;
- /// <summary>
- /// 娣诲姞绾㈠閬ユ帶
+ public const int MiniIntelligentRemoteControl = 1051;
+ /// <summary>
+ /// 娣诲姞绾㈠閬ユ帶
/// </summary>
- public const int AddInfraredRemoteControl = 1052;
- /// <summary>
- /// 闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�10绉掞紝鎸囩ず鐏摑鑹插揩闂�
+ public const int AddInfraredRemoteControl = 1052;
+ /// <summary>
+ /// 闀挎寜绾㈠閬ユ帶鍣ㄦ寜閽�10绉掞紝鎸囩ず鐏摑鑹插揩闂�
/// </summary>
- public const int AddInfraredRemoteControlMsg1 = 1053;
- /// <summary>
- /// 璇风‘淇濇偍鐨勮摑鐗欏凡寮�鍚苟澶勪簬鍙互琚悳绱㈢姸鎬�
+ public const int AddInfraredRemoteControlMsg1 = 1053;
+ /// <summary>
+ /// 璇风‘淇濇偍鐨勮摑鐗欏凡寮�鍚苟澶勪簬鍙互琚悳绱㈢姸鎬�
/// </summary>
- public const int AddInfraredRemoteControlMsg2 = 1054;
- /// <summary>
- /// 涓嬩竴姝�
+ public const int AddInfraredRemoteControlMsg2 = 1054;
+ /// <summary>
+ /// 涓嬩竴姝�
/// </summary>
public const int Next = 1055;
- /// <summary>
- /// 璁惧鎼滅储涓�...
+ /// <summary>
+ /// 璁惧鎼滅储涓�...
/// </summary>
- public const int SearchingDevice = 1056;
- /// <summary>
- /// 娌℃湁鍙戠幇绾㈠閬ユ帶鍣�
+ public const int SearchingDevice = 1056;
+ /// <summary>
+ /// 娌℃湁鍙戠幇绾㈠閬ユ帶鍣�
/// </summary>
- public const int NoInfraredRemoteControlFound = 1057;
- /// <summary>
- /// 1銆佽妫�鏌ヨ澶囨槸鍚︽甯搁�氱數{0}2銆佽妫�鏌ヨ摑鐗欏姛鑳芥槸鍚︽甯稿紑鍚瘂0}3銆佽妫�鏌ユ寚绀虹伅鏄惁钃濊壊蹇棯鐘舵��
+ public const int NoInfraredRemoteControlFound = 1057;
+ /// <summary>
+ /// 1銆佽妫�鏌ヨ澶囨槸鍚︽甯搁�氱數{0}2銆佽妫�鏌ヨ摑鐗欏姛鑳芥槸鍚︽甯稿紑鍚瘂0}3銆佽妫�鏌ユ寚绀虹伅鏄惁钃濊壊蹇棯鐘舵��
/// </summary>
public const int AddInfraredRemoteControlMsg3 = 1058;
- /// <summary>
- /// 閲嶆柊鎼滅储
+ /// <summary>
+ /// 閲嶆柊鎼滅储
/// </summary>
- public const int ReSearch = 1059;
- /// <summary>
- /// 杩炴帴WiFi
+ public const int ReSearch = 1059;
+ /// <summary>
+ /// 杩炴帴WiFi
/// </summary>
- public const int ConnectWiFi = 1060;
- /// <summary>
- /// 鐩墠鍙敮鎸�2.4G WiFi缃戠粶{0}鏆備笉鏀寔甯︽湁涓枃瀛楃鐨刉iFi鍚嶇О
+ public const int ConnectWiFi = 1060;
+ /// <summary>
+ /// 鐩墠鍙敮鎸�2.4G WiFi缃戠粶{0}鏆備笉鏀寔甯︽湁涓枃瀛楃鐨刉iFi鍚嶇О
/// </summary>
- public const int AddInfraredRemoteControlMsg4 = 1061;
- /// <summary>
- /// 瀵嗙爜
+ public const int AddInfraredRemoteControlMsg4 = 1061;
+ /// <summary>
+ /// 瀵嗙爜
/// </summary>
public const int Password = 1062;
- /// <summary>
- /// 姝ｅ湪杩炴帴涓�...
+ /// <summary>
+ /// 姝ｅ湪杩炴帴涓�...
/// </summary>
- public const int NowConnectting = 1063;
- /// <summary>
- /// 璇疯绾㈠閬ユ帶灏介噺鎺ヨ繎WIFI璺敱鍣�
+ public const int NowConnectting = 1063;
+ /// <summary>
+ /// 璇疯绾㈠閬ユ帶灏介噺鎺ヨ繎WIFI璺敱鍣�
/// </summary>
- public const int AddInfraredRemoteControlMsg5 = 1064;
- /// <summary>
- /// 缃戠粶閾炬帴涓�
+ public const int AddInfraredRemoteControlMsg5 = 1064;
+ /// <summary>
+ /// 缃戠粶閾炬帴涓�
/// </summary>
- public const int InTheNetworkLink = 1065;
- /// <summary>
- /// 涓婁紶鍒颁簯
+ public const int InTheNetworkLink = 1065;
+ /// <summary>
+ /// 涓婁紶鍒颁簯
/// </summary>
- public const int UploadToCloud = 1066;
- /// <summary>
- /// 杩炴帴鎴愬姛
+ public const int UploadToCloud = 1066;
+ /// <summary>
+ /// 杩炴帴鎴愬姛
/// </summary>
- public const int ConnectSuccess = 1067;
- /// <summary>
- /// 1銆佽妫�鏌ヨ澶囨槸鍚︽甯搁�氱數{0}2銆佽寮�鍚摑鐗欏姛鑳絳0}3銆佸苟闀挎寜鎸夐挳10s锛屾寚绀虹伅甯镐寒
+ public const int ConnectSuccess = 1067;
+ /// <summary>
+ /// 1銆佽妫�鏌ヨ澶囨槸鍚︽甯搁�氱數{0}2銆佽寮�鍚摑鐗欏姛鑳絳0}3銆佸苟闀挎寜鎸夐挳10s锛屾寚绀虹伅甯镐寒
/// </summary>
public const int AddInfraredRemoteControlMsg6 = 1068;
- /// <summary>
- /// 娣诲姞澶辫触
+ /// <summary>
+ /// 娣诲姞澶辫触
/// </summary>
- public const int AddFail = 1069;
- /// <summary>
- /// 娣诲姞鎴愬姛
+ public const int AddFail = 1069;
+ /// <summary>
+ /// 娣诲姞鎴愬姛
/// </summary>
- public const int AddSuccess = 1070;
- /// <summary>
- /// 鍙互寮�濮嬩娇鐢ㄧ孩澶栭仴鎺у姛鑳斤紒
+ public const int AddSuccess = 1070;
+ /// <summary>
+ /// 鍙互寮�濮嬩娇鐢ㄧ孩澶栭仴鎺у姛鑳斤紒
/// </summary>
public const int AddInfraredRemoteControlMsg7 = 1071;
- /// <summary>
- /// 寮�濮嬩娇鐢�
+ /// <summary>
+ /// 寮�濮嬩娇鐢�
/// </summary>
public const int StartUse = 1072;
- /// <summary>
- /// 璇锋墦寮�钃濈墮
+ /// <summary>
+ /// 璇锋墦寮�钃濈墮
/// </summary>
public const int PleaseTurnOnBluetooth = 1073;
- /// <summary>
- /// 浣嶇疆淇℃伅(GBS)涓嶅彲鐢�
+ /// <summary>
+ /// 浣嶇疆淇℃伅(GBS)涓嶅彲鐢�
/// </summary>
- public const int GbsIsNotAvailable = 1074;
- /// <summary>
- /// 缃戠粶涓嶅彲鐢�
+ public const int GbsIsNotAvailable = 1074;
+ /// <summary>
+ /// 缃戠粶涓嶅彲鐢�
/// </summary>
public const int NetworkIsNotAvailable = 1075;
- /// <summary>
- /// 閫夋嫨绾㈠閬ユ帶鍣�
+ /// <summary>
+ /// 閫夋嫨绾㈠閬ユ帶鍣�
/// </summary>
- public const int ChooseInfraredRemoteControl = 1076;
- /// <summary>
- /// 鏂伴
+ public const int ChooseInfraredRemoteControl = 1076;
+ /// <summary>
+ /// 鏂伴
/// </summary>
- public const int AirFresh = 1077;
- /// <summary>
- /// 褰撳墠婊ょ綉鍓╀綑
+ public const int AirFresh = 1077;
+ /// <summary>
+ /// 褰撳墠婊ょ綉鍓╀綑
/// </summary>
- public const int ResidualFilterScreen = 1078;
- /// <summary>
- /// 鑺傝兘
+ public const int ResidualFilterScreen = 1078;
+ /// <summary>
+ /// 鑺傝兘
/// </summary>
- public const int Energy = 1079;
- /// <summary>
- /// 閫氶
+ public const int Energy = 1079;
+ /// <summary>
+ /// 閫氶
/// </summary>
- public const int Ventilated = 1080;
- /// <summary>
- /// 1妗�
+ public const int Ventilated = 1080;
+ /// <summary>
+ /// 1妗�
/// </summary>
public const int OneGear = 1081;
- /// <summary>
- /// 2妗�
+ /// <summary>
+ /// 2妗�
/// </summary>
public const int TwoGear = 1082;
- /// <summary>
- /// 3妗�
+ /// <summary>
+ /// 3妗�
/// </summary>
- public const int ThreeGear = 1083;
- /// <summary>
- /// 椋庨��1妗�
+ public const int ThreeGear = 1083;
+ /// <summary>
+ /// 椋庨��1妗�
/// </summary>
public const int FanOneGear = 1084;
- /// <summary>
- /// 椋庨��2妗�
+ /// <summary>
+ /// 椋庨��2妗�
/// </summary>
public const int FanTwoGear = 1085;
- /// <summary>
- /// 椋庨��3妗�
+ /// <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.杩囨埛鍚庯紝鍘熸湁鐨勬垚鍛樺皢鑷姩瑙ｇ粦璇ヤ綇瀹厈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>
+ /// 姝ｅ湪杩囨埛缁欑敤鎴�,璇风◢鍚�...
+ /// </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;
@@ -931,10 +1395,20 @@
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;
@@ -1059,6 +1533,19 @@
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>
@@ -1317,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>
+ /// 鏄惁瑙ｉ櫎缁戝畾锛�
+ /// </summary>
+ public const int DoYouWantToUnbind = 9068;
+
+
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
/// <summary>
--
Gitblit v1.8.0