From 34cac3d14e5243c2388b54da02f5aebeec555da8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:39:49 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr6
---
HDL_ON/Common/R.cs | 201 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 195 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 0b4a240..2d8e7ce 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,109 @@
{
public static class StringId
{
- //public const int EnergyMonitoring = 439;
+
+ /// <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;
@@ -739,7 +841,47 @@
/// <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;
public const int keshiduijiang = 4000;
@@ -755,6 +897,8 @@
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;
@@ -885,10 +1029,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;
@@ -1013,6 +1167,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>
@@ -1271,6 +1438,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