From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期五, 28 二月 2020 15:25:13 +0800 Subject: [PATCH] 2020.2.28 --- ZigbeeApp/Shared/R.cs | 414 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 378 insertions(+), 36 deletions(-) diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs old mode 100755 new mode 100644 index 23ea4c2..1d3c336 --- a/ZigbeeApp/Shared/R.cs +++ b/ZigbeeApp/Shared/R.cs @@ -264,7 +264,7 @@ public readonly static int AfterFiftySeconds = 178; //闂ㄩ攣楠岃瘉瀵嗙爜澶辫触 public readonly static int OperrateFailed = 179; - public readonly static int RemoteUnlockBindSucessTip1 = 180; + public readonly static int RemoteUnlockBindSucessTip = 180; public readonly static int RemoteUnlockBindSucessTip2 = 181; public readonly static int CLose = 182; public readonly static int Opening = 183; @@ -309,6 +309,12 @@ public readonly static int OffLineScene = 222; public readonly static int SureClearKeyModeAndTargets = 223; public readonly static int BindDeviceTargetIsEmpty = 224; + public readonly static int PanelBindTargets = 225; + public readonly static int ClearAllTargets = 226; + public readonly static int ClearAllTargeta2 = 227; + public readonly static int DoorlockConfirm = 228; + public readonly static int DistributeSuccess = 229; + public readonly static int SureToUnFreeze = 230; public readonly static int RemindSetting = 548; public readonly static int AddNewUser = 650; @@ -579,6 +585,13 @@ public readonly static int usertip = 5370; public readonly static int scenetip = 5371; public readonly static int securitytip = 5372; + public readonly static int defaulttext = 5373; + public readonly static int addsensor = 5374; + public readonly static int addlighting = 5375; + public readonly static int application = 5376; + public readonly static int automationaddtext = 5377; + public readonly static int tiptextnull = 5378; + public readonly static int tiplocktextnull = 5379; #region 鐧诲綍娉ㄥ唽 /// <summary> @@ -637,7 +650,7 @@ /// </summary> public const int LoginByAccountPWD = 10110; /// <summary> - /// 鍙戦�侀獙璇佺爜 + /// 鑾峰彇楠岃瘉鐮� /// </summary> public const int SendVerificationCode = 10111; /// <summary> @@ -751,7 +764,7 @@ /// <summary> /// 鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏� /// </summary> - public const int ThePhoneError = 10139; + public const int ThePhoneError = 10139; /// <summary> /// 璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜 /// </summary> @@ -760,6 +773,22 @@ /// 浣犲凡琚己鍒朵笅绾匡紒 /// </summary> public const int YouHaveBeenSignOut = 10141; + /// <summary> + /// 鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷� + /// </summary> + public const int NEWPASSWORDANDOLDPASSWORDEQUAL = 10142; + /// <summary> + /// 璇峰厛鑾峰彇楠岃瘉鐮� + /// </summary> + public const int NORECORD = 10143; + /// <summary> + /// 蹇樿瀵嗙爜锛� + /// </summary> + public const int ForgotPWD_1 = 10144; + /// <summary> + /// 宸叉湁璐﹀彿锛熺櫥褰� + /// </summary> + public const int LoginByAccountPWD_1 = 10145; /// <summary> @@ -794,6 +823,10 @@ /// 缃戝叧涓嶅湪绾� /// </summary> public const int TheMainGatewayIsNotOnLine = 10157; + /// <summary> + /// 涓嬩竴姝� + /// </summary> + public const int Next = 10158; /// <summary> @@ -861,17 +894,17 @@ /// <summary> - /// 娌℃湁鍔熻兘 璇峰湪涓汉涓績涓�--璁惧绠$悊澶勬坊鍔� + /// 娌℃湁鍔熻兘 璇峰湪涓汉涓績--璁惧绠$悊澶勬坊鍔� /// </summary> public const int NoFunction = 11010; /// <summary> /// 缂栬緫 /// </summary> public const int Edit = 11011; - /// <summary> - /// 璁剧疆鍔熻兘 - /// </summary> - public const int FunctionSetting = 11012; + /// <summary> + /// 鍔熻兘璁剧疆 + /// </summary> + public const int FunctionSetting = 11012; /// <summary> /// 淇℃伅缂栬緫 /// </summary> @@ -960,6 +993,19 @@ /// 纭畾瑕佺Щ闄よ鍔熻兘锛� /// </summary> public const int DeleteFunction = 11034; + /// <summary> + /// 娣诲姞鍔熻兘 + /// </summary> + public const int AddFunction = 11035; + /// <summary> + /// 娣诲姞寤舵椂 + /// </summary> + public const int AddDelayTime = 11036; + /// <summary> + /// 绌鸿皟妯″紡涓虹┖锛岃鍏堥厤缃� + /// </summary> + public const int AC_Model_None = 11037; + #region 璁惧绫诲瀷 /// <summary> @@ -1010,6 +1056,41 @@ /// 娓╂箍搴︿紶鎰熷櫒 /// </summary> public const int TemperatureAndHumiditySensor = 12112; + + + /// <summary> + /// 鏈変汉 + /// </summary> + public const int IASZone_Statu_HavePerson = 12500; + /// <summary> + /// 鏃犱汉 + /// </summary> + public const int IASZone_Statu_NoPerson = 12501; + /// <summary> + /// 婕忔按 + /// </summary> + public const int IASZone_Statu_HaveWater = 12502; + /// <summary> + /// 姝e父 + /// </summary> + public const int IASZone_Statu_Normal = 12503; + /// <summary> + /// 寮�鍚� + /// </summary> + public const int IASZone_Statu_Open = 12504; + /// <summary> + /// 闂悎 + /// </summary> + public const int IASZone_Statu_Close = 12505; + /// <summary> + /// 鎶ヨ + /// </summary> + public const int IASZone_Statu_Alarm = 12506; + /// <summary> + /// 瀹夊叏 + /// </summary> + public const int IASZone_Statu_Safe = 12507; + #endregion @@ -1256,29 +1337,40 @@ public const int NeedCleanAC = 13511; /// <summary> - /// 娌″姛鑳� 璇峰厛娣诲姞 + /// 杩樻病鏈夊姛鑳藉摝 /// </summary> public const int NoFunction_Tip = 13600; /// <summary> - /// 娌″満鏅� 璇峰厛娣诲姞 + /// 杩樻病鏈夊満鏅摝 /// </summary> public const int NoScene_Tip = 13601; - + /// <summary> + /// 鏃� + /// </summary> + public const int No = 13602; + /// <summary> + /// 鑾峰彇涓�... + /// </summary> + public const int Getting = 13603; + /// <summary> + /// 褰撳墠 浜害 + /// </summary> + public const int CurrentLightLevel = 13604; #endregion - - /// <summary> - /// 瀵嗙爜闀垮害涓簕0}涓瓧绗� - /// </summary> - public const int PswLengthMsg = 15000; + + /// <summary> + /// 瀵嗙爜闀垮害涓簕0}涓瓧绗� + /// </summary> + public const int PswLengthMsg = 15000; /// <summary> /// 1涓皬鍐欏瓧姣� /// </summary> @@ -1816,7 +1908,7 @@ /// </summary> public const int uUserName = 15147; /// <summary> - /// Email + /// 閭 /// </summary> public const int uEmail = 15148; /// <summary> @@ -2860,13 +2952,13 @@ /// </summary> public const int uGetDeviceVersionFail = 15448; /// <summary> - /// 鑾峰彇浼犳劅鍣ㄧ伅鍏夎缃俊鎭け璐� + /// 鑾峰彇浼犳劅鍣ㄨ缃俊鎭け璐� /// </summary> - public const int uGetPirSensorLightSettionFail = 15449; + public const int uGetPirSensorSettionFail = 15449; /// <summary> - /// 璁剧疆浼犳劅鍣ㄧ伅鍏夐厤缃け璐� + /// 璁剧疆浼犳劅鍣ㄩ厤缃俊鎭け璐� /// </summary> - public const int uSetPirSensorLightSettionFail = 15450; + public const int uSetPirSensorSettionFail = 15450; /// <summary> /// 鐧藉ぉ /// </summary> @@ -3315,10 +3407,6 @@ /// 纭畾绉婚櫎閫変腑鐨勮澶囷紵 /// </summary> public const int uConfirmRemoveSelectDeviceMsg = 15578; - /// <summary> - /// 鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け - /// </summary> - public const int uUnknownErrorAndDataLost = 15579; /// <summary> /// 鍏变韩鏁版嵁鍚屾涓� /// </summary> @@ -4236,9 +4324,9 @@ /// </summary> public const int uCommitCurtainDownLimitMsg = 15819; /// <summary> - /// 濡傛灉婊¤冻 + /// 濡傛灉婊¤冻浣庝寒搴︾幆澧� /// </summary> - public const int uIfSatisfied = 15820; + public const int uIfTheLowBrightnessEnvironmentIsSatisfied = 15820; /// <summary> /// 灏变細 /// </summary> @@ -4260,9 +4348,9 @@ /// </summary> public const int uSecond = 15825; /// <summary> - /// 鐓ф槑绛夌骇 + /// 鐓у害鍊� /// </summary> - public const int uLightLevel = 15826; + public const int uIlluminationValue = 15826; /// <summary> /// 浣� /// </summary> @@ -4640,7 +4728,7 @@ /// </summary> public const int uSubmit = 15922; /// <summary> - /// 鎻愪氦鎴愬姛,鎰熻阿鎮ㄧ殑鎰忚 + /// 鎮ㄧ殑鍙嶉宸叉垚鍔熸彁浜� /// </summary> public const int uSubmitSuccessMsg = 15923; /// <summary> @@ -4975,6 +5063,235 @@ /// 姝e湪閲嶇疆鐢垫満 /// </summary> public const int uElectricalMachineryResetting = 16006; + /// <summary> + /// 澶ч噾绌鸿皟妯″潡 + /// </summary> + public const int uDakAirConditioningModule = 16007; + /// <summary> + /// 娌℃湁鍙崌绾х殑绌鸿皟妯″潡 + /// </summary> + public const int uNotHadAirConditioningUpdateModule = 16008; + /// <summary> + /// 绌鸿皟鍗囩骇妯″潡 + /// </summary> + public const int uAirConditioningUpdateModule = 16009; + /// <summary> + /// 鑾峰彇绌鸿皟妯″潡鐗堟湰澶辫触 + /// </summary> + public const int uGetAirConditionerModelVersionFail = 16010; + /// <summary> + /// 鍙戦�佸崌绾у懡浠ゅけ璐� + /// </summary> + public const int uSendUpdateComandFail = 16011; + /// <summary> + /// 鐗堟湰鍙风浉鍚�,鍗囩骇澶辫触 + /// </summary> + public const int uVersionIsEqualAndUpdateFail = 16012; + /// <summary> + /// 鏍¢獙鐗堟湰鍙峰け璐� + /// </summary> + public const int uCheckVersionFail = 16013; + /// <summary> + /// 妫�娴嬭澶囩増鏈� + /// </summary> + public const int uCheckDeviceVersion = 16014; + /// <summary> + /// 鍝嶅簲瓒呮椂,妫�娴嬭澶囩増鏈け璐� + /// </summary> + public const int uResponseTimeoutsAndCheckDeviceVersionFail = 16015; + /// <summary> + /// 姝e湪鍙戦�佸崌绾у畬鎴愮殑鍛戒护 + /// </summary> + public const int uSendingFinishUpdateComand = 16016; + /// <summary> + /// 鍝嶅簲瓒呮椂,鍙戦�佸崌绾у畬鎴愮殑鍛戒护澶辫触 + /// </summary> + public const int uResponseTimeoutsAndSendingFinishUpdateComandFail = 16017; + /// <summary> + /// 閲嶅伐绌鸿皟妯″潡 + /// </summary> + public const int uHicAirConditioningModule = 16018; + /// <summary> + /// 鎸囩ず鐏彉缁裤�侀棯鐑� + /// </summary> + public const int uPilotLinghtInCreanAndLinght = 16019; + /// <summary> + /// 閽堝瓟寮忛噸缃寜閿� + /// </summary> + public const int uPinholeTypeResetButton = 16020; + /// <summary> + /// 淇″彿鍥炬爣蹇棯 + /// </summary> + public const int uSignalIconFlash = 16021; + /// <summary> + /// 淇″彿鍥炬爣 + /// </summary> + public const int uSignalIcon = 16022; + /// <summary> + /// 鎻愰啋 + /// </summary> + public const int uRemind = 16023; + /// <summary> + /// 缁戝畾鎴愬姛锛佷笅娆′綘鍙互鐢ㄥ井淇0}璐﹀彿蹇�熺櫥褰曞暒 + /// </summary> + public const int uBindWebchatSuccessMsg = 16024; + /// <summary> + /// 濂界殑 + /// </summary> + public const int uWell = 16025; + /// <summary> + /// 宸叉墽琛� + /// </summary> + public const int uExecuted = 16026; + /// <summary> + /// 闂ㄩ攣瑙﹀彂璀︽姤 + /// </summary> + public const int uDoorLocksAlarmHadTriggered = 16027; + /// <summary> + /// 鎴戠殑浣忓畢 + /// </summary> + public const int uMyResidence = 16028; + /// <summary> + /// 瀹㈠巺 + /// </summary> + public const int uLivingRoom = 16029; + /// <summary> + /// 闃冲彴 + /// </summary> + public const int uBalcony = 16030; + /// <summary> + /// 鍗у + /// </summary> + public const int uBedroom = 16031; + /// <summary> + /// 宸﹀彸婊戝姩,鍒囨崲鎴块棿鍗$墖 + /// </summary> + public const int uSlideLeftAndRightToSwitchRoomCards = 16032; + /// <summary> + /// 鍙虫粦杩涘叆鎴块棿鍒楄〃 + /// </summary> + public const int uSlideRightToRoomList = 16033; + /// <summary> + /// 闂厜鐏� + /// </summary> + public const int uFlashlamp = 16034; + /// <summary> + /// 鎴块棿鐨勫唴瀹瑰湪姝ゅ鏄剧ず + /// </summary> + public const int uTheContentsOfTheRoomAreShownHere = 16035; + /// <summary> + /// 鎴戠煡閬撲簡 + /// </summary> + public const int uIKnwon = 16036; + /// <summary> + /// 鍒嗕韩鏁版嵁宸茬粡鍙樻洿,璇烽噸鏂扮櫥闄� + /// </summary> + public const int uShardDataIsChangedPleaseLoginAgain = 16037; + /// <summary> + /// 宸ヤ綔妯″紡 + /// </summary> + public const int uWorkMode = 16038; + /// <summary> + /// 鎺у埗妯″紡 + /// </summary> + public const int uControlMode = 16039; + /// <summary> + /// 瑙﹀彂妯″紡 + /// </summary> + public const int uTriggerMode = 16040; + /// <summary> + /// 涓婃姤闂撮殧 + /// </summary> + public const int uReportTimeSpace = 16041; + /// <summary> + /// 鍏ㄨ嚜鍔ㄦā寮� + /// </summary> + public const int uFullAutoMode = 16042; + /// <summary> + /// 鍗婅嚜鍔ㄦā寮� + /// </summary> + public const int uHafeAutoMode = 16043; + /// <summary> + /// 璋冨厜妯″紡 + /// </summary> + public const int uDimmingMode = 16044; + /// <summary> + /// 寮�鍏虫ā寮� + /// </summary> + public const int uSwitchMode = 16045; + /// <summary> + /// 寮�鐏寒搴� + /// </summary> + public const int uTurnOnBrightness = 16046; + /// <summary> + /// 鎱㈠惎鍔� + /// </summary> + public const int uSlowStartup = 16047; + /// <summary> + /// 鎱㈠叧闂� + /// </summary> + public const int uSlowClose = 16048; + /// <summary> + /// 浜害 + /// </summary> + public const int uBrightness = 16049; + /// <summary> + /// 鑾峰彇浼犳劅鍣ㄤ寒搴﹀�煎け璐� + /// </summary> + public const int uGetPirSensorLuxFail = 16050; + /// <summary> + /// 褰撳墠浜害鍊� + /// </summary> + public const int uNowBrightnessValue = 16051; + /// <summary> + /// 鏆� + /// </summary> + public const int uDark = 16052; + /// <summary> + /// 浜� + /// </summary> + public const int uBright = 16053; + /// <summary> + /// 鍦ㄥ鍐呮潯浠朵笅锛岄粍鏄忕収搴﹀�肩害涓�10lux锛岄槾澶╃収搴﹀�肩害涓�5~50lux锛岃鏍规嵁瀹為檯闇�瑕佽繘琛岃皟鑺� + /// </summary> + public const int uPirBrightnessTipMsg = 16054; + /// <summary> + /// 闇囧姩鍙嶉 + /// </summary> + public const int uVibrationFeedback = 16055; + /// <summary> + /// 鑾峰彇闇囧姩鍙嶉閰嶇疆淇℃伅澶辫触 + /// </summary> + public const int uGetVibrationFeedbackSettionFail = 16056; + /// <summary> + /// 璁剧疆闇囧姩鍙嶉閰嶇疆淇℃伅澶辫触 + /// </summary> + public const int uSetVibrationFeedbackSettionFail = 16057; + /// <summary> + /// 鎴戠殑瀹� + /// </summary> + public const int uMyHome = 16058; + /// <summary> + /// 闀挎寜鈥滄垜鐨勫鈥漿0}鍙垏鎹㈡垜鐨勪綇瀹� + /// </summary> + public const int uLongClickMyHomeCanChangedHome = 16059; + /// <summary> + /// 鍔炲叕瀹� + /// </summary> + public const int uWorkRoom = 16060; + /// <summary> + /// 鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈� + /// </summary> + public const int uCurtainDataIsErrorPleaseResetCurtain = 16061; + /// <summary> + /// 鑾峰彇绌鸿皟鎽嗛鐘舵�佸け璐� + /// </summary> + public const int uGetAirConditionerSwingFunctionFail = 16062; + /// <summary> + /// 璁剧疆绌鸿皟鎽嗛澶辫触 + /// </summary> + public const int uSetAirConditionerSwingFunctionFail = 16063; + //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽� /// <summary> @@ -5018,7 +5335,7 @@ /// </summary> public const int ValidatorCode_ValidCodeAndPhoneNoEqual = 18016; /// <summary> - /// 鏈彂閫侀獙璇佺爜鍒版璐﹀彿 + /// 楠岃瘉鐮佸凡澶辨晥 /// </summary> public const int ValidatorCode_NoRecord = 18017; /// <summary> @@ -5177,6 +5494,15 @@ /// 绌鸿皟 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛 /// </summary> public const int uAddAirConditionerZbGatewayMsg = 21015; + /// <summary> + /// Pir浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�亄0}闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛 + /// </summary> + public const int uAddSensorPirMsg = 21016; + /// <summary> + /// 娓╂箍搴︿紶鎰熷櫒 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛 + /// </summary> + public const int uAddSensorTemperatureAndHumidityMsg = 21017; + //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽� /// <summary> @@ -5298,7 +5624,7 @@ //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽� /// <summary> - /// 鑷畾涔夎澶囨墍灞濱D涓�100鐨勭炕璇戝悕瀛楋細绐楀笜 + /// 鑷畾涔夎澶囨墍灞濱D涓�100鐨勭炕璇戝悕瀛楋細閬槼 /// </summary> public const int uDeviceBelongId100 = 40000; /// <summary> @@ -5318,7 +5644,7 @@ /// </summary> public const int uDeviceBelongId2500 = 40004; /// <summary> - /// 鑷畾涔夎澶囨墍灞濱D涓�2800鐨勭炕璇戝悕瀛楋細鏅鸿兘闂ㄩ攣 + /// 鑷畾涔夎澶囨墍灞濱D涓�2800鐨勭炕璇戝悕瀛楋細闂ㄩ攣 /// </summary> public const int uDeviceBelongId2800 = 40005; /// <summary> @@ -5330,7 +5656,7 @@ /// </summary> public const int uDeviceBelongId3900 = 40007; /// <summary> - /// 鑷畾涔夎澶囨墍灞濱D涓�4100鐨勭炕璇戝悕瀛楋細绌烘皵寮�鍏� + /// 鑷畾涔夎澶囨墍灞濱D涓�4100鐨勭炕璇戝悕瀛楋細鏅鸿兘绌哄紑 /// </summary> public const int uDeviceBelongId4100 = 40008; /// <summary> @@ -5346,12 +5672,28 @@ /// </summary> public const int uDeviceBelongId10 = 40011; /// <summary> - /// 鑷畾涔夎澶囨墍灞濱D涓�10鐨勭炕璇戝悕瀛楋細娓╁害浼犳劅鍣� + /// 鑷畾涔夎澶囨墍灞濱D涓�11鐨勭炕璇戝悕瀛楋細娓╁害浼犳劅鍣� /// </summary> public const int uDeviceBelongId11 = 40012; /// <summary> - /// 鑷畾涔夎澶囨墍灞濱D涓�10鐨勭炕璇戝悕瀛楋細婀垮害浼犳劅鍣� + /// 鑷畾涔夎澶囨墍灞濱D涓�12鐨勭炕璇戝悕瀛楋細婀垮害浼犳劅鍣� /// </summary> public const int uDeviceBelongId12 = 40013; + /// <summary> + /// 鑷畾涔夎澶囨墍灞濱D涓�13鐨勭炕璇戝悕瀛楋細寮�鍏� + /// </summary> + public const int uDeviceBelongId13 = 15665; + /// <summary> + /// 鑷畾涔夎澶囨墍灞濱D涓�14鐨勭炕璇戝悕瀛楋細鎻掑骇 + /// </summary> + public const int uDeviceBelongId14 = 15666; + /// <summary> + /// 鑷畾涔夎澶囨墍灞濱D涓�15鐨勭炕璇戝悕瀛楋細鐏厜 + /// </summary> + public const int uDeviceBelongId15 = 15071; + /// <summary> + /// 鑷畾涔夎澶囨墍灞濱D涓�16鐨勭炕璇戝悕瀛楋細骞叉帴鐐� + /// </summary> + public const int uDeviceBelongId16 = 40014; } } -- Gitblit v1.8.0