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 | 84 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
old mode 100755
new mode 100644
index 089b9da..90a0a72
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,10 @@
{
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;
@@ -506,7 +510,7 @@
/// </summary>
public const int SuctionAdjustment = 1025;
/// <summary>
- ///鍚稿姏1妗�
+ /// 鍚稿姏1妗�
/// </summary>
public const int SuctionOneGear = 1026;
/// <summary>
@@ -541,6 +545,67 @@
/// 鍘嗗彶璁板綍
/// </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;
+
public const int a31Music = 5000;
@@ -701,8 +766,21 @@
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