From 081ea8d273048fd03756718ac6fb48a3c09218e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:10:00 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/R.cs | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index 990a82a..c387f6c
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -1001,6 +1001,23 @@
/// 缂栬緫鍦烘櫙
/// </summary>
public const int EditorScene = 13141;
+ /// <summary>
+ /// 鏈垎閰嶅尯鍩�
+ /// </summary>
+ public const int UnallocatedArea = 13142;
+ /// <summary>
+ /// 鍔熻兘绫诲瀷
+ /// </summary>
+ public const int FunctionType = 13143;
+ /// <summary>
+ /// 澶辫触锛岃閲嶈瘯
+ /// </summary>
+ public const int FailedPleaseTryAgain = 13144;
+ /// <summary>
+ /// 鎴愬姛
+ /// </summary>
+ public const int Success = 13145;
+
#endregion
@@ -1089,7 +1106,7 @@
//*****public static readonly int Function = 11038;
-
+
public static readonly int AddFunction = 11042;
public static readonly int Light = 11044;
@@ -1171,7 +1188,7 @@
/// 鏃堕棿闂撮殧
/// </summary>
public static readonly int TimeSpan = 11093;
-
+
@@ -1192,7 +1209,7 @@
/// 鐧惧垎姣�
/// </summary>
public static readonly int Percent = 11103;
- public static readonly int Success = 11104;
+
/// <summary>
/// The please confirm new password.
@@ -1204,10 +1221,7 @@
public readonly static int NORECORD = 11107;
public static readonly int TheMainGatewayIsNotOnLine = 12000;
- /// <summary>
- /// 澶辫触锛岃閲嶈瘯
- /// </summary>
- public static readonly int FailedPleaseTryAgain = 12001;
+
public static readonly int TheSceneIsNull = 12002;
/// <summary>
/// 璇ュ満鏅腑娌℃湁鎵ц鐩爣
@@ -1307,10 +1321,10 @@
///褰撳墠娌℃湁鍙互娣诲姞鍒拌鎴块棿鐨勮澶�
/// </summary>
public static readonly int NoDeviceCanAddToRoom = 12034;
-
-
-
+
+
+
/// <summary>
/// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
--
Gitblit v1.8.0