From ee5f2543624a0e3ae9d046062b822727a31685e1 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 14 五月 2021 17:15:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr4' into dev-tzy
---
HDL_ON/Common/R.cs | 351 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 350 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index a99bf97..e15cea9 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,42 @@
{
public static class StringId
{
+
+ 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;
@@ -738,9 +774,289 @@
/// <summary>
/// 閫夋嫨绾㈠閬ユ帶鍣�
/// </summary>
- public const int ChooseInfraredRemoteControl = 1076;
+ 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;
+
+ 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;
@@ -999,6 +1315,17 @@
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;
#region LE鏂板
/// <summary>
@@ -1257,6 +1584,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