From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/R.cs | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 92b1b32..f26af42 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -662,6 +662,22 @@
/// 鍚屾澶辫触
/// </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;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -5862,6 +5878,14 @@
/// 寮�鍏抽敭
/// </summary>
public const int uSwitchButton = 16147;
+ /// <summary>
+ /// 杩囨埛
+ /// </summary>
+ public const int uTransfer = 16148;
+ /// <summary>
+ /// 浣忓畢杩囨埛
+ /// </summary>
+ public const int uTransferOfResidence = 16149;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -6086,7 +6110,7 @@
/// </summary>
public const int uAddFangyueEightButtonPanelMsg = 21020;
/// <summary>
- /// 鏂规偊鐜闈㈡澘 -> 鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+ /// 鏂规偊鐜闈㈡澘 ->鎸変綇闈㈡澘鍔熻兘鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
/// </summary>
public const int uAddFangyueEnvironmentPanelMsg = 21021;
/// <summary>
--
Gitblit v1.8.0