From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码,合并嘉乐更新

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

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index e1defaf..33ad7fa 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -476,6 +476,114 @@
         /// 鍐嶆杈撳叆鏂板瘑鐮�
         /// </summary>
         public const int NewPasswordAgain = 9011;
+        /// <summary>
+        /// 鍚屾剰
+        /// </summary>
+        public const int Agree = 9012;
+        /// <summary>
+        /// 鐢ㄦ埛鍗忚
+        /// </summary>
+        public const int UserAgreement = 9013;
+        /// <summary>
+        /// 闅愮鏀跨瓥
+        /// </summary>
+        public const int PrivacyPolicy = 9014;
+        /// <summary>
+        /// 鍜�
+        /// </summary>
+        public const int And = 9015;
+        /// <summary>
+        /// 璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
+        /// </summary>
+        public const int PleaseReadAndAgreePrivacyPolicyMsg = 9016;
+        /// <summary>
+        /// 纭閫�鍑虹櫥褰曪紵
+        /// </summary>
+        public const int IfConfirmLogout = 9017;
+        /// <summary>
+        /// 璇烽�夋嫨鍥藉/鍖哄煙
+        /// </summary>
+        public const int PleaseSelectCountryOrRegion = 9018;
+        /// <summary>
+        /// 绔嬪嵆鏇存柊
+        /// </summary>
+        public const int Update = 9019;
+        /// <summary>
+        /// 浠ュ悗鍐嶈
+        /// </summary>
+        public const int Ignore = 9020;
+        /// <summary>
+        /// 鍥藉/鍦板尯
+        /// </summary>
+        public const int CountryOrRegion = 9021;
+        /// <summary>
+        /// 鏈嶅姟鍣ㄤ俊鎭�
+        /// </summary>
+        public const int ServerInformation = 9022;
+        /// <summary>
+        /// 褰撳墠璐﹀彿鏈嶅姟鍣ㄦ墍灞烇細
+        /// </summary>
+        public const int CurrentAccountServerOwnership = 9023;
+        /// <summary>
+        /// *鏈嶅姟鍣ㄦ槸鎮ㄥ綋鍓嶄簯绔暟鎹瓨鍌ㄧ殑鎵�鍦ㄥ尯鍩燂紝鏃犻渶蹇呰锛屾垜浠笉寤鸿鍙戠敓杩佺Щ
+        /// </summary>
+        public const int CurrentAccountServerOwnershipTip = 9024;
+        /// <summary>
+        /// 鑻ラ渶瑕佽縼绉绘湇鍔″櫒锛岃鎷ㄦ墦
+        /// </summary>
+        public const int ToMigrateTheServerPleaseCall = 9025;
+        /// <summary>
+        /// 鍔熻兘浠嬬粛
+        /// </summary>
+        public const int FunctionIntroduced = 9026;
+        /// <summary>
+        /// 鎶曡瘔
+        /// </summary>
+        public const int Complaints = 9027;
+        /// <summary>
+        /// 鐗堟湰鏇存柊
+        /// </summary>
+        public const int VersionUpdate = 9028;
+        /// <summary>
+        /// (鏍囬璇峰甫鎶曡瘔瀛楁牱锛屾垜浠細浼樺厛澶勭悊)
+        /// </summary>
+        public const int WillGivePriorityToTheTreatmen = 9029;
+        /// <summary>
+        /// 澶嶅埗鎴愬姛
+        /// </summary>
+        public const int CopySuccess = 9030;
+        /// <summary>
+        /// 绌虹┖濡備篃
+        /// </summary>
+        public const int ContentIsEmpty = 9031;
+        /// <summary>
+        /// 鍙戠幇鏂扮増鏈�
+        /// </summary>
+        public const int DiscoverNewVersion = 9032;
+        /// <summary>
+        /// 宸茬粡鏄渶鏂扮増鏈�
+        /// </summary>
+        public const int IsLatestVersion = 9033;
+        /// <summary>
+        /// 鎴戜滑鑳戒负浣犳彁渚涗粈涔堝府鍔╋紵
+        /// </summary>
+        public const int WhatCanWeDoForYou = 9034;
+        /// <summary>
+        /// 鍔熻兘闂
+        /// </summary>
+        public const int FunctionalQuestion = 9035;
+        /// <summary>
+        /// 鍦烘櫙闂
+        /// </summary>
+        public const int SceneQuestion = 9036;
+        /// <summary>
+        /// APP浣跨敤杈呭姪
+        /// </summary>
+        public const int AppUsageAssistance = 9037;
+        /// <summary>
+        /// 甯歌闂
+        /// </summary>
+        public const int CommonQuestion = 9038;
 
 
         #region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅

--
Gitblit v1.8.0