From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/R.cs | 308 ++++++++++++++++++++++++++++++---------------------
1 files changed, 180 insertions(+), 128 deletions(-)
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index f1994c3..646002c 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -602,7 +602,66 @@
/// 涓ラ噸姹℃煋
/// </summary>
public const int SeriousPollution = 322;
-
+ /// <summary>
+ /// 闂ㄩ攣甯稿紑妯″紡宸插叧
+ /// </summary>
+ public const int NormallyClosed = 323;
+ /// <summary>
+ /// 鍏ョ綉
+ /// </summary>
+ public const int Connection = 324;
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘 -> 鎵撳紑闈㈡澘涓昏彍鍗曪紝鍙充笂瑙掔偣鍑粄0}璁剧疆鎸夐挳锛岀偣鍑诲叆缃�
+ /// </summary>
+ public const int AddSimpleMultifunctionMsg = 325;
+ /// <summary>
+ /// 绠�绾︾幆澧冮潰鏉� -> 闀挎寜鈥滃紑鍏斥�濇寜閿�5绉掞紝鎵�鏈夌伅姣忚繘琛寋0}2娆′寒鏆楀垏鎹紝鍗冲叆缃戞垚鍔�
+ /// </summary>
+ public const int AddSimpleEnvironmentMsg = 326;
+ /// <summary>
+ /// 闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
+ /// </summary>
+ public const int LongPressButtonSwitch = 327;
+ /// <summary>
+ /// 鏈�澶氬彲娣诲姞{0}涓�
+ /// </summary>
+ public const int AddMoreTip = 328;
+ /// <summary>
+ /// 缁戝畾
+ /// </summary>
+ public const int Bind = 329;
+ /// <summary>
+ /// 330=璇ヨ澶囨槸缁х數鍣紝褰撳墠鍙敮鎸佸甫鏈夎皟鍏夌殑鐏厜缁戝畾
+ /// </summary>
+ public readonly static int CanSelectDimmer = 330;
+ /// <summary>
+ /// 璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏夌粦瀹�
+ /// </summary>
+ public readonly static int CanSelectRelay = 331;
+ /// <summary>
+ /// 绌鸿皟鐩爣
+ /// </summary>
+ public const int AcTargets = 332;
+ /// <summary>
+ /// 涓嶇粦瀹氫换浣曠洰鏍�
+ /// </summary>
+ public const int BindEmptyTargets = 333;
+ /// <summary>
+ /// /鐫＄湢鏃堕棿
+ /// </summary>
+ public const int SleepTime = 334;
+ /// <summary>
+ /// 璀﹀憡锛佹暟鎹嚭閿欙紝蹇呴』鍒锋柊鍒楄〃锛屽惁鍒欐帶鍒剁幇璞￠敊涔�
+ /// </summary>
+ public const int UpdateBindList = 335;
+ /// <summary>
+ /// 鍚屾
+ /// </summary>
+ public const int Synchronization = 336;
+ /// <summary>
+ /// 鍚屾澶辫触
+ /// </summary>
+ public const int SynchronizationFailed = 337;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -882,10 +941,22 @@
public readonly static int timeSensitive = 5402;
public readonly static int executeSone = 5403;
public readonly static int hour1 = 5404;
+ public readonly static int mi = 5405;
+ public readonly static int nightLightSwitch = 5406;
+ public readonly static int colorTemperature = 5407;
+ public readonly static int buzzer = 5408;
+ public readonly static int ambientLight = 5409;
+ public readonly static int illuminanceValue = 5410;
+ public readonly static int dark = 5411;
+ public readonly static int bright = 5412;
+ public readonly static int tipIlluminanceValue = 5413;
+ public readonly static int videoIntercom = 5414;
+ public readonly static int dong = 5415;
+ public readonly static int unit = 5416;
+ public readonly static int theOutdoorUnit = 5417;
- #region 鐧诲綍娉ㄥ唽
/// <summary>
/// HDL Home
/// </summary>
@@ -894,9 +965,6 @@
/// 甯哥敤
/// </summary>
public const int Favorite = 10001;
-
-
-
/// <summary>
/// 鎵嬫満鍙�
/// </summary>
@@ -1034,10 +1102,6 @@
/// </summary>
public const int PleaseInputVerificationCode = 10133;
/// <summary>
- /// 鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
- /// </summary>
- public const int LoginByWechat = 10134;
- /// <summary>
/// 鐧诲綍涓�...
/// </summary>
public const int Logining = 10135;
@@ -1045,10 +1109,6 @@
/// 褰撳墠浣忓畢涓虹┖锛岃鍏堝缓绔嬩綇瀹�
/// </summary>
public const int CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst = 10136;
- /// <summary>
- /// 浣忓畢鍚嶇О涓虹┖
- /// </summary>
- public const int TheResidenceNameNull = 10137;
/// <summary>
/// 閭閿欒锛岃閲嶆柊杈撳叆
/// </summary>
@@ -1061,10 +1121,6 @@
/// 璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
/// </summary>
public const int ThePWDLengthError = 10140;
- /// <summary>
- /// 浣犲凡琚己鍒朵笅绾匡紒
- /// </summary>
- public const int YouHaveBeenSignOut = 10141;
/// <summary>
/// 鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷�
/// </summary>
@@ -1081,10 +1137,8 @@
/// 宸叉湁璐﹀彿锛熺櫥褰�
/// </summary>
public const int LoginByAccountPWD_1 = 10145;
-
-
/// <summary>
- /// 鏀规埧闂村悕绉板凡瀛樺湪
+ /// 璇ユ埧闂村悕绉板凡瀛樺湪
/// </summary>
public const int HadSameRoom = 10150;
/// <summary>
@@ -1096,14 +1150,6 @@
/// </summary>
public const int ControlSceneFail = 10152;
/// <summary>
- /// 鍦烘櫙涓虹┖
- /// </summary>
- public const int TheSceneIsNull = 10153;
- /// <summary>
- /// 璇ュ満鏅腑娌℃湁鎵ц鐩爣
- /// </summary>
- public const int ThisSceneHaveNoDevice = 10154;
- /// <summary>
/// 鎿嶄綔澶辫触
/// </summary>
public const int FAIL = 10155;
@@ -1111,16 +1157,6 @@
/// 鍙戦�侀獙璇佺爜澶辫触
/// </summary>
public const int SENDFAIL = 10156;
- /// <summary>
- /// 缃戝叧涓嶅湪绾�
- /// </summary>
- public const int TheMainGatewayIsNotOnLine = 10157;
- /// <summary>
- /// 涓嬩竴姝�
- /// </summary>
- public const int Next = 10158;
-
-
/// <summary>
/// 宸叉槸鏈�鏂扮増鏈�
/// </summary>
@@ -1130,10 +1166,6 @@
/// </summary>
public const int Update = 10161;
/// <summary>
- /// 鏇存柊鍐呭
- /// </summary>
- public const int UpdateContent = 10162;
- /// <summary>
/// 鏇存柊澶辫触
/// </summary>
public const int UpdateAppFail = 10163;
@@ -1141,10 +1173,6 @@
/// 姝ｅ湪鏇存柊涓�...
/// </summary>
public const int Updating = 10164;
- /// <summary>
- /// 鍙栨秷鏇存柊
- /// </summary>
- public const int CancelUpdating = 10165;
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
@@ -1158,20 +1186,6 @@
/// </summary>
public const int UpdateVersion = 10168;
/// <summary>
- /// 鍗忚鏂囨湰淇℃伅鍐呭
- /// </summary>
- public const int SLA_Title = 10169;
- /// <summary>
- /// 鍗忚璇︾粏
- /// </summary>
- public const int SLA_Detail = 10170;
-
-
- #endregion
-
- #region 鍒嗙被
-
- /// <summary>
/// 鍔熻兘
/// </summary>
public const int Function = 11000;
@@ -1183,8 +1197,6 @@
/// 鑷姩鍖�
/// </summary>
public const int Automation = 11002;
-
-
/// <summary>
/// 娌℃湁鍔熻兘 璇峰湪涓汉涓績--璁惧绠＄悊澶勬坊鍔�
/// </summary>
@@ -1297,45 +1309,10 @@
/// 绌鸿皟妯″紡涓虹┖锛岃鍏堥厤缃�
/// </summary>
public const int AC_Model_None = 11037;
-
-
- #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;
/// <summary>
/// 娓╁害浼犳劅鍣�
/// </summary>
@@ -1344,12 +1321,6 @@
/// 婀垮害浼犳劅鍣�
/// </summary>
public const int HumiditySensor = 12111;
- /// <summary>
- /// 娓╂箍搴︿紶鎰熷櫒
- /// </summary>
- public const int TemperatureAndHumiditySensor = 12112;
-
-
/// <summary>
/// 鏈変汉
/// </summary>
@@ -1382,20 +1353,10 @@
/// 瀹夊叏
/// </summary>
public const int IASZone_Statu_Safe = 12507;
-
-
- #endregion
-
-
- #endregion
-
- #region 涓婚〉
-
/// <summary>
/// 鎴块棿鍒楄〃
/// </summary>
public const int RoomList = 13100;
-
/// <summary>
/// 閫夋嫨妤煎眰
/// </summary>
@@ -1592,9 +1553,6 @@
/// 璇ュ満鏅鍦ㄥ欢鏃讹紝璇风◢鍚�
/// </summary>
public const int TheSceneIsDelaying = 13149;
-
-
-
/// <summary>
/// 閫夋嫨鎽嗛
/// </summary>
@@ -1648,13 +1606,6 @@
/// 褰撳墠 浜害
/// </summary>
public const int CurrentLightLevel = 13604;
-
-
-
- #endregion
-
-
-
@@ -3040,7 +2991,7 @@
/// </summary>
public const int uCarbonMonoxideRevealed = 15393;
/// <summary>
- /// 鏈変笉鏄庣墿浣撶粡杩�
+ /// 鏈変汉缁忚繃
/// </summary>
public const int uHadUnKnowObjectPassed = 15394;
/// <summary>
@@ -5252,7 +5203,7 @@
/// </summary>
public const int uSendPasswordFail = 15980;
/// <summary>
- /// 閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+ /// 璇烽�夋嫨hdlZigbeeGW-xxxx缃戠粶
/// </summary>
public const int uPleaseSelectGatewayXXNet = 15981;
/// <summary>
@@ -5807,6 +5758,71 @@
/// DATA缁胯壊鎸囩ず鐏棯鐑�
/// </summary>
public const int uDataGreanPilotLampLinght = 16119;
+ /// <summary>
+ /// 鑱旂郴鏂瑰紡
+ /// </summary>
+ public const int uContactInformation = 16120;
+ /// <summary>
+ /// 璇疯緭鍏ユ偍鐨勮仈绯绘柟寮�
+ /// </summary>
+ public const int uPleaseInputYourContactInformation = 16121;
+ /// <summary>
+ /// 璇ュ唴瀹逛笉鑳界渷鐣�
+ /// </summary>
+ public const int uThisContentCanNotOmitted = 16122;
+ /// <summary>
+ /// Mini缃戝叧
+ /// </summary>
+ public const int uMiniGateway = 16123;
+ /// <summary>
+ /// 娣诲姞Mini缃戝叧
+ /// </summary>
+ public const int uAddMiniGateway = 16124;
+ /// <summary>
+ /// 鎻掔數鍚�,闀挎寜缃戝叧HID/WCFG鎸夐敭5绉抺0}绯荤粺鐏父浜�60绉掑悗鍒欒繘鍏ラ厤缃戠姸鎬�
+ /// </summary>
+ public const int uAddMiniGatewayMsg1 = 16125;
+ /// <summary>
+ /// 鑹叉俯
+ /// </summary>
+ public const int uColorTemperature = 16128;
+ /// <summary>
+ /// Mini澶滅伅
+ /// </summary>
+ public const int uMiniNightLight = 16129;
+ /// <summary>
+ /// 鐕冩皵娉勯湶
+ /// </summary>
+ public const int uGasLeakage = 16130;
+ /// <summary>
+ /// 蹇界暐
+ /// </summary>
+ public const int uNeglect = 16131;
+ /// <summary>
+ /// 铚傞福鍣ㄥ紑鍏�
+ /// </summary>
+ public const int uBuzzerSwitch = 16132;
+ /// <summary>
+ /// 灏忓鐏紑鍏�
+ /// </summary>
+ public const int uMiniLightSwitch = 16133;
+ /// <summary>
+ /// 璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
+ /// </summary>
+ public const int uSetDeviceFunctionTypeFail = 16134;
+ /// <summary>
+ /// 鑾峰彇鍦烘櫙鍒楄〃澶辫触,缃戝叧鍥炲瓒呮椂
+ /// </summary>
+ public const int uGetSceneListFailAndTimeOut = 16135;
+ /// <summary>
+ /// 闇�閲嶆柊缁戝畾
+ /// </summary>
+ public const int uNeedToRebind = 16136;
+ /// <summary>
+ /// 鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
+ /// </summary>
+ public const int uUnKnownErrorAndLostData = 16137;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -6035,14 +6051,17 @@
/// </summary>
public const int uAddFangyueEnvironmentPanelMsg = 21021;
/// <summary>
- /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+ /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
/// </summary>
public const int uAddCurtaunPanelMsg = 21022;
/// <summary>
/// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
/// </summary>
public const int uAddSensorCeilingGasMsg = 21023;
-
+ /// <summary>
+ /// 鐞冨瀷绉诲姩浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorSphericalMotionMsg = 21024;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6208,7 +6227,27 @@
/// <summary>
/// 闀滃儚ID涓�1307鐨勮澶囩殑榛樿鍚嶅瓧锛歅M2.5绌烘皵璐ㄩ噺浼犳劅鍣�
/// </summary>
- public const int uDeviceModelId1307 = 30040;
+ public const int uDeviceModelId1307 = 30040;
+ /// <summary>
+ /// 闀滃儚ID涓�212鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾﹀鍔熻兘闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId212 = 30041;
+ /// <summary>
+ /// 闀滃儚ID涓�230鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾︾幆澧冮潰鏉�
+ /// </summary>
+ public const int uDeviceModelId230 = 30042;
+ /// <summary>
+ /// 闀滃儚ID涓�11鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歁ini缃戝叧
+ /// </summary>
+ public const int uDeviceModelId11 = 30043;
+ /// <summary>
+ /// 闀滃儚ID涓�20000鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氳壊娓╃伅
+ /// </summary>
+ public const int uDeviceModelId20000 = 30044;
+ /// <summary>
+ /// 闀滃儚ID涓�1205鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱悆鍨嬬Щ鍔ㄤ紶鎰熷櫒
+ /// </summary>
+ public const int uDeviceModelId1205 = 30045;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6404,5 +6443,18 @@
/// PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
/// </summary>
public const int uDeviceDirectionName27 = 70026;
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName28 = 70027;
+ /// <summary>
+ /// 绠�绾︾幆澧冮潰鏉�
+ /// </summary>
+ public const int uDeviceDirectionName29 = 70028;
+ /// <summary>
+ /// 鐞冨瀷绉诲姩浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName30 = 70029;
+
}
}
--
Gitblit v1.8.0