From 7ed9cc5bb6a07a8358a2705797bd2b31c6e39fd4 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期四, 07 一月 2021 18:33:34 +0800 Subject: [PATCH] 2021-01-07 1.注册功能,忘记密码功能相关接口替换,UI界面修改调整。 --- Crabtree/SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs | 246 ++++++++++++++++++++++++------------------------ 1 files changed, 123 insertions(+), 123 deletions(-) diff --git a/Crabtree/SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs b/Crabtree/SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs index deece8f..774885c 100644 --- a/Crabtree/SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs +++ b/Crabtree/SmartHome/HDL/Common/HttpUtil/IMessageCommon.cs @@ -62,145 +62,145 @@ //dicMsg = new Dictionary<string, Dictionary<string, int>>(); #region 鍏遍�氶敊璇爜 stateCodeDic = new Dictionary<string, int>(); - ////涓庢湇鍔″櫒閫氳澶辫触 - //stateCodeDic ["NETWORK_ERROR"] = MyInternationalizationString.FailedRequestServer; - ////鏁版嵁寮傚父 - //stateCodeDic["DATA_EXCEPTION"] = MyInternationalizationString.DataExceptionPleaseTryAgain; - ////涓庢湇鍔″櫒閫氳澶辫触 - //stateCodeDic[StateCode.NETWORK_ERROR] = MyInternationalizationString.FailedRequestServer; - ////鏁版嵁寮傚父 - //stateCodeDic[StateCode.DATA_EXCEPTION] = MyInternationalizationString.DataExceptionPleaseTryAgain; - //#region 鍩虹鏈嶅姟 鏂伴敊璇爜 2020-12-07 - ////绯荤粺绻佸繖~璇风◢鍚庡啀璇晘 - //stateCodeDic["1"] = MyInternationalizationString.SystemIsBusy; - ////绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘 - //stateCodeDic["2"] = MyInternationalizationString.SystemMaintenance; - //////鏈嶅姟寮傚父 - ////stateCodeDic["3"] = MyInternationalizationString.SystemIsBusy; - ////绛惧悕閿欒 - //stateCodeDic["4"] = MyInternationalizationString.SignatureError; - ////璇锋眰澶辫触锛屽弬鏁板紓甯革紒 - //stateCodeDic["9"] = MyInternationalizationString.RequestFailedParameterException; - ////楠岃瘉鐮佹牎楠屽け璐� - //stateCodeDic[StateCode.VERIFICATION_CODE_WRONG] = MyInternationalizationString.VerificationCodeWrong; - ////楠岃瘉鐮佸彂閫侀绻侊紝璇风◢鍚庡啀璇曪紒 - //stateCodeDic["15"] = MyInternationalizationString.VerificationCodeSentFrequently; - ////楠岃瘉鐮佸彂閫佸け璐� - //stateCodeDic["16"] = MyInternationalizationString.FailedToSendVerificationCode; + //涓庢湇鍔″櫒閫氳澶辫触 + stateCodeDic ["NETWORK_ERROR"] = MyInternationalizationString.FailedRequestServer; + //鏁版嵁寮傚父 + stateCodeDic ["DATA_EXCEPTION"] = MyInternationalizationString.DataExceptionPleaseTryAgain; + //涓庢湇鍔″櫒閫氳澶辫触 + stateCodeDic [StateCode.NETWORK_ERROR] = MyInternationalizationString.FailedRequestServer; + //鏁版嵁寮傚父 + stateCodeDic [StateCode.DATA_EXCEPTION] = MyInternationalizationString.DataExceptionPleaseTryAgain; + #region 鍩虹鏈嶅姟 鏂伴敊璇爜 2020-12-07 + //绯荤粺绻佸繖~璇风◢鍚庡啀璇晘 + stateCodeDic ["1"] = MyInternationalizationString.SystemIsBusy; + //绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘 + stateCodeDic ["2"] = MyInternationalizationString.SystemMaintenance; + ////鏈嶅姟寮傚父 + //stateCodeDic["3"] = MyInternationalizationString.SystemIsBusy; + //绛惧悕閿欒 + stateCodeDic ["4"] = MyInternationalizationString.SignatureError; + //璇锋眰澶辫触锛屽弬鏁板紓甯革紒 + stateCodeDic ["9"] = MyInternationalizationString.RequestFailedParameterException; + //楠岃瘉鐮佹牎楠屽け璐� + stateCodeDic [StateCode.VERIFICATION_CODE_WRONG] = MyInternationalizationString.VerificationCodeWrong; + //楠岃瘉鐮佸彂閫侀绻侊紝璇风◢鍚庡啀璇曪紒 + stateCodeDic ["15"] = MyInternationalizationString.VerificationCodeSentFrequently; + //楠岃瘉鐮佸彂閫佸け璐� + stateCodeDic ["16"] = MyInternationalizationString.FailedToSendVerificationCode; - ////浼氳瘽瓒呮椂锛岃鏇存柊token - //stateCodeDic[StateCode.TOKEN_EXPIRED] = MyInternationalizationString.NotLogin; - ////瑙f瀽鐢ㄦ埛韬唤閿欒锛岃閲嶆柊鐧诲綍 - //stateCodeDic["10006"] = MyInternationalizationString.InvalidToken; - ////鎮ㄥ凡鍦ㄥ彟涓�涓澶囩櫥褰� - //stateCodeDic["10007"] = MyInternationalizationString.LoggedOnOtherDevices; - ////鐧诲綍澶辫触锛岃处鍙锋垨鑰呭瘑鐮侀敊璇� - //stateCodeDic["10008"] = MyInternationalizationString.LoginFailed_AccountOrPasswordError; - ////鐢ㄦ埛宸茬粡琚鐢� - //stateCodeDic["10009"] = MyInternationalizationString.TheAccountHasBeenDisabled; - ////璐﹀彿涓嶅瓨鍦� - //stateCodeDic[StateCode.ACCOUNT_NOT_EXIST] = MyInternationalizationString.AccountNotExist; - ////鐢ㄦ埛鏈櫥褰� - //stateCodeDic["10011"] = MyInternationalizationString.InvalidToken; - ////璐﹀彿宸插瓨鍦� - //stateCodeDic["10012"] = MyInternationalizationString.AccountExist; - ////鎵嬫満鍙峰凡娉ㄥ唽 - //stateCodeDic["10013"] = MyInternationalizationString.AccountExist; - ////閭宸叉敞鍐� - //stateCodeDic["10014"] = MyInternationalizationString.AccountExist; - ////鍘熷瘑鐮侀敊璇� - //stateCodeDic["10015"] = MyInternationalizationString.OldPwdNoYes; - ////缁戝畾鍙风爜閲嶅 - //stateCodeDic["10016"] = MyInternationalizationString.DuplicateBindingNumber; - ////娉ㄥ唽澶辫触 - //stateCodeDic["10017"] = MyInternationalizationString.RegistrationFailedPleaseTryAgain; - //////绉熸埛涓嶅瓨鍦� - ////stateCodeDic["10018"] = MyInternationalizationString.10018; - ////瀵嗙爜閿欒娆℃暟杩囧锛岃处鍙疯閿佸畾锛� - //stateCodeDic["10019"] = MyInternationalizationString.AccountLoginLock; - ////娌℃湁鏉冮檺 - //stateCodeDic["10105"] = MyInternationalizationString.PermissionDenied; - ////楠岃瘉鐮佸凡缁忓彂閫� - //stateCodeDic["10207"] = MyInternationalizationString.VerificationCodePrompt; - ////鍙戦�侀獙璇佺爜閿欒 - //stateCodeDic["10210"] = MyInternationalizationString.VerificationCodeWrong; + //浼氳瘽瓒呮椂锛岃鏇存柊token + stateCodeDic [StateCode.TOKEN_EXPIRED] = MyInternationalizationString.NotLogin; + //瑙f瀽鐢ㄦ埛韬唤閿欒锛岃閲嶆柊鐧诲綍 + stateCodeDic ["10006"] = MyInternationalizationString.InvalidToken; + //鎮ㄥ凡鍦ㄥ彟涓�涓澶囩櫥褰� + stateCodeDic ["10007"] = MyInternationalizationString.LoggedOnOtherDevices; + //鐧诲綍澶辫触锛岃处鍙锋垨鑰呭瘑鐮侀敊璇� + stateCodeDic ["10008"] = MyInternationalizationString.LoginFailed_AccountOrPasswordError; + //鐢ㄦ埛宸茬粡琚鐢� + stateCodeDic ["10009"] = MyInternationalizationString.TheAccountHasBeenDisabled; + //璐﹀彿涓嶅瓨鍦� + stateCodeDic [StateCode.ACCOUNT_NOT_EXIST] = MyInternationalizationString.AccountNotExist; + //鐢ㄦ埛鏈櫥褰� + stateCodeDic ["10011"] = MyInternationalizationString.InvalidToken; + //璐﹀彿宸插瓨鍦� + stateCodeDic ["10012"] = MyInternationalizationString.AccountExist; + //鎵嬫満鍙峰凡娉ㄥ唽 + stateCodeDic ["10013"] = MyInternationalizationString.AccountExist; + //閭宸叉敞鍐� + stateCodeDic ["10014"] = MyInternationalizationString.AccountExist; + //鍘熷瘑鐮侀敊璇� + stateCodeDic ["10015"] = MyInternationalizationString.OldPwdNoYes; + //缁戝畾鍙风爜閲嶅 + stateCodeDic ["10016"] = MyInternationalizationString.DuplicateBindingNumber; + //娉ㄥ唽澶辫触 + stateCodeDic ["10017"] = MyInternationalizationString.RegistrationFailedPleaseTryAgain; + ////绉熸埛涓嶅瓨鍦� + //stateCodeDic["10018"] = MyInternationalizationString.10018; + //瀵嗙爜閿欒娆℃暟杩囧锛岃处鍙疯閿佸畾锛� + stateCodeDic ["10019"] = MyInternationalizationString.AccountLoginLock; + //娌℃湁鏉冮檺 + stateCodeDic ["10105"] = MyInternationalizationString.PermissionDenied; + //楠岃瘉鐮佸凡缁忓彂閫� + stateCodeDic ["10207"] = MyInternationalizationString.VerificationCodePrompt; + //鍙戦�侀獙璇佺爜閿欒 + stateCodeDic ["10210"] = MyInternationalizationString.VerificationCodeWrong; - //////鏋氫妇绫诲瀷閿欒 - ////stateCodeDic["11003"] = MyInternationalizationString.11003; + ////鏋氫妇绫诲瀷閿欒 + //stateCodeDic["11003"] = MyInternationalizationString.11003; - ////-------------------瀛愯处鍙锋ā鍧�------------------- - ////瀛愯处鍙峰凡缁忓瓨鍦� - //stateCodeDic["10301"] = MyInternationalizationString.BindSubAccount_Exist; - ////瀛愯处鍙蜂笉瀛樺湪 - //stateCodeDic["10302"] = MyInternationalizationString.SubAccount_NoExists; - ////涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳 - //stateCodeDic["10303"] = MyInternationalizationString.BindSubAccount_SameAccount; - //////鐩稿悓鐨勮繙绋嬫帶鍒� - ////stateCodeDic["10304"] = MyInternationalizationString.uOperationFailed; - //////瀛愯处鍙锋樀绉板凡缁忓瓨鍦� - ////stateCodeDic["10305"] = MyInternationalizationString.BindSubAccount_Exist; - ////-------------------浣忓畢妯″潡------------------- - ////褰撳墠浣忓畢涓嶅睘浜庤璐﹀彿 - //stateCodeDic["10401"] = MyInternationalizationString.HomeIdAndTokenNoConsistent; - ////浣忓畢鍚嶇О宸插瓨鍦� - //stateCodeDic["10402"] = MyInternationalizationString.HomeName_Exist; - //////浣忓畢ID宸插瓨鍦� - ////stateCodeDic["10403"] = MyInternationalizationString.HOME_ID_EXISTS; - ////浣忓畢涓嶅瓨鍦� - //stateCodeDic["10404"] = MyInternationalizationString.Home_NoExists; - ////浣忓畢娌℃湁缁戝畾缃戝叧 - //stateCodeDic["10503"] = MyInternationalizationString.PleaseBindTheGatewayFirst; + //-------------------瀛愯处鍙锋ā鍧�------------------- + //瀛愯处鍙峰凡缁忓瓨鍦� + stateCodeDic ["10301"] = MyInternationalizationString.BindSubAccount_Exist; + //瀛愯处鍙蜂笉瀛樺湪 + stateCodeDic ["10302"] = MyInternationalizationString.SubAccount_NoExists; + //涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳 + stateCodeDic ["10303"] = MyInternationalizationString.BindSubAccount_SameAccount; + ////鐩稿悓鐨勮繙绋嬫帶鍒� + //stateCodeDic["10304"] = MyInternationalizationString.uOperationFailed; + ////瀛愯处鍙锋樀绉板凡缁忓瓨鍦� + //stateCodeDic["10305"] = MyInternationalizationString.BindSubAccount_Exist; + //-------------------浣忓畢妯″潡------------------- + //褰撳墠浣忓畢涓嶅睘浜庤璐﹀彿 + stateCodeDic ["10401"] = MyInternationalizationString.HomeIdAndTokenNoConsistent; + //浣忓畢鍚嶇О宸插瓨鍦� + stateCodeDic ["10402"] = MyInternationalizationString.HomeName_Exist; + ////浣忓畢ID宸插瓨鍦� + //stateCodeDic["10403"] = MyInternationalizationString.HOME_ID_EXISTS; + //浣忓畢涓嶅瓨鍦� + stateCodeDic ["10404"] = MyInternationalizationString.Home_NoExists; + //浣忓畢娌℃湁缁戝畾缃戝叧 + stateCodeDic ["10503"] = MyInternationalizationString.PleaseBindTheGatewayFirst; - //////璋冪敤鐢ㄦ埛妯″潡鎺ュ彛澶辫触 - ////stateCodeDic["10213"] = HDL_ON.MyInternationalizationString; + ////璋冪敤鐢ㄦ埛妯″潡鎺ュ彛澶辫触 + //stateCodeDic["10213"] = HDL_ON.MyInternationalizationString; - ////*********缃戝叧********* - ////缃戝叧涓嶅瓨鍦� - //stateCodeDic["10506"] = MyInternationalizationString.GatewayDoesNotExist; + //*********缃戝叧********* + //缃戝叧涓嶅瓨鍦� + stateCodeDic ["10506"] = MyInternationalizationString.GatewayDoesNotExist; - ////鎺у埗澶辫触 - //stateCodeDic["14007"] = MyInternationalizationString.ControlFailure; - ////缃戝叧绂荤嚎 - //stateCodeDic["14005"] = MyInternationalizationString.GatewayOffline; - ////璁惧绂荤嚎 - //stateCodeDic["14006"] = MyInternationalizationString.DeviceOffline; + //鎺у埗澶辫触 + stateCodeDic ["14007"] = MyInternationalizationString.ControlFailure; + //缃戝叧绂荤嚎 + stateCodeDic ["14005"] = MyInternationalizationString.GatewayOffline; + //璁惧绂荤嚎 + stateCodeDic ["14006"] = MyInternationalizationString.DeviceOffline; - ////*********鍦烘櫙/鑷姩鍖�********* - ////鍦烘櫙宸插瓨鍦� - //stateCodeDic["14501"] = MyInternationalizationString.SceneAlreadyExists; - ////鑷姩鍖栧凡瀛樺湪 - //stateCodeDic["14502"] = MyInternationalizationString.AutomationAlreadyExists; + //*********鍦烘櫙/鑷姩鍖�********* + //鍦烘櫙宸插瓨鍦� + stateCodeDic ["14501"] = MyInternationalizationString.SceneAlreadyExists; + //鑷姩鍖栧凡瀛樺湪 + stateCodeDic ["14502"] = MyInternationalizationString.AutomationAlreadyExists; - ////*********璁惧********* - ////璁惧鐩爣閲嶅 - //stateCodeDic["10801"] = MyInternationalizationString.DuplicateDeviceTarget; - ////娌℃湁杩滅▼鎺у埗鏉冮檺 - //stateCodeDic["10802"] = MyInternationalizationString.NoRemoteControlPermission; - ////璁惧涓嶈兘涓虹┖ - //stateCodeDic["10803"] = MyInternationalizationString.TheDeviceCannotBeEmpty; - ////鐢ㄦ埛娌℃湁璁惧鐨勬潈闄� - //stateCodeDic["10804"] = MyInternationalizationString.NotHavePermissionToTheDevice; - ////璁惧涓嶅瓨鍦� - //stateCodeDic["10805"] = MyInternationalizationString.TheDeviceDoesNotExist; + //*********璁惧********* + //璁惧鐩爣閲嶅 + stateCodeDic ["10801"] = MyInternationalizationString.DuplicateDeviceTarget; + //娌℃湁杩滅▼鎺у埗鏉冮檺 + stateCodeDic ["10802"] = MyInternationalizationString.NoRemoteControlPermission; + //璁惧涓嶈兘涓虹┖ + stateCodeDic ["10803"] = MyInternationalizationString.TheDeviceCannotBeEmpty; + //鐢ㄦ埛娌℃湁璁惧鐨勬潈闄� + stateCodeDic ["10804"] = MyInternationalizationString.NotHavePermissionToTheDevice; + //璁惧涓嶅瓨鍦� + stateCodeDic ["10805"] = MyInternationalizationString.TheDeviceDoesNotExist; - ////鎺у埗澶辫触 - //stateCodeDic["20000"] = MyInternationalizationString.ControlFailure; - ////缃戝叧绂荤嚎 - //stateCodeDic["20001"] = MyInternationalizationString.GatewayOffline; - ////璁惧绂荤嚎 - //stateCodeDic["20002"] = MyInternationalizationString.DeviceOffline; - ////spk涓嶆敮鎸佽鍔熻兘 - //stateCodeDic["20101"] = MyInternationalizationString.SpkNotSupportThisFeature; - ////spk鍔熻兘涓嶆敮鎸佹鍔熻兘鍊� - //stateCodeDic["20102"] = MyInternationalizationString.SpkNotSupportThisFunctionValue; + //鎺у埗澶辫触 + stateCodeDic ["20000"] = MyInternationalizationString.ControlFailure; + //缃戝叧绂荤嚎 + stateCodeDic ["20001"] = MyInternationalizationString.GatewayOffline; + //璁惧绂荤嚎 + stateCodeDic ["20002"] = MyInternationalizationString.DeviceOffline; + //spk涓嶆敮鎸佽鍔熻兘 + stateCodeDic ["20101"] = MyInternationalizationString.SpkNotSupportThisFeature; + //spk鍔熻兘涓嶆敮鎸佹鍔熻兘鍊� + stateCodeDic ["20102"] = MyInternationalizationString.SpkNotSupportThisFunctionValue; - //#endregion + #endregion #endregion -- Gitblit v1.8.0