From 8b4d79ca03495e522a1953e04ca17527f33c853a Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 28 十月 2019 13:22:17 +0800 Subject: [PATCH] 合并完成代码 --- ZigbeeApp/Shared/R.cs | 313 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 204 insertions(+), 109 deletions(-) diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs index 7c7e1f0..990a82a 100755 --- a/ZigbeeApp/Shared/R.cs +++ b/ZigbeeApp/Shared/R.cs @@ -286,6 +286,7 @@ public readonly static int ClearFailedXm = 199; public readonly static int ModifyTempPasswordTip1 = 200; public readonly static int ModifyTempPasswordTip2 = 201; + public readonly static int FirstFloor = 202; public readonly static int RemindSetting = 548; public readonly static int AddNewUser = 650; @@ -545,6 +546,11 @@ 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; @@ -593,7 +599,7 @@ /// </summary> public const int Search = 10108; /// <summary> - /// 纭畾 + /// 瀹屾垚 /// </summary> public const int Complete = 10109; /// <summary> @@ -781,15 +787,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> /// 閫夋嫨妤煎眰 @@ -836,7 +882,7 @@ /// </summary> public const int Open = 13111; /// <summary> - /// 鍏� + /// 鍏抽棴 /// </summary> public const int Close = 13112; /// <summary> @@ -879,10 +925,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> /// 鍠滅埍 @@ -966,7 +1089,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; @@ -1048,13 +1171,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> /// 鍙栨秷鏀惰棌 @@ -1183,99 +1307,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> /// 褰撳墠鎴块棿娌℃湁璁惧鍙互娣诲姞鍒板満鏅� @@ -4352,6 +4387,62 @@ /// 3.濡傛灉浠嶅缁堟棤娉曞彂鐜拌澶囷紝鍙兘鍥犱负璁惧宸茬粡琚粬浜虹粦瀹氫簡銆傚鏋滀綘骞朵笉娓呮鏄皝杩炴帴浜嗚澶囷紝鍙互杩涜閲嶇疆锛岄噸缃柟寮忚鏌ラ槄璇存槑涔︼紝鏍规嵁鎸囧紩鎿嶄綔銆� /// </summary> public const int uAddDeviceHelp5 = 15841; + /// <summary> + /// 鎴块棿鍒楄〃 + /// </summary> + public const int uRoomList = 15842; + /// <summary> + /// 杩樻病鏈夋坊鍔犲満鏅摝 + /// </summary> + public const int uDoNotHadAddScenceMsg = 15843; + /// <summary> + /// 杩樻病鏈夋坊鍔犺澶囧摝 + /// </summary> + public const int uDoNotHadAddDeviceMsg = 15844; + /// <summary> + /// 鎴块棿鍚嶇О宸茬粡瀛樺湪 + /// </summary> + public const int uRoomNameIsExist = 15845; + /// <summary> + /// 瀹ゅ唴鏈鸿缃� + /// </summary> + public const int uIndoorUnitSettion = 15846; + /// <summary> + /// 绌鸿皟妯″紡 + /// </summary> + public const int uAirConditionerMode = 15847; + /// <summary> + /// 鎽嗛 + /// </summary> + public const int uAirConditionerSwing = 15848; + /// <summary> + /// 鍒跺喎 + /// </summary> + public const int uMode_Cool = 15849; + /// <summary> + /// 鍒剁儹 + /// </summary> + public const int uMode_Heat = 15850; + /// <summary> + /// 鑷姩 + /// </summary> + public const int uMode_Auto = 15851; + /// <summary> + /// 閫侀 + /// </summary> + public const int uMode_FanOnly = 15852; + /// <summary> + /// 闄ゆ箍 + /// </summary> + public const int uMode_Dry = 15853; + /// <summary> + /// 鎵撳紑绌鸿皟澶辫触 + /// </summary> + public const int uOpenAirConditionerFail = 15854; + /// <summary> + /// 鍏抽棴绌鸿皟澶辫触 + /// </summary> + public const int uCloseAirConditionerFail = 15855; //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽� /// <summary> @@ -4479,9 +4570,13 @@ /// </summary> public const int uShareData_Fail = 18049; /// <summary> - /// 涓嶈兘娣诲姞鑷繁涓哄瓙璐﹀彿 + /// 涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳 /// </summary> public const int BindSubAccount_SameAccount = 18050; + /// <summary> + /// 涓嶈兘鎶婁富璐﹀彿娣诲姞涓烘垚鍛� + /// </summary> + public const int BindSubAccount_NoAddMainAccount = 18051; //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囩殑鍏ョ綉姝ラ,浠�21000寮�濮嬧槄鈽呪槄鈽� -- Gitblit v1.8.0