From aa8a3dcb1cb921c9f721aac4c9c87c696ce8a354 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 三月 2021 09:19:10 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into temp-wxr
---
HDL_ON/Common/R.cs | 72 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 91bb3b0..498dfec 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,15 @@
{
public static class StringId
{
+ 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;
@@ -730,7 +739,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;
@@ -843,6 +892,27 @@
public const int dianqi = 6058;
public const int tianjiashibai = 6059;
public const int chongshii = 6060;
+ public const int pipeiyaokongqi = 6061;
+ public const int dianjianniu = 6062;
+ public const int shifouyouxiangying = 6063;
+ public const int kongzhishibai = 6064;
+ public const int kongzhichenggong = 6065;
+ public const int kaiguankai = 6066;
+ public const int moshizhileng = 6067;
+ public const int fengsuzhongfeng = 6068;
+ public const int wendu26 = 6069;
+ public const int shanchushebei = 6070;
+ public const int xiugaimingzi = 6071;
+ public const int querenshanchu = 6072;
+ public const int quxiao = 6073;
+ 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;
+
--
Gitblit v1.8.0