From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/R.cs | 366 +++++++++++++++++++++------------------------------
1 files changed, 151 insertions(+), 215 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index 08e348f..0c67d4e
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -269,17 +269,6 @@
public readonly static int CLose = 182;
public readonly static int Opening = 183;
public readonly static int DoorLockOpen = 184;
- public readonly static int Year = 185;
- public readonly static int RectifySuccess = 186;
- public readonly static int RectifyFailed = 187;
- public readonly static int SetTempPasswordTip2 = 188;
- public readonly static int SetTempPasswordTip3 = 189;
- public readonly static int SetTempPasswordTip4 = 190;
- public readonly static int SetTempPasswordTip5 = 191;
- public readonly static int SetTempPasswordTip1 = 192;
-
-
-
public readonly static int RemindSetting = 548;
public readonly static int AddNewUser = 650;
@@ -512,32 +501,6 @@
public readonly static int button3 = 5302;
public readonly static int button4 = 5303;
public readonly static int doyouwanttodelete = 5304;
- public readonly static int onoff = 5305;
- public readonly static int unattendedtime = 5306;
- public readonly static int unattendedtime1 = 5307;
- public readonly static int closetimeout = 5308;
- public readonly static int closetime = 5309;
- public readonly static int weekly = 5340;
- public readonly static int selectweek = 5341;
- public readonly static int doorLock = 5342;
- public readonly static int userlist = 5343;
- public readonly static int lockpassword = 5344;
- public readonly static int fingerprint = 5345;
- public readonly static int ic = 5346;
- public readonly static int Airswitch = 5347;
- public readonly static int createtimetext = 5348;
- public readonly static int adddelay = 5349;
- public readonly static int logiccool = 5350;
- public readonly static int logicheat = 5351;
- public readonly static int logicauto = 5352;
- public readonly static int logicdry = 5353;
- public readonly static int logicfanonly = 5354;
- public readonly static int logiclow = 5355;
- public readonly static int logicmedium = 5356;
- public readonly static int logichigh = 5357;
- public readonly static int logictemplate = 5358;
- public readonly static int onlight = 5359;
- public readonly static int offlight = 5360;
@@ -586,7 +549,7 @@
/// </summary>
public const int Search = 10108;
/// <summary>
- /// 纭畾
+ /// 瀹屾垚
/// </summary>
public const int Complete = 10109;
/// <summary>
@@ -774,15 +737,59 @@
/// </summary>
public const int SelectScenePic = 11033;
+ #region 璁惧绫诲瀷
+ /// <summary>
+ /// 鏈煡璁惧
+ /// </summary>
+ public const int UnknowDevice = 12100;
+ /// <summary>
+ /// 鎺у埗闈㈡澘
+ /// </summary>
+ public const int OnOffSwitch = 12101;
+ /// <summary>
+ /// 缁х數鍣�
+ /// </summary>
+ public const int OnOffOutput = 12102;
+ /// <summary>
+ /// 璋冨厜鐏�
+ /// </summary>
+ public const int DimmableLight = 12103;
+ /// <summary>
+ /// 绐楀笜
+ /// </summary>
+ public const int WindowCoveringDevice = 12104;
+ /// <summary>
+ /// 绌鸿皟
+ /// </summary>
+ public const int Thermostat = 12105;
+ /// <summary>
+ /// 浼犳劅鍣�
+ /// </summary>
+ public const int IASZone = 12106;
+ /// <summary>
+ /// 绌烘皵寮�鍏�
+ /// </summary>
+ public const int AirSwitch = 12107;
+ /// <summary>
+ /// 褰╃伅
+ /// </summary>
+ public const int ColorDimmableLight = 12108;
+ /// <summary>
+ /// 涓户鍣�
+ /// </summary>
+ public const int Repeater = 12109;
- #endregion
+ #endregion
- #region 涓婚〉
- /// <summary>
- /// 鎴块棿鍒楄〃
- /// </summary>
- public const int RoomList = 13100;
+ #endregion
+
+ #region 涓婚〉
+
+ /// <summary>
+ /// 鎴块棿鍒楄〃
+ /// </summary>
+ public const int RoomList = 13100;
/// <summary>
/// 閫夋嫨妤煎眰
@@ -829,7 +836,7 @@
/// </summary>
public const int Open = 13111;
/// <summary>
- /// 鍏�
+ /// 鍏抽棴
/// </summary>
public const int Close = 13112;
/// <summary>
@@ -872,10 +879,87 @@
/// 涓轰綘鐨勫姩浣滃垱寤烘椂闂撮棿闅�
/// </summary>
public const int SelectTimeForAction = 13122;
-
-
+ /// <summary>
+ /// 鍚�
+ /// </summary>
+ public const int Later = 13123;
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ public const int Delete = 13124;
+ /// <summary>
+ /// 鍏�
+ /// </summary>
+ public const int Shut = 13125;
+ /// <summary>
+ /// 閫夋嫨椋庨��
+ /// </summary>
+ public const int SelectFanMode = 13126;
+ /// <summary>
+ /// 浣庨
+ /// </summary>
+ public const int Fan_Low = 13127;
+ /// <summary>
+ /// 涓
+ /// </summary>
+ public const int Fan_Middle = 13128;
+ /// <summary>
+ /// 楂橀
+ /// </summary>
+ public const int Fan_Height = 13129;
+ /// <summary>
+ /// 閫夋嫨妯″紡
+ /// </summary>
+ public const int SelectMode = 13130;
+ /// <summary>
+ /// 鑷姩
+ /// </summary>
+ public const int Mode_Auto = 13131;
+ /// <summary>
+ /// 鍒跺喎
+ /// </summary>
+ public const int Mode_Cool = 13132;
+ /// <summary>
+ /// 鍒剁儹
+ /// </summary>
+ public const int Mode_Heat = 13133;
+ /// <summary>
+ /// 闄ゆ箍
+ /// </summary>
+ public const int Mode_Dry = 13134;
+ /// <summary>
+ /// 閫侀
+ /// </summary>
+ public const int Mode_FanOnly = 13135;
+ /// <summary>
+ /// 瀹ゆ俯
+ /// </summary>
+ public const int IndoorTemperature = 13136;
+ /// <summary>
+ /// 绌鸿皟宸茬粡鍏抽棴锛岃鍏堟墦寮�
+ /// </summary>
+ public const int TheACIsClose = 13137;
+ /// <summary>
+ /// 娣诲姞鍦烘櫙澶辫触
+ /// </summary>
+ public const int AddSceneFail = 13138;
+ /// <summary>
+ /// 璇ュ満鏅凡瀛樺湪
+ /// </summary>
+ public const int TheSceneHadExist = 13139;
+ /// <summary>
+ /// 缂栬緫
+ /// </summary>
+ public const int Editor = 13140;
+ /// <summary>
+ /// 缂栬緫鍦烘櫙
+ /// </summary>
+ public const int EditorScene = 13141;
#endregion
+
+
+
/// <summary>
/// 鍠滅埍
@@ -959,7 +1043,7 @@
//*****public static readonly int Function = 11038;
- public static readonly int Delete = 11041;
+
public static readonly int AddFunction = 11042;
public static readonly int Light = 11044;
@@ -1041,13 +1125,14 @@
/// 鏃堕棿闂撮殧
/// </summary>
public static readonly int TimeSpan = 11093;
- public static readonly int TheSceneHadExist = 11094;
- public static readonly int AddSceneFail = 11095;
+
- /// <summary>
- /// 鑷畾涔�
- /// </summary>
- public static readonly int Custom = 11098;
+
+
+ /// <summary>
+ /// 鑷畾涔�
+ /// </summary>
+ public static readonly int Custom = 11098;
/// <summary>
/// 鍙栨秷鏀惰棌
@@ -1176,99 +1261,10 @@
///褰撳墠娌℃湁鍙互娣诲姞鍒拌鎴块棿鐨勮澶�
/// </summary>
public static readonly int NoDeviceCanAddToRoom = 12034;
- /// <summary>
- /// 閫夋嫨椋庨��
- /// </summary>
- public static readonly int SelectFanMode = 12035;
- /// <summary>
- /// 浣庨
- /// </summary>
- public static readonly int Fan_Low = 12036;
- /// <summary>
- /// 涓
- /// </summary>
- public static readonly int Fan_Middle = 12037;
- /// <summary>
- /// 楂橀
- /// </summary>
- public static readonly int Fan_Height = 12038;
- /// <summary>
- /// 閫夋嫨妯″紡
- /// </summary>
- public static readonly int SelectMode = 12039;
- /// <summary>
- /// 鑷姩
- /// </summary>
- public static readonly int Mode_Auto = 12040;
- /// <summary>
- /// 鍒跺喎
- /// </summary>
- public static readonly int Mode_Cool = 12041;
- /// <summary>
- /// 鍒剁儹
- /// </summary>
- public static readonly int Mode_Heat = 12042;
- /// <summary>
- /// 闄ゆ箍
- /// </summary>
- public static readonly int Mode_Dry = 12043;
- /// <summary>
- /// 閫侀
- /// </summary>
- public static readonly int Mode_FanOnly = 12044;
- /// <summary>
- /// 瀹ゆ俯
- /// </summary>
- public static readonly int IndoorTemperature = 12045;
- /// <summary>
- /// 绌鸿皟宸茬粡鍏抽棴锛岃鍏堟墦寮�
- /// </summary>
- public static readonly int TheACIsClose = 12046;
+
- #region 璁惧绫诲瀷
- /// <summary>
- /// 鏈煡璁惧
- /// </summary>
- public static readonly int UnknowDevice = 12100;
- /// <summary>
- /// 鎺у埗闈㈡澘
- /// </summary>
- public static readonly int OnOffSwitch = 12101;
- /// <summary>
- /// 缁х數鍣�
- /// </summary>
- public static readonly int OnOffOutput = 12102;
- /// <summary>
- /// 璋冨厜鐏�
- /// </summary>
- public static readonly int DimmableLight = 12103;
- /// <summary>
- /// 绐楀笜
- /// </summary>
- public static readonly int WindowCoveringDevice = 12104;
- /// <summary>
- /// 绌鸿皟
- /// </summary>
- public static readonly int Thermostat = 12105;
- /// <summary>
- /// 浼犳劅鍣�
- /// </summary>
- public static readonly int IASZone = 12106;
- /// <summary>
- /// 绌烘皵寮�鍏�
- /// </summary>
- public static readonly int AirSwitch = 12107;
- /// <summary>
- /// 褰╃伅
- /// </summary>
- public static readonly int ColorDimmableLight = 12108;
- /// <summary>
- /// 涓户鍣�
- /// </summary>
- public static readonly int Repeater = 12109;
-
- #endregion
+
/// <summary>
/// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
@@ -1482,15 +1478,15 @@
/// </summary>
public const int uStopSearch = 15050;
/// <summary>
- /// 姝ｅ湪鎼滅储缃戝叧鈥�
+ /// 鏅鸿兘缃戝叧閰嶇疆缃戠粶涓�
/// </summary>
- public const int uGatewaySearching = 15051;
+ public const int uGatewaySetting = 15051;
/// <summary>
/// 璇风◢鍊�
/// </summary>
public const int uPleaseWait = 15052;
/// <summary>
- /// 璇风‘淇濈綉鍏充笌缃戠嚎杩炴帴{0}绯荤粺鐏瘡绉掗棯鐑佷竴娆�
+ /// 璇风‘淇濈綉鍏冲凡鐢ㄧ綉绾胯繛鎺�
/// </summary>
public const int ConfirmLineConnectMsg = 15053;
/// <summary>
@@ -1526,9 +1522,9 @@
/// </summary>
public const int NormalTip = 15061;
/// <summary>
- /// 鎹㈢粦
+ /// 闇�閲嶆柊缁戝畾
/// </summary>
- public const int uReBindAgain = 15062;
+ public const int uNeedReBinding = 15062;
/// <summary>
/// 宸茬粦瀹�
/// </summary>
@@ -2006,7 +2002,7 @@
/// </summary>
public const int uGarrison = 15191;
/// <summary>
- /// 纭畾鎺堟潈銆寋0}銆嶆垚涓虹鐞嗗憳?
+ /// 纭畾瑕佹巿鏉冭璐﹀彿涓轰富璐﹀彿?
/// </summary>
public const int uUpSubAccountLevel = 15192;
/// <summary>
@@ -2698,7 +2694,7 @@
/// </summary>
public const int uAppAutoBackup = 15400;
/// <summary>
- /// 浠庣綉鍏�
+ /// 瀛愮綉鍏�
/// </summary>
public const int uChidrenGateway = 15401;
/// <summary>
@@ -3014,7 +3010,7 @@
/// </summary>
public const int uGetGatewayTagartFail = 15491;
/// <summary>
- /// 纭缁戝畾鏃х綉鍏筹紵
+ /// 鏄惁閲嶆柊缁戝畾缃戝叧?
/// </summary>
public const int uRebindGatewayMsg = 15492;
/// <summary>
@@ -3282,7 +3278,7 @@
/// </summary>
public const int uHadSharedContent = 15564;
/// <summary>
- /// 鍒涘缓鏂板叡浜�
+ /// 鏂板鍏变韩
/// </summary>
public const int uAddShared = 15565;
/// <summary>
@@ -3346,7 +3342,7 @@
/// </summary>
public const int uCanNotAddDeviceInGarrisonMode = 15582;
/// <summary>
- /// 鏃犲彲鍏变韩鐨勬埧闂�
+ /// 鍏ㄩ儴鍖哄煙鏃犲彲鍏变韩鐨勮澶�
/// </summary>
public const int uNotShardDeviceInAllRoomMsg = 15583;
/// <summary>
@@ -4073,66 +4069,6 @@
/// 瀛樺湪闈炴硶瀛楃銆寋0}銆�
/// </summary>
public const int uErrorFieldIsEsixt = 15773;
- /// <summary>
- /// 涓嶅瓨鍦ㄨ璐︽埛锛岃閲嶆柊杈撳叆
- /// </summary>
- public const int uMemberIsNotEsixtAndInputAgain = 15774;
- /// <summary>
- /// 杩斿洖
- /// </summary>
- public const int uGoBack = 15775;
- /// <summary>
- /// 杩樻病鏈夊叡浜尯鍩熺粰鎴愬憳{0}鍙偣鍑诲彸涓婅鈥�+鈥濇坊鍔�
- /// </summary>
- public const int uNotShardComtentMsg = 15776;
- /// <summary>
- /// 纭鍒犻櫎鍏变韩鎴块棿锛�
- /// </summary>
- public const int uDeleteShardRoomMsg = 15777;
- /// <summary>
- /// 杩樻病缁戝畾缃戝叧鍝�
- /// </summary>
- public const int uHadNotBindGatewayMsg = 15778;
- /// <summary>
- /// 瑙ｅ喅鏂规硶锛屽彲閫夋嫨鎵ц浠ヤ笅浠绘剰涓�绉嶆柟寮忥細
- /// </summary>
- public const int uSearchGatewayFailMsg1 = 15779;
- /// <summary>
- /// 1.闀挎寜ZB/RST閿�20绉掞紝缃戝叧鎭㈠鍑哄巶璁剧疆锛屾寚绀虹伅鍏ㄩ儴鐔剓0}鐏悗锛岄噸鏂板叆缃戙��
- /// </summary>
- public const int uSearchGatewayFailMsg2 = 15780;
- /// <summary>
- /// 2.鐐规寜HID/WCFG閿紝杩涘叆缃戝叧鎹㈢粦妯″紡锛岀郴缁熸寚绀虹伅蹇棯{0}5绉掋��
- /// </summary>
- public const int uSearchGatewayFailMsg3 = 15781;
- /// <summary>
- /// 3.璇烽噸璇曪紝閲嶆柊娣诲姞缃戝叧銆�
- /// </summary>
- public const int uSearchGatewayFailMsg4 = 15782;
- /// <summary>
- /// 4.杩斿洖缃戝叧绠＄悊銆�
- /// </summary>
- public const int uSearchGatewayFailMsg5 = 15783;
- /// <summary>
- /// 閲嶈瘯
- /// </summary>
- public const int uReDoAgain = 15784;
- /// <summary>
- /// 杩斿洖缃戝叧绠＄悊
- /// </summary>
- public const int uGobackGatewayManage = 15785;
- /// <summary>
- /// 鎼滅储澶辫触
- /// </summary>
- public const int uSearchFail = 15786;
- /// <summary>
- /// (鏂�)
- /// </summary>
- public const int uNewTip1 = 15787;
- /// <summary>
- /// 姝ｅ湪鎹㈢粦缃戝叧锛岃绋嶅�欌��
- /// </summary>
- public const int uIsReBindingPleaseWaiting = 15788;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0