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 | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp20200825/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100644
new mode 100755
similarity index 98%
rename from ZigbeeApp20200825/Shared/R.cs
rename to ZigbeeApp/Shared/R.cs
index 33b7f44..1d4ae1d
--- a/ZigbeeApp20200825/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -677,15 +677,27 @@
/// <summary>
/// 341=璇疯緭鍏ユ纭殑鏁板��
/// </summary>
- public const int NumTip = 341;
+ public const int NumTip = 341;
/// <summary>
/// 342=璇疯緭鍏ユ纭殑娓╁害鍊�
/// </summary>
- public const int TNumTip = 342;
+ 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;
@@ -5547,7 +5559,7 @@
/// </summary>
public const int uWorkRoom = 16060;
/// <summary>
- /// 鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+ /// 鐢垫満鏁版嵁寮傚父,纭宸茬粡瀹夎瀵艰建鍚�,璇烽噸缃數鏈�
/// </summary>
public const int uCurtainDataIsErrorPleaseResetCurtain = 16061;
/// <summary>
@@ -5894,6 +5906,50 @@
/// 浣忓畢杩囨埛
/// </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;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
--
Gitblit v1.8.0