From 48c07e0a371f67b97abc7c2e61d7f23d060324fc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 28 一月 2021 18:24:53 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into NewFilePath
---
HDL_ON/Common/R.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 089b9da..26caecc 100755
--- 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;
@@ -701,8 +705,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