From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板:绑定温湿度传感器目标,和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节

---
 ZigbeeApp/Shared/R.cs |  110 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 107 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index aef72af..1d4ae1d 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -662,6 +662,42 @@
         /// 鍚屾澶辫触
         /// </summary>
         public const int SynchronizationFailed = 337;
+        /// <summary>
+        /// 鏁版嵁鏍℃
+        /// </summary>
+        public const int DataCorrection = 338;
+        /// <summary>
+        ///  339=鐭娓╁害澶辫触
+        /// </summary>
+        public const int DataCorrectionFailed = 339;
+        /// <summary>
+        ///  340=鐭闈㈡澘鍐呯疆鐨勬俯搴︽垨婀垮害浼犳劅鍣ㄨ鏁�
+        /// </summary>
+        public const int DataCorrectionTip = 340;
+        /// <summary>
+        ///  341=璇疯緭鍏ユ纭殑鏁板��
+        /// </summary>
+        public const int NumTip = 341;
+        /// <summary>
+        ///  342=璇疯緭鍏ユ纭殑娓╁害鍊�
+        /// </summary>
+        public const int TNumTip = 342;
+        /// <summary>
+        ///  343=璇疯緭鍏ユ纭殑婀垮害鍊�
+        /// </summary>
+        public const int HNumTip = 343;
+        /// <summary>
+        ///  344=娉ㄦ剰缁戝畾鐩爣鐨勫悕绉颁笉瓒呰繃6涓眽瀛梴0}鎴�20涓瓧姣嶅拰鏁板瓧鍝︼紝鍚﹀垯闈㈡澘灏唟0}鏃犳硶鏄剧ず
+        /// </summary>
+        public const int BindRemarkTip1 = 344;
+        /// <summary>
+        ///  345=鐩爣鍚嶇О澶暱
+        /// </summary>
+        public const int BindRemarkTip2 = 345;
+        /// <summary>
+        ///  346=鐭ラ亾浜�
+        /// </summary>
+        public const int Iknown = 346;
 
         public readonly static int cancel = 5097;
         public readonly static int confrim = 5098;
@@ -5523,7 +5559,7 @@
         /// </summary>
         public const int uWorkRoom = 16060;
         /// <summary>
-        /// 鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+        /// 鐢垫満鏁版嵁寮傚父,纭宸茬粡瀹夎瀵艰建鍚�,璇烽噸缃數鏈�
         /// </summary>
         public const int uCurtainDataIsErrorPleaseResetCurtain = 16061;
         /// <summary>
@@ -5779,7 +5815,7 @@
         /// </summary>
         public const int uAddMiniGateway = 16124;
         /// <summary>
-        /// 鎻掔數鍚�,闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+        /// 鎻掔數鍚�,闀挎寜缃戝叧寮�鍏抽敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
         /// </summary>
         public const int uAddMiniGatewayMsg1 = 16125;
         /// <summary>
@@ -5846,6 +5882,74 @@
         /// 閽ュ寵鎵�
         /// </summary>
         public const int uKeyfob = 16143;
+        /// <summary>
+        /// 鑹插�煎彿涓�6浣嶏紙鐢变换鎰忔暟瀛�+瀛楁瘝缁勫悎锛�
+        /// </summary>
+        public const int uColorLengthMsg = 16144;
+        /// <summary>
+        /// 闀挎寜姝ゆ寜閿�
+        /// </summary>
+        public const int uLongPressThisButton = 16145;
+        /// <summary>
+        /// Mini缃戝叧鏈�澶у彧鑳芥坊鍔�16涓澶�
+        /// </summary>
+        public const int uMiniGatewayMaxDeviceCountMsg = 16146;
+        /// <summary>
+        /// 寮�鍏抽敭
+        /// </summary>
+        public const int uSwitchButton = 16147;
+        /// <summary>
+        /// 杩囨埛
+        /// </summary>
+        public const int uTransfer = 16148;
+        /// <summary>
+        /// 浣忓畢杩囨埛
+        /// </summary>
+        public const int uTransferOfResidence = 16149;
+        /// <summary>
+        /// 杞Щ浣忓畢鍒板叾浠朎voyo
+        /// </summary>
+        public const int uTransferOfResidenceToOtherEvoyoAccount1 = 16150;
+        /// <summary>
+        /// Home璐﹀彿
+        /// </summary>
+        public const int uTransferOfResidenceToOtherEvoyoAccount2 = 16151;
+        /// <summary>
+        /// 璇ユ搷浣滀笉鍙�嗭紝璇锋敞鎰忥細
+        /// </summary>
+        public const int uThisOperationIsIrreversiblePleaseNote = 16152;
+        /// <summary>
+        /// 1.鎺ユ敹鏂逛负Evoyo Home鏈夋晥娉ㄥ唽璐﹀彿
+        /// </summary>
+        public const int uTheReceiverIsValidAccountForEvoyoHome = 16153;
+        /// <summary>
+        /// 2.鎺ユ敹鏂逛笌杩囨埛鏂逛笉鍙互涓哄悓涓�涓处鍙�
+        /// </summary>
+        public const int uTheReceiverAndTheTransferPartyCannotBeTheSameAccount = 16154;
+        /// <summary>
+        /// 3.杩囨埛鎴愬姛鍚庯紝灏嗗彇娑堣繃鎴锋柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈
+        /// </summary>
+        public const int uIfTheTransferIsSuccessfulTheRightToUseTheHouseWillBeCancelled = 16155;
+        /// <summary>
+        /// 杩囨埛璐﹀彿
+        /// </summary>
+        public const int uTransferResidenceAccount = 16156;
+        /// <summary>
+        /// 璇疯緭鍏ユ帴鏀舵柟鐨勬墜鏈哄彿鎴朎mail
+        /// </summary>
+        public const int uPleaseInputReceiverPhoneOrEmail = 16157;
+        /// <summary>
+        /// 鏌ョ湅
+        /// </summary>
+        public const int uSearch1 = 16158;
+        /// <summary>
+        /// 瀹氭椂鑷姩鍏抽棴
+        /// </summary>
+        public const int uAutomaticTimingOff = 16159;
+        /// <summary>
+        /// 涓嶅叧闂�
+        /// </summary>
+        public const int uNotClose = 16160;
 
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -6070,7 +6174,7 @@
         /// </summary>
         public const int uAddFangyueEightButtonPanelMsg = 21020;
         /// <summary>
-        /// 鏂规偊鐜闈㈡澘 -> 鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+        /// 鏂规偊鐜闈㈡澘 ->鎸変綇闈㈡澘鍔熻兘鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
         /// </summary>
         public const int uAddFangyueEnvironmentPanelMsg = 21021;
         /// <summary>

--
Gitblit v1.8.0