From d6b4e510f1430d19bc48da6894cf707bbe3c226d Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 14:25:15 +0800
Subject: [PATCH] 2019.10.29-2
---
ZigbeeApp/Shared/R.cs | 342 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 214 insertions(+), 128 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 8d69ff0..e50d6ac 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -333,7 +333,7 @@
public readonly static int Sunrisesunset = 5134;
public readonly static int cycle = 5135;
public readonly static int completeNext = 5136;
- public readonly static int Selectedtimetype= 5137;
+ public readonly static int Selectedtimetype = 5137;
public readonly static int Timecondition = 5138;
public readonly static int condition = 5139;
public readonly static int pushset = 5140;
@@ -391,7 +391,7 @@
public readonly static int addtime = 5192;
public readonly static int selectcommontimetype = 5193;
public readonly static int newautomation = 5194;
- public readonly static int editautomation= 5195;
+ public readonly static int editautomation = 5195;
public readonly static int open1 = 5196;
public readonly static int disable = 5197;
public readonly static int selectsavedautomationstate = 5198;
@@ -501,15 +501,47 @@
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;
+ public readonly static int OnOffSwitch = 5361;
+ public readonly static int addlinkageevent = 5362;
+ public readonly static int editlinkageevent = 5363;
+ public readonly static int selectunlockingmode = 5364;
+ public readonly static int lockaddaction = 5365;
+ public readonly static int linkageevent = 5366;
- #region 鐧诲綍娉ㄥ唽
- /// <summary>
- /// HDL Home
- /// </summary>
- public const int AppName = 10000;
+ #region 鐧诲綍娉ㄥ唽
+ /// <summary>
+ /// HDL Home
+ /// </summary>
+ public const int AppName = 10000;
/// <summary>
@@ -549,7 +581,7 @@
/// </summary>
public const int Search = 10108;
/// <summary>
- /// 纭畾
+ /// 瀹屾垚
/// </summary>
public const int Complete = 10109;
/// <summary>
@@ -705,7 +737,7 @@
/// </summary>
public const int Setting = 11025;
/// <summary>
- /// 瀹氭椂
+ /// 寤舵椂
/// </summary>
public const int Delay = 11026;
/// <summary>
@@ -737,15 +769,55 @@
/// </summary>
public const int SelectScenePic = 11033;
+ #region 璁惧绫诲瀷
+ /// <summary>
+ /// 鏈煡璁惧
+ /// </summary>
+ public const int UnknowDevice = 12100;
+ /// <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>
/// 閫夋嫨妤煎眰
@@ -792,7 +864,7 @@
/// </summary>
public const int Open = 13111;
/// <summary>
- /// 鍏�
+ /// 鍏抽棴
/// </summary>
public const int Close = 13112;
/// <summary>
@@ -823,13 +895,121 @@
/// 娣诲姞鍒�
/// </summary>
public const int AddTo = 13119;
-
- #endregion
-
- /// <summary>
- /// 鍠滅埍
+ /// <summary>
+ /// 璇ユ埧闂存槸鍒嗕韩杩囨潵鐨勶紝涓嶅厑璁歌繘琛岃鎿嶄綔
/// </summary>
- public static readonly int Favorite = 100000;
+ public const int TheRoomIsSharedNotAllowedToOperate = 13120;
+ /// <summary>
+ /// 杩樻病閫夋嫨鎴块棿锛岃鍏堥�夋嫨
+ /// </summary>
+ public const int NotSelectZone = 13121;
+ /// <summary>
+ /// 涓轰綘鐨勫姩浣滃垱寤烘椂闂撮棿闅�
+ /// </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;
+ /// <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
+
+
+
+
+ /// <summary>
+ /// 鍠滅埍
+ /// </summary>
+ public static readonly int Favorite = 100000;
public static readonly int OK = 10005;
@@ -908,7 +1088,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;
@@ -990,13 +1170,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>
/// 鍙栨秷鏀惰棌
@@ -1010,7 +1191,7 @@
/// 鐧惧垎姣�
/// </summary>
public static readonly int Percent = 11103;
- public static readonly int Success = 11104;
+
/// <summary>
/// The please confirm new password.
@@ -1022,10 +1203,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>
/// 璇ュ満鏅腑娌℃湁鎵ц鐩爣
@@ -1125,102 +1303,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;
- /// <summary>
- /// 璇ユ埧闂存槸鍒嗕韩杩囨潵鐨勶紝涓嶅厑璁歌繘琛岃鎿嶄綔
- /// </summary>
- public static readonly int TheRoomIsSharedNotAllowedToOperate = 12047;
- #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>
/// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅�
--
Gitblit v1.8.0