From fdbcb1f7463cb766f90bd29dd715485ba9d88524 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 06 九月 2023 17:55:03 +0800
Subject: [PATCH] Merge branch 'wxr-2.0' into Dev-Branch
---
HDL_ON/Common/R.cs | 436 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 436 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index d01a31a..65ddc23 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,6 +5,287 @@
public static class StringId
{
/// <summary>
+ /// 鎻愮ず锛氳捣濮嬮鑹查�夋嫨瓒婇潬杩戣壊鐜竟缂橈紝鐐僵鏁堟灉瓒婃槑鏄俱�傝秺闈犺繎鐧借壊涓績锛岀偒褰╂晥鏋滆秺涓嶆槑鏄俱��
+ /// </summary>
+ public const int ColorfulSetTip = 697;
+ /// <summary>
+ /// 杩囧幓涓�骞寸殑姣忔湀鏁版嵁
+ /// </summary>
+ public const int AirSwitchP3HistroyTip3 = 696;
+ /// <summary>
+ /// 杩囧幓涓�涓湀鐨勬瘡鏃ユ暟鎹�
+ /// </summary>
+ public const int AirSwitchP3HistroyTip2 = 695;
+ /// <summary>
+ /// 杩囧幓24灏忔椂鐨勬瘡灏忔椂鐢ㄧ數閲�
+ /// </summary>
+ public const int AirSwitchP3HistroyTip1 = 694;
+ /// <summary>
+ /// 鎬荤敤鐢甸噺锛圞W路h锛�
+ /// </summary>
+ public const int TotalPowerAndUnit = 693;
+ /// <summary>
+ /// 瀹炴椂鍔熺巼
+ /// </summary>
+ public const int ActivePower = 692;
+ /// <summary>
+ /// 鐢垫祦
+ /// </summary>
+ public const int Current = 691;
+ /// <summary>
+ /// 鐢靛帇
+ /// </summary>
+ public const int Voltage = 690;
+ /// <summary>
+ /// C鐩稿疄鏃剁敤鐢垫暟鎹�
+ /// </summary>
+ public const int RealTimeElectricityConsumptionDataOfPhaseC = 689;
+ /// <summary>
+ /// B鐩稿疄鏃剁敤鐢垫暟鎹�
+ /// </summary>
+ public const int RealTimeElectricityConsumptionDataOfPhaseB = 688;
+ /// <summary>
+ /// A鐩稿疄鏃剁敤鐢垫暟鎹�
+ /// </summary>
+ public const int RealTimeElectricityConsumptionDataOfPhaseA = 687;
+ /// <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>
+ public const int AutomaticTriggering = 669;
+ /// <summary>
+ /// 鎵嬪姩瑙﹀彂
+ /// </summary>
+ public const int ManualTriggering = 668;
+ /// <summary>
+ /// 浜鸿劯褰曞叆甯姪
+ /// </summary>
+ public const int FaceEntryHelp = 667;
+ /// <summary>
+ /// 瑙﹀彂鏂瑰紡
+ /// </summary>
+ public const int TriggerMode = 666;
+ /// <summary>
+ /// 665=寮�鍚悗,璁惧鍙互杩涜浜鸿劯璇嗗埆寮�閿�
+ /// </summary>
+ public const int FaceUnlockOpenTip = 665;
+ /// <summary>
+ /// 浜鸿劯寮�閿�
+ /// </summary>
+ public const int FaceUnlock = 664;
+ /// <summary>
+ /// 鐢垫睜绠＄悊
+ /// </summary>
+ public const int BatteryManagement = 663;
+ /// <summary>
+ /// 闊抽璁剧疆
+ /// </summary>
+ public const int AudioSetup = 662;
+ /// <summary>
+ /// 闂ㄩ攣甯冮槻妯″紡鎻愮ず
+ /// </summary>
+ public const int DoorlockDefenceModeTip = 661;
+ /// <summary>
+ /// 甯冮槻妯″紡
+ /// </summary>
+ public const int DefenceMode = 660;
+ /// <summary>
+ /// 鍙嶉攣妯″紡鎻愮ず
+ /// </summary>
+ public const int AntiLockModeTip = 659;
+ /// <summary>
+ /// 鍙嶉攣妯″紡
+ /// </summary>
+ public const int AntiLockMode = 658;
+ /// <summary>
+ /// 绔ラ攣妯″紡鎻愮ず
+ /// </summary>
+ public const int ChildLockModeTip = 657;
+ /// <summary>
+ /// 绔ラ攣妯″紡
+ /// </summary>
+ public const int ChildLockMode = 656;
+ /// <summary>
+ /// 鎸夐敭浜屾寮�閿佹彁绀�
+ /// </summary>
+ public const int PressTheButtonToUnlockTwiceTip = 655;
+ /// <summary>
+ /// 鎸夐敭浜屾寮�閿�
+ /// </summary>
+ public const int PressTheButtonToUnlockTwice = 654;
+ /// <summary>
+ /// 浜鸿劯寮�閿佽缃�
+ /// </summary>
+ public const int FaceUnlockSetting = 653;
+ /// <summary>
+ /// 寮�閿佽缃�
+ /// </summary>
+ public const int UnlockSetting = 652;
+ /// <summary>
+ /// 鍒犻櫎鎴愬姛
+ /// </summary>
+ public const int DeleteSuccess = 651;
+ /// <summary>
+ /// 鏄惁鍒犻櫎璇ョ敤鎴�
+ /// </summary>
+ public const int DeleteDoorlockUserTip = 650;
+ /// <summary>
+ /// 娲诲姩妫�娴�
+ /// </summary>
+ public const int ActivityDetection = 649;
+ /// <summary>
+ /// 鍒犻櫎鐢ㄦ埛
+ /// </summary>
+ public const int DeleteUser = 648;
+ /// <summary>
+ /// 浜鸿劯閽ュ寵
+ /// </summary>
+ public const int FaceKey = 647;
+ /// <summary>
+ /// 鍗�/NFC閽ュ寵
+ /// </summary>
+ public const int NfcKey = 646;
+ /// <summary>
+ /// 鏁板瓧瀵嗙爜
+ /// </summary>
+ public const int DigitalPassword = 645;
+ /// <summary>
+ /// 娓呯┖
+ /// </summary>
+ public const int Clear = 644;
+ /// <summary>
+ /// 寮�閿佹柟寮�
+ /// </summary>
+ public const int UnlockMethod = 643;
+ /// <summary>
+ /// 璺戦┈鐏�
+ /// </summary>
+ public const int HorseRaceLamp = 642;
+ /// <summary>
+ /// 鑷姩鐐僵
+ /// </summary>
+ public const int AutomaticColoring = 641;
+ /// <summary>
+ /// 褰撳墠闂ㄦ湭鍏�
+ /// </summary>
+ public const int DoorlockOpen = 640;
+ /// <summary>
+ /// 褰撳墠闂ㄥ凡鍏�
+ /// </summary>
+ public const int DoorlockClose = 639;
+ /// <summary>
+ /// 鐢ㄦ埛绠＄悊
+ /// </summary>
+ public const int UserManagement = 638;
+ /// <summary>
+ /// 鍒犻櫎缁勬帶
+ /// </summary>
+ public const int DelGroupControl = 637;
+ /// <summary>
+ /// 鑹插�煎彿涓�6浣嶏紙鐢辩函鏁板瓧/鏁板瓧+瀛楁瘝缁勫悎锛�
+ /// </summary>
+ public const int CurHexTip = 636;
+ /// <summary>
+ /// 褰撳墠棰滆壊
+ /// </summary>
+ public const int CurColor = 635;
+ /// <summary>
+ /// 鎺ㄨ崘
+ /// </summary>
+ public const int Recommen = 634;
+ /// <summary>
+ /// 宸ヤ綔鏃堕暱
+ /// </summary>
+ public const int WorkingHours = 633;
+ /// <summary>
+ /// 缁撴潫棰滆壊
+ /// </summary>
+ public const int EndColor = 632;
+ /// <summary>
+ /// 璧峰棰滆壊
+ /// </summary>
+ public const int StartColor = 631;
+ /// <summary>
+ /// 鐐僵鍔熻兘
+ /// </summary>
+ public const int ColorfulFunction = 630;
+ /// <summary>
+ /// 浣忓畢瑙ｇ粦鎴愬姛
+ /// </summary>
+ public const int SuccessfullyUnboundTheResidence = 629;
+ /// <summary>
+ /// 涓存椂瀵嗙爜鏈夋晥鏈熶笉鑳藉ぇ浜�24灏忔椂
+ /// </summary>
+ public const int TempPwdValidityTip = 628;
+ /// <summary>
/// 璁剧疆鐨勬椂闂撮渶瑕佹櫄浜庡綋鍓嶆椂闂�
/// </summary>
public const int TempPwdSettingTip = 627;
@@ -3230,6 +3511,40 @@
/// PM210
/// </summary>
public const int pm10 = 7168;
+ /// <summary>
+ /// 鎸佺画鏃堕棿
+ /// </summary>
+ public const int chixushijian = 7169;
+ /// <summary>
+ /// 浜轰綋瀛樺湪妫�娴�
+ /// </summary>
+ public const int rentijiance = 7170;
+ /// <summary>
+ /// 鎸佺画
+ /// </summary>
+ public const int chixu = 7171;
+ /// <summary>
+ /// RGB鑹茬洏
+ /// </summary>
+ public const int rgbsepan = 7172;
+ /// <summary>
+ /// 鐓ф槑搴�
+ /// </summary>
+ public const int zhaomingdu = 7173;
+ /// <summary>
+ /// 鐓ф槑搴﹂珮浜�
+ /// </summary>
+ public const int zhaomingdugaoyu = 7174;
+ /// <summary>
+ /// 鐓ф槑搴︿綆浜�
+ /// </summary>
+ public const int zhaomingdudiyu = 7175;
+ /// <summary>
+ /// 鍏夌収
+ /// </summary>
+ public const int guangzhao = 7176;
+
+
/// <summary>
/// 瑙嗛闂ㄩ攣
@@ -3285,9 +3600,130 @@
public const int xinghao = 8513;
+ /// <summary>
+ /// 瀹跺涵褰遍櫌
+ /// </summary>
+ public const int jiatingyingyuan = 8701;
+ /// <summary>
+ /// 鎾斁鍣�
+ /// </summary>
+ public const int bofangqi = 8702;
+ /// <summary>
+ /// 鍔熸斁
+ /// </summary>
+ public const int gongfan = 8703;
+ /// <summary>
+ /// 铏氭嫙閬ユ帶鍣�
+ /// </summary>
+ public const int xuniyaokongqi = 8704;
+ /// <summary>
+ /// 褰卞簱
+ /// </summary>
+ public const int yingku = 8705;
+ /// <summary>
+ /// 鏃跺簭鍣�
+ /// </summary>
+ public const int shixuqi = 8706;
+ /// <summary>
+ /// 寮�
+ /// </summary>
+ public const int kai = 8707;
+ /// <summary>
+ /// 鍏�
+ /// </summary>
+ public const int guan = 8708;
+ /// <summary>
+ /// 澹伴亾
+ /// </summary>
+ public const int shengdao = 8709;
+ /// <summary>
+ /// 涓婁竴閮�
+ /// </summary>
+ public const int shangyibu= 8710;
+
+ /// <summary>
+ /// 杩涘嚭浠�
+ /// </summary>
+ public const int jinchucang = 8711;
+ /// <summary>
+ /// 瀛楀箷
+ /// </summary>
+ public const int zimu = 8712;
+ /// <summary>
+ /// 宸叉敹钘�
+ /// </summary>
+ public const int yishoucang= 8713;
+ /// <summary>
+ /// 鏈敹钘�
+ /// </summary>
+ public const int weishoucang = 8714;
+ /// <summary>
+ /// 缁煎悎
+ /// </summary>
+ public const int zonghe = 8715;
+ /// <summary>
+ /// 褰辩墖浠嬬粛
+ /// </summary>
+ public const int yingpianjieshao = 8716;
+ /// <summary>
+ /// 璇勫垎
+ /// </summary>
+ public const int pingfen = 8717;
+ /// <summary>
+ /// 绔嬪嵆鎾斁
+ /// </summary>
+ public const int lijibofang = 8718;
+ /// <summary>
+ /// 涓嬩竴閮�
+ /// </summary>
+ public const int xiayibu1 = 8719;
+ /// <summary>
+ /// 棰戦亾
+ /// </summary>
+ public const int pindao = 8720;
+ /// <summary>
+ /// 鎺у埗
+ /// </summary>
+ public const int kongzhi = 8721;
+ /// <summary>
+ /// 棣栭〉
+ /// </summary>
+ public const int shouye = 8801;
+ /// <summary>
+ /// 鍏虫満
+ /// </summary>
+ public const int guanji = 8802;
+ /// <summary>
+ /// 闊抽噺
+ /// </summary>
+ public const int yinliang = 8803;
+ /// <summary>
+ /// 璁剧疆
+ /// </summary>
+ public const int shezhi = 8804;
+ /// <summary>
+ /// 瑙ｉ櫎闈欓煶
+ /// </summary>
+ public const int jiechujingyin = 8805;
+ /// <summary>
+ /// 淇″彿婧�
+ /// </summary>
+ public const int xinhaoyuan = 8806;
+ /// <summary>
+ /// 宸插叧鏈�
+ /// </summary>
+ public const int yiguanji = 8807;
+ /// <summary>
+ /// 寮�鏈�
+ /// </summary>
+ public const int kaiji = 8808;
+ /// <summary>
+ /// 瑙ｇ粦璁惧
+ /// </summary>
+ public const int jiebangshebei = 8809;
--
Gitblit v1.8.0