From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:38 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc
---
HDL_ON/Common/R.cs | 92 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 85 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 8432f28..cbda2d5 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,13 +4,54 @@
{
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>
@@ -3632,6 +3673,43 @@
+ /// <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