From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 12 五月 2021 15:13:56 +0800 Subject: [PATCH] Merge branch 'CJL' into wxr4 --- HDL_ON/Common/R.cs | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 50 insertions(+), 1 deletions(-) diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs index 5c4ed77..5c81eaf 100644 --- a/HDL_ON/Common/R.cs +++ b/HDL_ON/Common/R.cs @@ -4,6 +4,41 @@ { 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; @@ -1055,6 +1090,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> @@ -1329,7 +1375,10 @@ /// 澶囨敞涓嶈兘涓虹┖ /// </summary> public const int RemarksCannotBeBlank = 9067; - + /// <summary> + /// 鏄惁瑙i櫎缁戝畾锛� + /// </summary> + public const int DoYouWantToUnbind = 9068; -- Gitblit v1.8.0