From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/Common/R.cs | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 232 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index c87aa05..90a0a72 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,11 @@
{
public static class StringId
{
+ public const int Add = 412;
+ public const int TipAddThirdPartyDeviceMsg = 411;
+ public const int TipNotThirdPartyDevice = 410;
+ public const int FunctionBrand = 409;
+ public const int ConfirmAdd = 408;
public const int Reading = 407;
public const int MeetingGuests = 406;
public const int Cozy = 405;
@@ -12,6 +17,8 @@
public const int Retry = 402;
public const int QRCodeIsInvalid = 401;
public const int WellComBackHome = 400;
+ public const int DoReloadAgain = 381;
+ public const int FunctionNotOpen = 380;
public const int FadeSpeed = 379;
public const int FadeTime = 378;
public const int WholeZone = 377;
@@ -398,7 +405,206 @@
public const int LoginByEmail = 4;
-
+ /// <summary>
+ /// 瀹ゅ唴婀垮害
+ /// </summary>
+ public const int IndoorHumidity = 1000;
+ /// <summary>
+ /// 绔ラ攣
+ /// </summary>
+ public const int V_chip = 1001;
+ /// <summary>
+ /// 璐熺瀛�
+ /// </summary>
+ public const int Anion = 1002;
+ /// <summary>
+ /// 鏉�鑿�
+ /// </summary>
+ public const int Sterilization = 1003;
+ /// <summary>
+ /// 鍔犳箍
+ /// </summary>
+ public const int Humidification = 1004;
+ /// <summary>
+ /// 婊よ姱澶嶄綅
+ /// </summary>
+ public const int FilterElementReset = 1005;
+ /// <summary>
+ /// 鐏厜
+ /// </summary>
+ public const int Lighting = 1006;
+ /// <summary>
+ /// 鑷姩妯″紡
+ /// </summary>
+ public const int AutoMode = 1007;
+ /// <summary>
+ /// 鎵嬪姩妯″紡
+ /// </summary>
+ public const int HandMode = 1008;
+ /// <summary>
+ /// 寮哄姴妯″紡
+ /// </summary>
+ public const int StrongMode = 1009;
+ /// <summary>
+ /// 鐫＄湢妯″紡
+ /// </summary>
+ public const int SleepMode = 1010;
+ /// <summary>
+ /// 瀹氭椂
+ /// </summary>
+ public const int Timing = 1011;
+ /// <summary>
+ /// 閫夋嫨椋庨��
+ /// </summary>
+ public const int WindSpeedSelection = 1012;
+ /// <summary>
+ /// 妗�
+ /// </summary>
+ public const int Gear = 1013;
+ /// <summary>
+ /// 璇风‘璁ゆ槸鍚﹀凡瀹為檯閲嶇疆婊よ姱骞舵寜{0}鐓ц鏄庝功瑕佹眰鎿嶄綔璁惧杩涜婊よ姱{0}瀵垮懡閲嶆柊璁℃椂
+ /// </summary>
+ public const int FilterElementResetMsg = 1014;
+ /// <summary>
+ /// 浣庢。
+ /// </summary>
+ public const int LowGear = 1015;
+ /// <summary>
+ /// 涓。
+ /// </summary>
+ public const int MidGear = 1016;
+ /// <summary>
+ /// 楂樻。
+ /// </summary>
+ public const int HeightGear = 1017;
+ /// <summary>
+ /// 瀹氭椂璁剧疆
+ /// </summary>
+ public const int TimingSetting = 1018;
+ /// <summary>
+ /// 灏忔椂
+ /// </summary>
+ public const int Hour1 = 1019;
+ /// <summary>
+ /// 婊よ姱浣跨敤锛�
+ /// </summary>
+ public const int UseOfFilterElement = 1020;
+ /// <summary>
+ /// 绌烘皵鍑�鍖栧櫒
+ /// </summary>
+ public const int AirCleaner = 1021;
+ /// <summary>
+ /// 褰撳墠椋庨��
+ /// </summary>
+ public const int CurrentWindSpeed = 1022;
+ /// <summary>
+ /// 鍙栨秷瀹氭椂
+ /// </summary>
+ public const int CancelTiming = 1023;
+ /// <summary>
+ /// 鎵湴鏈哄櫒浜�
+ /// </summary>
+ public const int WeepRobot = 1024;
+ /// <summary>
+ /// 鍚稿姏璋冭妭
+ /// </summary>
+ public const int SuctionAdjustment = 1025;
+ /// <summary>
+ /// 鍚稿姏1妗�
+ /// </summary>
+ public const int SuctionOneGear = 1026;
+ /// <summary>
+ /// 鍚稿姏2妗�
+ /// </summary>
+ public const int SuctionTwoGear = 1027;
+ /// <summary>
+ /// 鍚稿姏3妗�
+ /// </summary>
+ public const int SuctionThreeGear = 1028;
+ /// <summary>
+ /// 鍏呯數
+ /// </summary>
+ public const int Charge = 1029;
+ /// <summary>
+ /// 澹伴煶
+ /// </summary>
+ public const int Voice = 1030;
+ /// <summary>
+ /// 闈欓煶
+ /// </summary>
+ public const int Mute = 1031;
+ /// <summary>
+ /// 娓呮壂妯″紡
+ /// </summary>
+ public const int CleanMode = 1032;
+ /// <summary>
+ /// 鑰楁潗绠＄悊
+ /// </summary>
+ public const int ConsumablesManagement = 1033;
+ /// <summary>
+ /// 鍘嗗彶璁板綍
+ /// </summary>
+ public const int HistoryLog = 1034;
+ /// <summary>
+ /// 鑷姩娓呮壂
+ /// </summary>
+ public const int AutoClean = 1035;
+ /// <summary>
+ /// 瀹氱偣娓呮壂
+ /// </summary>
+ public const int FixedPointClean = 1036;
+ /// <summary>
+ /// 娌垮娓呮壂
+ /// </summary>
+ public const int WallClean = 1037;
+ /// <summary>
+ /// 鍖哄煙娓呮壂
+ /// </summary>
+ public const int AreaClean = 1038;
+ /// <summary>
+ /// 鎬绘竻娲侀潰绉�
+ /// </summary>
+ public const int TotalCleanArea = 1039;
+ /// <summary>
+ /// 鎬绘竻娲佹椂闂�
+ /// </summary>
+ public const int TotalCleaningTime = 1040;
+ /// <summary>
+ /// 杈瑰埛鍓╀綑瀵垮懡
+ /// </summary>
+ public const int RemainingLifeOfSideBrush = 1041;
+ /// <summary>
+ /// 婊氬埛鍓╀綑瀵垮懡
+ /// </summary>
+ public const int RemainingLifeOfRollerBrush = 1042;
+ /// <summary>
+ /// 婊ょ綉鍓╀綑瀵垮懡
+ /// </summary>
+ public const int RemainingLifeOfFilterScreen = 1043;
+ /// <summary>
+ /// 閲嶇疆杈瑰埛
+ /// </summary>
+ public const int ResetSideBrush = 1044;
+ /// <summary>
+ /// 閲嶇疆婊氬埛
+ /// </summary>
+ public const int ResetRollerBrush = 1045;
+ /// <summary>
+ /// 閲嶇疆婊ょ綉
+ /// </summary>
+ public const int ResetFilterScreen = 1046;
+ /// <summary>
+ /// 鏄惁閲嶇疆杈瑰埛
+ /// </summary>
+ public const int ResetSideBrushMsg = 1047;
+ /// <summary>
+ /// 鏄惁閲嶇疆婊氬埛
+ /// </summary>
+ public const int ResetRollerBrushMsg = 1048;
+ /// <summary>
+ /// 鏄惁閲嶇疆婊ょ綉
+ /// </summary>
+ public const int ResetFilterScreenMsg = 1049;
@@ -550,9 +756,31 @@
public const int shidudiyu = 7095;
public const int pmgaoyu = 7096;
public const int pmdiyu = 7097;
-
-
-
+ public const int clearday =7098;
+ public const int cloudy= 7099;
+ public const int rain = 7100;
+ public const int setvalue = 7101;
+ public const int nullvalue = 7102;
+ public const int pmyou = 7103;
+ public const int pmliang = 7104;
+ public const int pmqingdu= 7105;
+ public const int pmzhongdu = 7106;
+ public const int pmzhongduwuran= 7107;
+ public const int xieluoandwuxieluo=7108;
+ public const int xieluo = 7109;
+ public const int wuxieluo = 7110;
+ public const int luoshuiandwuluoshui = 7111;
+ public const int luoshui = 7112;
+ public const int wuluoshui = 7113;
+ public const int yourenandwuren = 7114;
+ public const int youren = 7115;
+ public const int wuren = 7116;
+ public const int kaiqiandbihe = 7117;
+ public const int kaiqi = 7118;
+ public const int bihe = 7119;
+ public const int fangchaigongneng = 7120;
+ public const int zaixian = 7121;
+ public const int buzaixian = 7122;
#region LE鏂板
/// <summary>
--
Gitblit v1.8.0