From b409ece9569247d7e7b44fc15e8a02556ca05a57 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:27:23 +0800
Subject: [PATCH] 合并温居城代码

---
 HDL_ON/Common/R.cs |  138 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 132 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 5d24e53..6dde3d0 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,105 @@
 {
     public static class StringId
     {
-
+        /// <summary>
+        /// 椋庨噺
+        /// </summary>
+        public const int AirVolume = 479;
+        /// <summary>
+        /// 鎽嗗姩
+        /// </summary>
+        public const int Pattern = 478;
+        /// <summary>
+        /// 鎽嗗姩
+        /// </summary>
+        public const int HeadSwinging = 477;
+        /// <summary>
+        /// 娣诲姞浣忓畢
+        /// </summary>
+        public const int AddResidence = 476;
+        /// <summary>
+        /// 宸﹀彸鎵
+        /// </summary>
+        public const int Swing_Left_Right = 475;
+        /// <summary>
+        /// 涓婁笅鎵
+        /// </summary>
+        public const int Swing_Up_Down = 474;
+        /// <summary>
+        /// 鎵
+        /// </summary>
+        public const int Swing = 473;
+        /// <summary>
+        /// 瀹ゅ
+        /// </summary>
+        public const int Outdoor = 472;
+        /// <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>
         /// 甯冮槻淇℃伅
@@ -1086,7 +1184,23 @@
         /// <summary>
         /// 姝e湪杩囨埛缁欑敤鎴�,璇风◢鍚�...
         /// </summary>
-        public const int IsTransferingPleaseWaitting = 1154;
+        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;
@@ -1234,10 +1348,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;
@@ -1373,6 +1497,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