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 | 246 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 245 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index ab3559c..5c81eaf 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,50 @@
{
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;
+ 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;
@@ -622,9 +666,172 @@
/// <summary>
/// 鏄惁閲嶇疆婊ょ綉
/// </summary>
- public const int ResetFilterScreenMsg = 1049;
+ 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>
+ /// 姝ｅ湪杩炴帴涓�...
+ /// </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;
+ 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;
@@ -751,6 +958,10 @@
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;
@@ -879,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>
@@ -1137,6 +1359,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