From df3906c03db154e8622b7caeaa3bf93b67c6d40a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 10:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into CJL-Linphone
---
HDL_ON/Common/R.cs | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 3924bf6..a09cbb6 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,28 @@
{
public static class StringId
{
+
+ /// <summary>
+ /// 璇疯緭鍏ラ厤瀵圭爜
+ /// </summary>
+ public const int PlsEntryPairCode = 513;
+ /// <summary>
+ /// 瀹夊崜娑堟伅鎺ㄩ�佹彁绀�
+ /// </summary>
+ public const int Android_MessagePushTip = 512;
+ //public const int SaveAs
+ /// <summary>
+ /// 缁勫悎璋冨厜
+ /// </summary>
+ public const int CombinedDimming = 511;
+ /// <summary>
+ ///
+ /// </summary>
+ public const int PleaseSelectTheDeploymentTarget = 510;
+ /// <summary>
+ /// 璇疯緭鍏ュ畨闃插悕绉�
+ /// </summary>
+ public const int PleaseEnterSecurityName = 509;
/// <summary>
/// 鐢查啗
/// </summary>
@@ -2403,15 +2425,15 @@
/// </summary>
public const int pmyou = 7103;
/// <summary>
- /// 鑹�:35~75ug/m鲁
+ /// 鑹�:36~75ug/m鲁
/// </summary>
public const int pmliang = 7104;
/// <summary>
- /// 杞诲害姹℃煋:75~115ug/m鲁
+ /// 杞诲害姹℃煋:76~115ug/m鲁
/// </summary>
public const int pmqingdu= 7105;
/// <summary>
- /// 涓害姹℃煋:115~150ug/m鲁
+ /// 涓害姹℃煋:116~150ug/m鲁
/// </summary>
public const int pmzhongdu = 7106;
/// <summary>
@@ -2590,6 +2612,10 @@
/// smart锛氭櫤鑳�
/// </summary>
public const int zhineng = 7150;
+ /// <summary>
+ /// 鑹ソ
+ /// </summary>
+ public const int lianghao = 7151;
@@ -2870,7 +2896,10 @@
/// 鏄惁瑙ｉ櫎缁戝畾锛�
/// </summary>
public const int DoYouWantToUnbind = 9068;
-
+ /// <summary>
+ /// 鐗╀笟閫氱煡
+ /// </summary>
+ public const int Propertynotice = 9069;
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
--
Gitblit v1.8.0