From 88b9c9dbae4f0f28529cd3b3ffe53cd26f19f738 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 30 七月 2023 21:55:50 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' into Dev-Branch
---
HDL_ON/Common/R.cs | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index b8e65b0..5bad366 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,6 +5,79 @@
public static class StringId
{
+
+
+
+
+ /// <summary>
+ /// 鎬昏
+ /// </summary>
+ public const int Total = 686;
+ /// <summary>
+ /// 娉細鐢ㄦ埛绠＄悊浠呭彲瀵瑰凡娣诲姞鐢ㄦ埛杩涜绠＄悊銆傚闇�娣诲姞鏂扮敤鎴凤紝璇峰墠寰�閿佺杩涜鐩稿叧鎿嶄綔銆�
+ /// </summary>
+ public const int VideoDoorlockManagerTip = 685;
+ /// <summary>
+ /// 闀垮害瓒呭嚭鑼冨洿
+ /// </summary>
+ public const int LengthOutOfRange = 684;
+ /// <summary>
+ /// 璇ユ椂闂存棤鏁�
+ /// </summary>
+ public const int TimeInvalid = 683;
+ //public const int
+ /// <summary>
+ /// 缇ょ粍锛堣窇椹伅鍒嗙粍锛�
+ /// </summary>
+ public const int HorseRaceLampGroup = 682;
+ /// <summary>
+ /// 鑷姩鐐僵娴嬭瘯
+ /// </summary>
+ public const int CulorfulTest = 681;
+ /// <summary>
+ /// 鐐僵寮�鍏�
+ /// </summary>
+ public const int ColorfulSwitch = 680;
+ /// <summary>
+ /// 缁勬帶
+ /// </summary>
+ public const int GroupControl = 679;
+ /// <summary>
+ /// 褰撳墠鐢ㄦ埛鏁版嵁鏄竻绌猴紝鍗冲皢杩斿洖涓婁竴椤点��
+ /// </summary>
+ public const int VideoDoorlockDelDataTip = 678;
+ /// <summary>
+ /// 楂�
+ /// </summary>
+ public const int High = 677;
+ /// <summary>
+ /// 涓�
+ /// </summary>
+ public const int Moderate = 676;
+ /// <summary>
+ /// 浣�
+ /// </summary>
+ public const int Low = 675;
+ /// <summary>
+ /// 闂ㄩ搩闊抽噺
+ /// </summary>
+ public const int DoorbellVolume = 674;
+ /// <summary>
+ /// 闂ㄩ攣绯荤粺闊抽噺
+ /// </summary>
+ public const int DoorlockSystemVolume = 673;
+ /// <summary>
+ /// 闇�瑕佽Е鎽搁棬閿佹暟瀛楁寜閿紝鍞ら啋闂ㄩ攣鍚庤瘑鍒汉鑴稿苟寮�閿�
+ /// </summary>
+ public const int FaceManualUnlockTip = 672;
+ /// <summary>
+ /// 娉細璇嗗埆浜鸿劯鐨勮窛绂伙紝浼氬彈瑙﹀彂鐏垫晱搴﹀奖鍝嶏紝鐏垫晱搴﹁秺楂橈紝璇嗗埆璺濈瓒婅繙銆�
+ /// </summary>
+ public const int FaceUnlockNote = 671;
+ /// <summary>
+ /// 杩涘叆妫�娴嬭寖鍥村悗锛岄棬閿佸皢鑷姩璇嗗埆浜鸿劯骞跺紑閿�
+ /// </summary>
+ public const int FaceUnlockTip = 670;
/// <summary>
/// 鑷姩瑙﹀彂
/// </summary>
@@ -22,9 +95,9 @@
/// </summary>
public const int TriggerMode = 666;
/// <summary>
- /// 浜鸿劯寮�濮嬭В鏋�
+ /// 665=寮�鍚悗,璁惧鍙互杩涜浜鸿劯璇嗗埆寮�閿�
/// </summary>
- public const int FaceUnlockTip = 665;
+ public const int FaceUnlockOpenTip = 665;
/// <summary>
/// 浜鸿劯寮�閿�
/// </summary>
@@ -3411,6 +3484,12 @@
/// 鎸佺画
/// </summary>
public const int chixu = 7171;
+ /// <summary>
+ /// RGB鑹茬洏
+ /// </summary>
+ public const int rgbsepan = 7172;
+
+
/// <summary>
--
Gitblit v1.8.0