From f703a411c0ebdf7ada490fda75b52fd839dae079 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 14:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-cqy(1.5.9)' into dev--wxr

---
 HDL_ON/Common/R.cs |  126 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 125 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index bd61d6c..73dc6b3 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,6 +5,110 @@
     public static class StringId
     {
         /// <summary>
+        /// 鍒犻櫎浜鸿劯鏁版嵁
+        /// </summary>
+        public const int DeleteMemberFace = 595;
+        /// <summary>
+        /// 璇疯緭鍏ユ垚鍛樺娉�
+        /// </summary>
+        public const int PlsEntrySubAccountRemark = 594;
+        /// <summary>
+        /// 浜鸿劯鐓х墖
+        /// </summary>
+        public const int MemberFace = 593;
+        /// <summary>
+        /// 鎴愬憳璐﹀彿
+        /// </summary>
+        public const int MemberAccount = 592;
+        /// <summary>
+        /// 鎴愬憳鍚嶇О
+        /// </summary>
+        public const int MemberName = 591;
+        /// <summary>
+        /// 浣忓畢浜や粯
+        /// </summary>
+        public const int ResidentialDelivery = 590;
+        /// <summary>
+        /// 涓嶅悓鎰�
+        /// </summary>
+        public const int Disagree = 589;
+        /// <summary>
+        /// 浜鸿劯淇℃伅閲囬泦鍗忚鎻愮ず
+        /// </summary>
+        public const int FaceProtocolPrompt = 588;
+        /// <summary>
+        /// 浜鸿劯绠$悊
+        /// </summary>
+        public const int FaceManagemant = 587;
+        /// <summary>
+        /// 鎺掑簭
+        /// </summary>
+        public const int Sort = 586;
+        /// <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>
+        public const int Cancellation = 579;
+        /// <summary>
+        /// 鏈烘鑷�
+        /// </summary>
+        public const int MechanicalArm = 578;
+        /// <summary>
+        /// 闃�闂ㄥ凡鎵撳紑
+        /// </summary>
+        public const int ValveOpened = 577;
+        /// <summary>
+        /// 闃�闂ㄥ凡鍏抽棴
+        /// </summary>
+        public const int ValveClosed = 576;
+        /// <summary>
+        /// 閫夋嫨妯″紡
+        /// </summary>
+        public const int SelectMode = 575;
+        /// <summary>
+        /// 鍒剁儹闄ゆ箍
+        /// </summary>
+        public const int HeatingAndDehumidification = 574;
+        /// <summary>
+        /// 鍦ㄥ
+        /// </summary>
+        public const int AtHome = 573;
+        /// <summary>
+        /// 绂诲
+        /// </summary>
+        public const int AwayHome = 572;
+        /// <summary>
+        /// 鐫$湢
+        /// </summary>
+        public const int Sleep = 571;
+        /// <summary>
+        /// 瀹ゅ:27掳/瀹ゅ唴:27掳
+        /// </summary>
+        public const int IndoorTempOutdoorTemp = 570;
+        /// <summary>
         /// 绉戞妧
         /// </summary>
         public const int Acst = 569;
@@ -2977,7 +3081,27 @@
         /// <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;
 
 
 

--
Gitblit v1.8.0