From ffdeae1a43e1539f9533f93d64089994db6c742b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:23:01 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/Common/R.cs | 154 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 148 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index e15cea9..be0041a 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,6 +5,73 @@
public static class StringId
{
+ /// <summary>
+ /// 姣背娉紶鎰熷櫒
+ /// </summary>
+ public const int SenesorMillimeterWave = 471;
+ /// <summary>
+ /// 闃叉姢涓�
+ /// </summary>
+ public const int UnderProtection=470;
+ /// <summary>
+ /// 鏈変汉杩涘叆
+ /// </summary>
+ public const int SomeoneIn = 469;
+ /// <summary>
+ /// 鏈変汉璺屽��
+ /// </summary>
+ public const int SomeoneFell = 468;
+ /// <summary>
+ /// 鎶曞奖浠�
+ /// </summary>
+ public const int PJT = 467;
+ /// <summary>
+ /// 鏈洪《鐩�
+ /// </summary>
+ public const int STB = 466;
+ /// <summary>
+ /// 鍒犻櫎璁惧
+ /// </summary>
+ public const int DeleteDevice = 465;
+ /// <summary>
+ /// 鍙互寮�濮嬩娇鐢ㄦ渤涓滄绫虫尝浜�
+ /// </summary>
+ public const int CanStartUsingZhaoguanMillimeterWave = 464;
+ /// <summary>
+ /// 璇疯緭鍏n鐮�
+ /// </summary>
+ public const int PlsEntrySNCode = 463;
+ /// <summary>
+ /// 鎮ㄥ綋鍓嶈繕鏈坊鍔犱换浣曡澶�
+ /// </summary>
+ public const int NotAddedAnyDevices = 462;
+ /// <summary>
+ /// 瀹ゅ唴瀹ゅ
+ /// </summary>
+ public const int InOutdoor = 461;
+ /// <summary>
+ /// 鏈湀鑳借��
+ /// </summary>
+ public const int EnergyConsumptionOfThisMonth = 460;
+ /// <summary>
+ /// 瀹炴椂鑳借��
+ /// </summary>
+ public const int RealTimeEnergyConsumption=459;
+ /// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ public const int Date = 458;
+ /// <summary>
+ /// 鑳借��
+ /// </summary>
+ public const int EnergyConsumption = 457;
+ /// <summary>
+ /// 鐢诲竷
+ /// </summary>
+ public const int Canvas = 456;
+ /// <summary>
+ /// 鍚嶇О涓嶈兘涓虹┖
+ /// </summary>
public const int NameCannotBeEmpty = 455;
/// <summary>
/// 甯冮槻淇℃伅
@@ -1038,8 +1105,71 @@
/// <summary>
/// 甯稿紑妯″紡鍏抽棴璁剧疆澶辨晥锛岃閲嶈瘯
/// </summary>
- public const int AlwayOnFailTimeSettionFailMsg = 1142;
-
+ public const int AlwayOnFailTimeSettionFailMsg = 1142;
+ /// <summary>
+ /// 绠＄悊鍛樿韩浠介獙璇佸け璐�,璇烽噸鏂扮櫥褰�
+ /// </summary>
+ public const int CheckAdminFailAndLoginAgain = 1143;
+ /// <summary>
+ /// 鎮ㄧ殑浣忓畢灏嗚繃鎴风粰鍏朵粬HDL璐﹀彿
+ /// </summary>
+ public const int YourHomeWillBeTransferredToOtherAccounts = 1144;
+ /// <summary>
+ /// 璇锋敞鎰忥細
+ /// </summary>
+ public const int Attention = 1145;
+ /// <summary>
+ /// 1.璇ヤ綇瀹呮偍鐨勬暟鎹紙浜戠鏁版嵁锛夊皢鍏ㄩ儴杞Щ缁欐柊鐨勬埛涓粄0}2.杩囨埛鍚庯紝鍘熸湁鐨勬垚鍛樺皢鑷姩瑙ｇ粦璇ヤ綇瀹厈0}3.鏂版埛涓昏处鍙蜂负鏈夋晥鐨凥DL璐﹀彿{0}4.鎺ユ敹鏂硅处鍙蜂笌杞Щ鏂硅处鍙蜂笉鍙负鍚屼竴涓处鍙�
+ /// </summary>
+ public const int TransferreConfirmMsg1 = 1146;
+ /// <summary>
+ /// 纭杩囨埛
+ /// </summary>
+ public const int ConfirmTransferre = 1147;
+ /// <summary>
+ /// 璇疯緭鍏ユ帴鏀舵柟璐﹀彿
+ /// </summary>
+ public const int PleaseInputReceiverAccount = 1148;
+ /// <summary>
+ /// 涓汉璧勬枡
+ /// </summary>
+ public const int Profile = 1149;
+ /// <summary>
+ /// 纭杩囨埛{0}鐨勭鐞嗗憳璐﹀彿缁欒处鍙穥1}
+ /// </summary>
+ public const int TransferreConfirmMsg2 = 1150;
+ /// <summary>
+ /// 鐩爣璐﹀彿骞朵笉瀛樺湪
+ /// </summary>
+ public const int TargetAcountDoesNotExist = 1151;
+ /// <summary>
+ /// 涓嶈兘鑷繁杩囨埛缁欒嚜宸�
+ /// </summary>
+ public const int YouCannotTransferOwnershipToYourself = 1152;
+ /// <summary>
+ /// 缁堟
+ /// </summary>
+ public const int Terminate = 1153;
+ /// <summary>
+ /// 姝ｅ湪杩囨埛缁欑敤鎴�,璇风◢鍚�...
+ /// </summary>
+ public const int IsTransferingPleaseWaitting = 1154;
+ /// <summary>
+ /// 鐢ㄦ埛{0}宸茬粡鎴愪负浣忓畢琛岀鐞嗗憳
+ /// </summary>
+ public const int CongratulationsXXBecomingNNAdministrator = 1155;
+ /// <summary>
+ /// 璇ヤ綇瀹呯殑淇℃伅灏嗗湪鎮ㄧ殑璐﹀彿涓垹闄�
+ /// </summary>
+ public const int ResidenceDataWillBeDeletedFromYourAccount = 1156;
+ /// <summary>
+ /// 杩囨埛澶辫触
+ /// </summary>
+ public const int TransferFail = 1157;
+ /// <summary>
+ /// 璇烽噸鏂板皾璇�
+ /// </summary>
+ public const int PleaseTryAgain = 1158;
public const int keshiduijiang = 4000;
@@ -1187,10 +1317,20 @@
public const int xitongweihuzhong = 6078;
public const int huoqushujushibao = 6079;
public const int zanshibuzhichigaigongneng = 6080;
-
-
-
-
+ public const int xuanzehongwaipinpai= 6081;
+ public const int yaotou = 6082;
+ public const int disu = 6083;
+ public const int zhongsu = 6084;
+ public const int gaosu = 6085;
+ public const int zidong = 6086;
+ public const int wendujia = 6087;
+ public const int wendujian = 6088;
+ public const int kongqijinghauqi = 6089;
+ public const int reshuiqi = 6090;
+ public const int bucunzaichanpin = 6091;
+ public const int shebeibucunzai = 6092;
+ public const int shebeibuzaixian = 6093;
+ public const int wangguanshebeibuzaixian = 6094;
public const int newAutomation = 7000;
public const int editAutomation = 7001;
@@ -1326,6 +1466,8 @@
public const int apptuisong = 7131;
public const int zidontghua = 7132;
public const int yizhixing = 7133;
+ public const int mubiaozhuangtai = 7134;
+ public const int diedao = 7135;
#region LE鏂板
/// <summary>
--
Gitblit v1.8.0