From eb5a57942bae8eb57fd7fb61124c247bebb67e8e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 19 六月 2020 10:18:28 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
Home0618/Shared/R.cs | 185 ++++++++++++++--------------------------------
1 files changed, 57 insertions(+), 128 deletions(-)
diff --git a/Home0618/Shared/R.cs b/Home0618/Shared/R.cs
index d71eec2..f6d11b0 100644
--- a/Home0618/Shared/R.cs
+++ b/Home0618/Shared/R.cs
@@ -350,7 +350,7 @@
/// </summary>
public const int AddFreshAirModulPanelMsg = 239;
/// <summary>
- /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+ /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
/// </summary>
public const int SetDoorLockNomallyOpen = 241;
/// <summary>
@@ -631,11 +631,11 @@
/// </summary>
public const int Bind = 329;
/// <summary>
- /// 330=璇ヨ澶囨槸缁х數鍣紝褰撳墠鍙敮鎸佸甫鏈夎皟鍏夌殑鐏厜缁戝畾
+ /// 330=璇ヨ澶囨槸缁х數鍣紝褰撳墠鍙敮鎸佸甫鏈夎皟鍏夌殑鐏厜缁戝畾
/// </summary>
public readonly static int CanSelectDimmer = 330;
/// <summary>
- /// 璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏夌粦瀹�
+ /// 璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏夌粦瀹�
/// </summary>
public readonly static int CanSelectRelay = 331;
@@ -938,10 +938,9 @@
public readonly static int timeSensitive = 5402;
public readonly static int executeSone = 5403;
public readonly static int hour1 = 5404;
+ public readonly static int mi = 5405;
-
- #region 鐧诲綍娉ㄥ唽
/// <summary>
/// HDL Home
/// </summary>
@@ -950,9 +949,6 @@
/// 甯哥敤
/// </summary>
public const int Favorite = 10001;
-
-
-
/// <summary>
/// 鎵嬫満鍙�
/// </summary>
@@ -1090,10 +1086,6 @@
/// </summary>
public const int PleaseInputVerificationCode = 10133;
/// <summary>
- /// 鍗冲皢閫氳繃寰俊鎺堟潈鐧诲綍
- /// </summary>
- public const int LoginByWechat = 10134;
- /// <summary>
/// 鐧诲綍涓�...
/// </summary>
public const int Logining = 10135;
@@ -1101,10 +1093,6 @@
/// 褰撳墠浣忓畢涓虹┖锛岃鍏堝缓绔嬩綇瀹�
/// </summary>
public const int CurrentlyTheUserIshHouseIsEmptyPleaseBuildANewHouseFirst = 10136;
- /// <summary>
- /// 浣忓畢鍚嶇О涓虹┖
- /// </summary>
- public const int TheResidenceNameNull = 10137;
/// <summary>
/// 閭閿欒锛岃閲嶆柊杈撳叆
/// </summary>
@@ -1117,10 +1105,6 @@
/// 璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
/// </summary>
public const int ThePWDLengthError = 10140;
- /// <summary>
- /// 浣犲凡琚己鍒朵笅绾匡紒
- /// </summary>
- public const int YouHaveBeenSignOut = 10141;
/// <summary>
/// 鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷�
/// </summary>
@@ -1137,10 +1121,8 @@
/// 宸叉湁璐﹀彿锛熺櫥褰�
/// </summary>
public const int LoginByAccountPWD_1 = 10145;
-
-
/// <summary>
- /// 鏀规埧闂村悕绉板凡瀛樺湪
+ /// 璇ユ埧闂村悕绉板凡瀛樺湪
/// </summary>
public const int HadSameRoom = 10150;
/// <summary>
@@ -1152,14 +1134,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;
@@ -1167,16 +1141,6 @@
/// 鍙戦�侀獙璇佺爜澶辫触
/// </summary>
public const int SENDFAIL = 10156;
- /// <summary>
- /// 缃戝叧涓嶅湪绾�
- /// </summary>
- public const int TheMainGatewayIsNotOnLine = 10157;
- /// <summary>
- /// 涓嬩竴姝�
- /// </summary>
- public const int Next = 10158;
-
-
/// <summary>
/// 宸叉槸鏈�鏂扮増鏈�
/// </summary>
@@ -1186,10 +1150,6 @@
/// </summary>
public const int Update = 10161;
/// <summary>
- /// 鏇存柊鍐呭
- /// </summary>
- public const int UpdateContent = 10162;
- /// <summary>
/// 鏇存柊澶辫触
/// </summary>
public const int UpdateAppFail = 10163;
@@ -1197,10 +1157,6 @@
/// 姝ｅ湪鏇存柊涓�...
/// </summary>
public const int Updating = 10164;
- /// <summary>
- /// 鍙栨秷鏇存柊
- /// </summary>
- public const int CancelUpdating = 10165;
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
@@ -1214,20 +1170,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;
@@ -1239,8 +1181,6 @@
/// 鑷姩鍖�
/// </summary>
public const int Automation = 11002;
-
-
/// <summary>
/// 娌℃湁鍔熻兘 璇峰湪涓汉涓績--璁惧绠＄悊澶勬坊鍔�
/// </summary>
@@ -1353,45 +1293,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>
@@ -1400,12 +1305,6 @@
/// 婀垮害浼犳劅鍣�
/// </summary>
public const int HumiditySensor = 12111;
- /// <summary>
- /// 娓╂箍搴︿紶鎰熷櫒
- /// </summary>
- public const int TemperatureAndHumiditySensor = 12112;
-
-
/// <summary>
/// 鏈変汉
/// </summary>
@@ -1438,20 +1337,10 @@
/// 瀹夊叏
/// </summary>
public const int IASZone_Statu_Safe = 12507;
-
-
- #endregion
-
-
- #endregion
-
- #region 涓婚〉
-
/// <summary>
/// 鎴块棿鍒楄〃
/// </summary>
public const int RoomList = 13100;
-
/// <summary>
/// 閫夋嫨妤煎眰
/// </summary>
@@ -1648,9 +1537,6 @@
/// 璇ュ満鏅鍦ㄥ欢鏃讹紝璇风◢鍚�
/// </summary>
public const int TheSceneIsDelaying = 13149;
-
-
-
/// <summary>
/// 閫夋嫨鎽嗛
/// </summary>
@@ -1704,13 +1590,6 @@
/// 褰撳墠 浜害
/// </summary>
public const int CurrentLightLevel = 13604;
-
-
-
- #endregion
-
-
-
@@ -5308,7 +5187,7 @@
/// </summary>
public const int uSendPasswordFail = 15980;
/// <summary>
- /// 閫夋嫨hdlZigbeeGW-xxxx缃戠粶
+ /// 璇烽�夋嫨hdlZigbeeGW-xxxx缃戠粶
/// </summary>
public const int uPleaseSelectGatewayXXNet = 15981;
/// <summary>
@@ -5871,6 +5750,48 @@
/// 璇疯緭鍏ユ偍鐨勮仈绯绘柟寮�
/// </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;
+
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -6099,7 +6020,7 @@
/// </summary>
public const int uAddFangyueEnvironmentPanelMsg = 21021;
/// <summary>
- /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+ /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
/// </summary>
public const int uAddCurtaunPanelMsg = 21022;
/// <summary>
@@ -6281,6 +6202,14 @@
/// 闀滃儚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;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
--
Gitblit v1.8.0