From adf7df175e590b7d9e0f33c0c2ea1d2897da6301 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 29 三月 2023 14:33:12 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' into wjc
---
HDL_ON/Common/R.cs | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 100 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 954370b..68e1690 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,31 @@
{
public static class StringId
{
+
+ /// <summary>
+ /// 鑾峰彇绗笁鏂瑰钩鍙颁俊鎭け璐�
+ /// </summary>
+ public const int Get3tyIotInfoFailed = 585;
+ /// <summary>
+ /// 甯冮槻鐘舵��
+ /// </summary>
+ public const int DeploymentStatus = 584;
+ /// <summary>
+ /// 钀ょ煶鎽勫儚澶�
+ /// </summary>
+ public const int EZVIZ = 583;
+ /// <summary>
+ /// 纭畾鍒犻櫎璇ヨ澶囧悧?
+ /// </summary>
+ public const int AreYouSureToDeleteThisDevice = 582;
+ /// <summary>
+ ///
+ /// </summary>
+ public const int EmptyString = 581;
+ /// <summary>
+ /// 鏄惁纭畾鍒犻櫎缁勫悎璋冨厜
+ /// </summary>
+ public const int DoYouWantDelCombinedDimming = 580;
/// <summary>
/// 娉ㄩ攢
/// </summary>
@@ -1977,11 +2002,11 @@
/// <summary>
/// 寰簭寰幆
/// </summary>
- public const int orderMode =5048;
+ public const int orderMode = 5048;
/// <summary>
/// 鍗曟洸鎾斁
/// </summary>
- public const int single =5049;
+ public const int single = 5049;
@@ -3017,7 +3042,79 @@
/// <summary>
/// 瑙嗛閫氳瘽鍛煎彨
/// </summary>
- public const int shipintonghuahujiao = 7163;
+ public const int shipintonghuahujiao = 7163;
+ /// <summary>
+ /// 鏈烘鎵�
+ /// </summary>
+ public const int jixieshou = 7164;
+ /// <summary>
+ /// 鍖哄煙鍏ヤ镜鍛婅
+ /// </summary>
+ public const int quyuruqingaojing = 7165;
+ /// <summary>
+ /// 鎽勫儚澶�
+ /// </summary>
+ public const int shexiangtou = 7166;
+ /// <summary>
+ /// 鎬绘帶寮�鍏�
+ /// </summary>
+ public const int zongkogkaiguan = 7167;
+ /// <summary>
+ /// PM210
+ /// </summary>
+ public const int pm10 = 7168;
+
+ /// <summary>
+ /// 瑙嗛闂ㄩ攣
+ /// </summary>
+ public const int shipinmensuo = 8501;
+ /// <summary>
+ /// 鐢甸噺
+ /// </summary>
+ public const int dianliang = 8502;
+ /// <summary>
+ /// 褰撳墠闂ㄥ凡鍏�
+ /// </summary>
+ public const int dangqianmenyiguan = 8503;
+ /// <summary>
+ /// 褰撳墠闂ㄦ湭鍏�
+ /// </summary>
+ public const int dangqianmenweiguan = 8504;
+ /// <summary>
+ /// 瀹炴椂瑙嗛
+ /// </summary>
+ public const int shishishipin = 8505;
+ /// <summary>
+ /// 涓�閿紑閿�
+ /// </summary>
+ public const int yijiankaisuo = 8506;
+ /// <summary>
+ /// 涓存椂瀵嗙爜
+ /// </summary>
+ public const int linshimima1 = 8507;
+ /// <summary>
+ /// 鍘嗗彶璁板綍
+ /// </summary>
+ public const int lishijilu = 8508;
+ /// <summary>
+ /// 钀ょ煶瑙嗛闂ㄩ攣
+ /// </summary>
+ public const int yingshishipinmensuo = 8509;
+ /// <summary>
+ /// 鏉ヨ嚜鈥滈棬閾冣�濆懠鍙�
+ /// </summary>
+ public const int laizimenlinghujiao = 8510;
+ /// <summary>
+ /// 鐢ㄦ埛浜哄憳
+ /// </summary>
+ public const int yonghurenyuan = 8511;
+
+
+
+
+
+
+
--
Gitblit v1.8.0