From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/Common/R.cs | 80 ++++++++++++++++++++++++++++++++++++---
1 files changed, 73 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index ca5fa2d..8353782 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -1,9 +1,63 @@
using System;
+using com.hdl.on;
namespace HDL_ON
{
public static class StringId
{
+
+ /// <summary>
+ /// 绂荤嚎鎺у埗
+ /// </summary>
+ public const int OfflineControl = 710;
+ /// <summary>
+ /// 鍘荤櫥褰�
+ /// </summary>
+ public const int GoLogin = 709;
+ /// <summary>
+ /// 鎮ㄥ綋鍓嶇殑鐧诲綍鐘舵�佸凡缁忓け鏁堬紝璇烽噸鏂扮櫥褰�
+ /// </summary>
+ public const int TokenInvalidTipMsg = 708;
+ /// <summary>
+ /// 绂荤嚎鎺у埗涓紝濡傞渶鍒囨崲鑷宠繙绋嬫帶鍒讹紝鐐规鐧诲綍
+ /// </summary>
+ public const int TokenInvalidMsg = 707;
+ /// <summary>
+ /// 鏂拌兘婧�
+ /// </summary>
+ public const int NewEnergy = 706;
+ /// <summary>
+ /// 璇烽�夋嫨鏈嶅姟鍣�
+ /// </summary>
+ public const int PlsSelectServer = 705;
+ /// <summary>
+ /// 闈炰腑鍥芥湇鍔″櫒鎻愮ず
+ /// </summary>
+ public const int NonChineseServerPrompt = 704;
+ /// <summary>
+ /// 涓浗鏈嶅姟鍣ㄦ彁绀�
+ /// </summary>
+ public const int ChineseServerPrompt = 703;
+ /// <summary>
+ /// 杩炴帴鏂瑰紡鏇存敼鎻愮ず
+ /// </summary>
+ public const int ConnectionModeChangeTip = 702;
+ /// <summary>
+ /// 杩炴帴鏂瑰紡
+ /// </summary>
+ public const int ConnectionMode = 701;
+ /// <summary>
+ /// 娣诲姞鎵ц鍔ㄤ綔
+ /// </summary>
+ public const int AddExecutionAction = 700;
+ /// <summary>
+ /// 閫夋嫨鑷姩鍖�
+ /// </summary>
+ public const int SelectAutomation = 699;
+ /// <summary>
+ /// 鏂紑锛堝共鎺ョ偣锛�
+ /// </summary>
+ public const int DryBreak = 698;
/// <summary>
/// 鎻愮ず锛氳捣濮嬮鑹查�夋嫨瓒婇潬杩戣壊鐜竟缂橈紝鐐僵鏁堟灉瓒婃槑鏄俱�傝秺闈犺繎鐧借壊涓績锛岀偒褰╂晥鏋滆秺涓嶆槑鏄俱��
/// </summary>
@@ -304,7 +358,7 @@
/// <summary>
/// 缁忕含搴�
/// </summary>
- public const int LatAndLon= 623;
+ public const int LatAndLon = 623;
/// <summary>
/// 楠屾敹
/// </summary>
@@ -3543,7 +3597,19 @@
/// 鍏夌収
/// </summary>
public const int guangzhao = 7176;
-
+ /// <summary>
+ /// 鎵ц妯″紡
+ /// </summary>
+ public const int zhixingmoshi = 7177;
+ /// <summary>
+ /// 鏀瑰彉鎵嶆墽琛�
+ /// </summary>
+ public const int gaibiancaizhixing = 7178;
+ /// <summary>
+ /// 鏀跺埌灏辨墽琛�
+ /// </summary>
+ public const int shoudaojiuzhixing = 7179;
+
/// <summary>
@@ -3639,8 +3705,8 @@
/// <summary>
/// 涓婁竴閮�
/// </summary>
- public const int shangyibu= 8710;
-
+ public const int shangyibu = 8710;
+
/// <summary>
/// 杩涘嚭浠�
/// </summary>
@@ -3652,7 +3718,7 @@
/// <summary>
/// 宸叉敹钘�
/// </summary>
- public const int yishoucang= 8713;
+ public const int yishoucang = 8713;
/// <summary>
/// 鏈敹钘�
/// </summary>
@@ -3699,7 +3765,7 @@
/// <summary>
/// 闊抽噺
/// </summary>
- public const int yinliang = 8803;
+ public const int yinliang = 8803;
/// <summary>
/// 璁剧疆
/// </summary>
@@ -3807,7 +3873,7 @@
/// <summary>
/// 璇烽�夋嫨鍥藉/鍖哄煙
/// </summary>
- public const int PleaseSelectCountryOrRegion = 9018;
+ //public const int PleaseSelectCountryOrRegion = 9018;
/// <summary>
/// 绔嬪嵆鏇存柊
/// </summary>
--
Gitblit v1.8.0