From 273bd8b4fb918a4303207215b2b8369fbc275000 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:58:44 +0800
Subject: [PATCH] Merge branch 'CJL-NEW'
---
HDL_ON/DAL/Server/IMessageCommon.cs | 187 +++++++++++++++++-----------------------------
1 files changed, 69 insertions(+), 118 deletions(-)
diff --git a/HDL_ON/DAL/Server/IMessageCommon.cs b/HDL_ON/DAL/Server/IMessageCommon.cs
index 5b9e64d..f96ee70 100644
--- a/HDL_ON/DAL/Server/IMessageCommon.cs
+++ b/HDL_ON/DAL/Server/IMessageCommon.cs
@@ -61,134 +61,81 @@
#region 鍏遍�氶敊璇爜
stateCodeDic = new Dictionary<string, int>();
//涓庢湇鍔″櫒閫氳澶辫触
- stateCodeDic["NETWORK_ERROR"] = HDL_ON.StringId.FailedRequestServer;
+ stateCodeDic["NETWORK_ERROR"] = StringId.FailedRequestServer;
//鏁版嵁寮傚父
- stateCodeDic["DATA_EXCEPTION"] = HDL_ON.StringId.DataExceptionPleaseTryAgain;
+ stateCodeDic["DATA_EXCEPTION"] = StringId.DataExceptionPleaseTryAgain;
- #region 鍩虹鏈嶅姟 鏂伴敊璇爜
+ #region 鍩虹鏈嶅姟 鏂伴敊璇爜 2020-12-07
+ //绯荤粺绻佸繖~璇风◢鍚庡啀璇晘
+ stateCodeDic["1"] = StringId.SystemIsBusy;
//绯荤粺缁存姢涓瓇璇风◢鍚庡啀璇晘
- stateCodeDic["2"] = HDL_ON.StringId.SystemMaintenance;
+ stateCodeDic["2"] = StringId.SystemMaintenance;
+ ////鏈嶅姟寮傚父
+ //stateCodeDic["3"] = StringId.SystemIsBusy;
//绛惧悕閿欒
- stateCodeDic["4"] = HDL_ON.StringId.SignatureError;
+ stateCodeDic["4"] = StringId.SignatureError;
//楠岃瘉鐮佹牎楠屽け璐�
- stateCodeDic["14"] = HDL_ON.StringId.VerificationCodeWrong;
+ stateCodeDic[StateCode.VERIFICATION_CODE_WRONG] = StringId.VerificationCodeWrong;
//楠岃瘉鐮佸彂閫侀绻侊紝璇风◢鍚庡啀璇曪紒
- stateCodeDic["15"] = HDL_ON.StringId.VerificationCodeSentFrequently;
+ stateCodeDic["15"] = StringId.VerificationCodeSentFrequently;
+ //楠岃瘉鐮佸彂閫佸け璐�
+ stateCodeDic["16"] = StringId.FailedToSendVerificationCode;
+
//浼氳瘽瓒呮椂锛岃鏇存柊token
- stateCodeDic[StateCode.TOKEN_EXPIRED] = HDL_ON.StringId.NotLogin;
- ////鐧诲綍澶辫触锛岃处鍙锋垨鑰呭瘑鐮侀敊璇�
- stateCodeDic["10008"] = HDL_ON.StringId.LoginFailed_AccountOrPasswordError;
+ stateCodeDic[StateCode.TOKEN_EXPIRED] = StringId.NotLogin;
+ //瑙ｆ瀽鐢ㄦ埛韬唤閿欒锛岃閲嶆柊鐧诲綍
+ stateCodeDic["10006"] = StringId.InvalidToken;
+ //鐧诲綍澶辫触锛岃处鍙锋垨鑰呭瘑鐮侀敊璇�
+ stateCodeDic["10008"] = StringId.LoginFailed_AccountOrPasswordError;
+ //鐢ㄦ埛宸茬粡琚鐢�
+ stateCodeDic["10009"] = StringId.TheAccountHasBeenDisabled;
//璐﹀彿涓嶅瓨鍦�
- stateCodeDic[StateCode.ACCOUNT_NOT_EXIST] = HDL_ON.StringId.AccountNotExist;
+ stateCodeDic[StateCode.ACCOUNT_NOT_EXIST] = StringId.AccountNotExist;
+ //鐢ㄦ埛鏈櫥褰�
+ stateCodeDic["10011"] = StringId.InvalidToken;
//璐﹀彿宸插瓨鍦�
- stateCodeDic["10012"] = HDL_ON.StringId.AccountExist;
+ stateCodeDic["10012"] = StringId.AccountExist;
+ //鎵嬫満鍙峰凡娉ㄥ唽
+ stateCodeDic["10013"] = StringId.AccountExist;
+ //閭宸叉敞鍐�
+ stateCodeDic["10014"] = StringId.AccountExist;
+ //鍘熷瘑鐮侀敊璇�
+ stateCodeDic["10015"] = StringId.OldPwdNoYes;
+ ////缁戝畾鍙风爜閲嶅
+ //stateCodeDic["10016"] = StringId.10016;
+ ////娉ㄥ唽澶辫触
+ //stateCodeDic["10017"] = StringId.10017;
+ ////绉熸埛涓嶅瓨鍦�
+ //stateCodeDic["10018"] = StringId.10018;
+
+ ////鏋氫妇绫诲瀷閿欒
+ //stateCodeDic["11003"] = StringId.11003;
+
+ //-------------------瀛愯处鍙锋ā鍧�-------------------
+ //瀛愯处鍙峰凡缁忓瓨鍦�
+ stateCodeDic["10301"] = StringId.BindSubAccount_Exist;
+ //瀛愯处鍙蜂笉瀛樺湪
+ stateCodeDic["10302"] = StringId.SubAccount_NoExists;
+ //涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
+ stateCodeDic["10303"] = StringId.BindSubAccount_SameAccount;
+ ////鐩稿悓鐨勮繙绋嬫帶鍒�
+ //stateCodeDic["10304"] = StringId.uOperationFailed;
+ ////瀛愯处鍙锋樀绉板凡缁忓瓨鍦�
+ //stateCodeDic["10305"] = StringId.BindSubAccount_Exist;
+ //-------------------浣忓畢妯″潡-------------------
+ //褰撳墠浣忓畢涓嶅睘浜庤璐﹀彿
+ stateCodeDic["10401"] = StringId.HomeIdAndTokenNoConsistent;
+ //浣忓畢鍚嶇О宸插瓨鍦�
+ stateCodeDic["10402"] = StringId.HomeName_Exist;
+ ////浣忓畢ID宸插瓨鍦�
+ //stateCodeDic["10403"] = StringId.HOME_ID_EXISTS;
+ //浣忓畢涓嶅瓨鍦�
+ stateCodeDic["10404"] = StringId.Home_NoExists;
+
////璋冪敤鐢ㄦ埛妯″潡鎺ュ彛澶辫触
//stateCodeDic["10213"] = HDL_ON.StringId;
+
#endregion
-
- ////return;
- //#region 2020-09-18 鏂板鎺ラ敊璇爜
- //////鎿嶄綔澶辫触锛岃閲嶈瘯
- ////stateCodeDic ["10001"] = HDL_ON.StringId.uOperationFailed;
- ////璇锋眰鍙傛暟閿欒
- //stateCodeDic["10101"] = HDL_ON.StringId.uParameterError;
- ////鏃犳晥鐧诲綍Token
- //stateCodeDic["10102"] = HDL_ON.StringId.uNoLogin;
- ////鐧诲綍澶辫触锛岃处鍙锋垨鑰呭瘑鐮侀敊璇�
- //stateCodeDic["10103"] = HDL_ON.StringId.Accountorpassworderro;
- ////娌℃湁璁板綍
- //stateCodeDic["10104"] = HDL_ON.StringId.NoRecord;
- ////鎿嶄綔鏉冮檺涓嶈冻
- //stateCodeDic["10105"] = HDL_ON.StringId.uBeRestrict;
- ////涓嶅瓨鍦�
- //stateCodeDic["10106"] = HDL_ON.StringId.NO_EXISTS;
-
-
- ////-------------------鐢ㄦ埛妯″潡-------------------
- ////璐﹀彿涓嶅瓨鍦�
- //stateCodeDic["10201"] = HDL_ON.StringId.uAccountNoExists;
- ////璐﹀彿宸茬粡瀛樺湪
- //stateCodeDic["10202"] = HDL_ON.StringId.RegisterSendVerCode_Exist;
- ////楠岃瘉鐮佸凡澶辨晥
- //stateCodeDic["10203"] = HDL_ON.StringId.ValidatorCode_NoRecord;
- ////楠岃瘉鐮侀敊璇�
- //stateCodeDic["10204"] = HDL_ON.StringId.VerificationCodeError;
-
-
- ////鐧诲綍澶辫触锛屽瘑鐮侀敊璇�
- //stateCodeDic["10205"] = HDL_ON.StringId.PasswordIsError;
- ////楠岃瘉鐮佹棤鏁圼鐢ㄦ埛娌℃湁閫氳繃鎵嬫満[閭]鍙疯幏鍙栭獙璇佺爜]
- //stateCodeDic["10206"] = HDL_ON.StringId.ValidatorCode_ValidCodeAndPhoneNoEqual;
- ////楠岃瘉鐮佸彂閫侀绻�
- //stateCodeDic["10207"] = HDL_ON.StringId.VERIFY_CODE_SENDED;
- ////璇ヨ处鍙峰凡缁忕粦瀹�
- //stateCodeDic["10208"] = HDL_ON.StringId.Exist;
- ////鐢ㄦ埛鍚嶇О宸茬粡瀛樺湪
- //stateCodeDic["10209"] = HDL_ON.StringId.Exist;
- ////楠岃瘉鐮佸彂閫佸け璐�
- //stateCodeDic["10210"] = HDL_ON.StringId.RegisterSendVerCode_SendFail;
-
- ////-------------------鏇存柊瀵嗙爜妯″潡-------------------
- ////鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
- //stateCodeDic["10211"] = HDL_ON.StringId.UpdatePassword_NewPasswordAndOldPasswordEqual;
- ////鏃у瘑鐮佷笉瀵�
- //stateCodeDic["10212"] = HDL_ON.StringId.UpdatePassword_OldPwdNoYes;
-
- ////-------------------瀛愯处鍙锋ā鍧�-------------------
- ////瀛愯处鍙峰凡缁忓瓨鍦�
- //stateCodeDic["10301"] = HDL_ON.StringId.BindSubAccount_Exist;
- ////瀛愯处鍙蜂笉瀛樺湪
- //stateCodeDic["10302"] = HDL_ON.StringId.uAccountNoExists;
- ////涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
- //stateCodeDic["10303"] = HDL_ON.StringId.BindSubAccount_SameAccount;
- ////涓�鏍风殑杩滅▼璇锋眰
- //stateCodeDic["10304"] = HDL_ON.StringId.uOperationFailed;
- ////璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢
- //stateCodeDic["10305"] = HDL_ON.StringId.BindSubAccount_Exist;
-
- ////-------------------浣忓畢妯″潡-------------------
- ////褰撳墠浣忓畢涓嶅睘浜庤璐﹀彿
- //stateCodeDic["10401"] = HDL_ON.StringId.HomeIdAndTokenNoConsistent;
- ////浣忓畢鍚嶇О宸插瓨鍦�
- //stateCodeDic["10402"] = HDL_ON.StringId.EditZigbeeHome_Exist;
- ////浣忓畢ID宸插瓨鍦�
- //stateCodeDic["10403"] = HDL_ON.StringId.HOME_ID_EXISTS;
- ////浣忓畢涓嶅瓨鍦�
- //stateCodeDic["10404"] = HDL_ON.StringId.uZigbeeHome_NoRecord;
-
- ////-------------------浣忓畢鍒嗕韩妯″潡-------------------
- ////浣忓畢鍒嗕韩涓嶅瓨鍦�
- //stateCodeDic["10405"] = HDL_ON.StringId.NO_EXISTS;
-
- ////-------------------缃戝叧妯″潡-------------------
- ////鏄惁寮哄埗瑙ｇ粦缃戝叧
- //stateCodeDic["10501"] = HDL_ON.StringId.BindGwToHome_BindGatewaysExists;
- ////搴旂敤鎴愬姛
- //stateCodeDic["10502"] = HDL_ON.StringId.AmendTheSuccess;
- ////褰撳墠浣忓畢涓嬪苟娌℃湁缁戝畾鎸囧畾鐨勭綉鍏�
- //stateCodeDic["10503"] = HDL_ON.StringId.ReleaseGatewayToZigbeeHome_NoBind;
- ////涓嶆敮鎸�
- //stateCodeDic["10504"] = HDL_ON.StringId.NOT_SUPPORT;
- ////缃戝叧MAC涓嶅瓨鍦�
- //stateCodeDic["10505"] = HDL_ON.StringId.MACError;
-
- ////-------------------澶囦唤妯″潡-------------------
- ////澶囨敞鍚嶇О宸茬粡瀛樺湪,璇锋洿鎹㈠悗閲嶈瘯锛佹枃浠跺す鍚嶇О宸茬粡瀛樺湪
- //stateCodeDic["10601"] = HDL_ON.StringId.uBackupNameExists;
- ////澶囦唤鏂囦欢澶逛笉瀛樺湪
- //stateCodeDic["10602"] = HDL_ON.StringId.FolderNoExist;
- ////澶囦唤鏂囦欢涓嶅瓨鍦�
- //stateCodeDic["10603"] = HDL_ON.StringId.FileNoExist;
-
-
- ////-------------------璺ㄥ尯-------------------
- ////璇ユ帴鍙ｄ笉瀛樺湪璺ㄥ尯鎿嶄綔
- //stateCodeDic["11001"] = HDL_ON.StringId.NOT_SUPPORT;
- ////璺ㄥ尯璋冪敤澶辫触
- //stateCodeDic["11002"] = HDL_ON.StringId.NOT_SUPPORT;
- ////鏋氫妇閿欒
- //stateCodeDic["11003"] = HDL_ON.StringId.uOperationFailed;
-
#endregion
@@ -222,7 +169,7 @@
// return Language.StringByID(dicMsg[requestName][statuCode]);
//}
- return Language.StringByID(HDL_ON.StringId.FailedRequestServer) + "\n(" + statuCode + ")";
+ return Language.StringByID(StringId.FailedRequestServer) + "\n(" + statuCode + ")";
}
@@ -267,7 +214,7 @@
{
Application.RunOnMainThread(() =>
{
- new Alert("", mes, Language.StringByID(HDL_ON.StringId.Close)).Show();
+ new Alert("", mes, Language.StringByID(StringId.Close)).Show();
});
}
}
@@ -316,6 +263,10 @@
/// </summary>
public const string SUCCESS = "0";
/// <summary>
+ /// 楠岃瘉鐮佹牎楠屽け璐�
+ /// </summary>
+ public const string VERIFICATION_CODE_WRONG = "14";
+ /// <summary>
/// 浼氳瘽瓒呮椂锛岃鏇存柊token
/// </summary>
public const string TOKEN_EXPIRED = "10001";
--
Gitblit v1.8.0