From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 151 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index 9720e27..c0e1669 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
@@ -113,7 +113,7 @@
dic = dicMsg[keys];
//楠岃瘉鐮侀敊璇�
dic["ValidCodeAndPhoneNoEqual"] = R.MyInternationalizationString.ValidatorCode_ValidCodeAndPhoneNoEqual;
- //鏈彂閫侀獙璇佺爜鍒版璐﹀彿
+ //楠岃瘉鐮佸凡澶辨晥
dic["NoRecord"] = R.MyInternationalizationString.ValidatorCode_NoRecord;
//缁戝畾鎴栬�呮洿鎹富璐﹀彿
@@ -189,6 +189,10 @@
dic = dicMsg[keys];
//璐﹀彿鏈敞鍐�
dic["AccountNoExists"] = R.MyInternationalizationString.GetAccountInfo_AccountNoExists;
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //鏃犳晥鐨勭櫥褰昑oken
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
//鑾峰彇浣忓畢鍒嗛〉
keys = "App/GetHomePager";
@@ -477,7 +481,7 @@
//璇锋眰鍙傛暟閿欒
dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
//楠岃瘉鐮佸彂閫佸け璐�
- dic["SendFail "] = R.MyInternationalizationString.RegisterSendVerCode_SendFail;
+ dic["SendFail"] = R.MyInternationalizationString.RegisterSendVerCode_SendFail;
//鎿嶄綔澶辫触锛岃閲嶈瘯
dic["Fail"] = R.MyInternationalizationString.uOperationFailed;
//璐﹀彿涓嶅瓨鍦�
@@ -495,6 +499,8 @@
dic["Fail"] = R.MyInternationalizationString.uOperationFailed;
//璐﹀彿涓嶅瓨鍦�
dic["AccountNoExists"] = R.MyInternationalizationString.uAccountNoExists;
+ //鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
+ dic["NewPasswordAndOldPasswordEqual"] = R.MyInternationalizationString.UpdatePassword_NewPasswordAndOldPasswordEqual;
//鏇存柊鐢ㄦ埛澶寸浉
keys = "ZigbeeUsers/UpdateHeadImage";
@@ -502,31 +508,167 @@
dic = dicMsg[keys];
//璇锋眰鍙傛暟閿欒
dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
- //纭瀵嗙爜涓嶄竴鑷达紝璇烽噸鏂拌緭鍏�
+ //鏃犳晥鐧诲綍Token
dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
+
+ //鏇存柊楠岃瘉瀵嗙爜
+ keys = "ZigbeeUsers/UpdatEexpandPwd";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //鏃犳晥鐧诲綍Token
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
+
+ //娣诲姞鎰忚鍙嶉
+ keys = "App/AddOpinionFeedback";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //鏃犳晥鐧诲綍Token
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
+
+ //鑾峰彇宸叉巿鏉冪涓夋柟骞冲彴鍒楄〃
+ keys = "ZigbeeUsers/GetUserAuthItem";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //鏃犳晥鐧诲綍Token
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
+
+ //瑙ｉ櫎绗笁鏂规巿鏉�
+ keys = "ZigbeeUsers/UnBindUserAuth";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //鏃犳晥鐧诲綍Token
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
+
+ //娣诲姞鎴栬�呮洿鏂板井淇℃巿鏉冪櫥褰曚俊鎭�
+ keys = "ZigbeeUsers/InsertOrUpdateAuthUser";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //鏃犳晥鐧诲綍Token
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
+ //鎸囧畾璐﹀彿涓嶅瓨鍦�
+ dic["AccountNoExists"] = R.MyInternationalizationString.uAccountNoExists;
+
+ //绗笁鏂圭粦瀹氳处鍙�
+ keys = "ZigbeeUsers/BindAuthUserToAccount";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //鏃犳晥鐧诲綍Token
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
+ //閿欒,绗笁鏂逛俊鎭涪澶�
+ dic["NoExist"] = R.MyInternationalizationString.uErrorAndLostOtherPatyInfo;
+ //鎸囧畾璐﹀彿涓嶅瓨鍦�
+ dic["AccountNoExists"] = R.MyInternationalizationString.uAccountNoExists;
+
+ //淇敼瀛愬笎鍙疯繙绋嬫潈闄�
+ keys = "ZigbeeUsers/ChangeSubAccountIsAllowRemoteCtrl";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //鏃犳晥鐧诲綍Token
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
+ //鎸囧畾鐨勪綇瀹呬笉瀛樺湪
+ dic["HomeIdNoRecord"] = R.MyInternationalizationString.uZigbeeHome_NoRecord;
+ //鎸囧畾璐﹀彿涓嶅瓨鍦�
+ dic["DistributedMarkNoRecord"] = R.MyInternationalizationString.uAccountNoExists;
+ //鏉冮檺涓嶈冻
+ dic["BeRestrict"] = R.MyInternationalizationString.uBeRestrict;
+
+ //鑾峰彇娑堟伅涓績鏁版嵁
+ keys = "MessageCenter/GetMessageCenterPagger";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //鎸囧畾鐨勪綇瀹呬笉瀛樺湪
+ dic["NoRecord"] = R.MyInternationalizationString.uZigbeeHome_NoRecord;
+
+ //鏍囪娑堟伅涓哄凡璇绘垨鏈
+ keys = "MessageCenter/TagMessageMessageCenterItem";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //鎸囧畾鐨勪綇瀹呬笉瀛樺湪
+ dic["NoRecord"] = R.MyInternationalizationString.uZigbeeHome_NoRecord;
+
+ //鍒犻櫎娑堟伅
+ keys = "MessageCenter/DelMessageCenterItem";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //鎸囧畾鐨勪綇瀹呬笉瀛樺湪
+ dic["NoRecord"] = R.MyInternationalizationString.uZigbeeHome_NoRecord;
+
+ //鏍囪鍏ㄩ儴宸茶鎴栬�呮竻绌烘墍鏈夋秷鎭�
+ keys = "MessageCenter/TagAllOrClearMessageCenter";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //鎸囧畾鐨勪綇瀹呬笉瀛樺湪
+ dic["NoRecord"] = R.MyInternationalizationString.uZigbeeHome_NoRecord;
+
+ //瀛愯处鍙峰垹闄や富甯愬彿鍒嗕韩杩囨潵鐨勪綇瀹�
+ keys = "ZigbeeUsers/SubAccountDelShareHome";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //鎸囧畾鐨勪綇瀹呬笉瀛樺湪
+ dic["NoRecord"] = R.MyInternationalizationString.uZigbeeHome_NoRecord;
}
/// <summary>
/// 鏍规嵁鎺ュ彛鐨勭姸鎬佺爜锛岀炕璇戣繑鍥炰俊鎭�
/// </summary>
/// <param name="requestName">鎺ュ彛</param>
- /// <param name="statuCode">鐘舵�佺爜</param>
+ /// <param name="revertObj">浜戠杩斿洖鐨勬暟鎹�</param>
/// <param name="pra">璇锋眰鍙傛暟</param>
/// <returns></returns>
- public string GetMsgByRequestName(string requestName, string statuCode, object pra)
+ public string GetMsgByRequestName(string requestName, Common.ResponseEntity.ResponsePack revertObj, object pra)
{
if (IgnoreError == true)
{
//鏃犺閿欒
return null;
}
+ string statuCode = revertObj.StateCode;
- HdlLogLogic.Current.WriteLog(-1, "鎺ュ彛璁块棶澶辫触锛�" + UserCenterResourse.NowActionFormID + " " + requestName + " " + statuCode);
+ string errorInfo = revertObj.ErrorInfo == null ? string.Empty : revertObj.ErrorInfo;
+ string errorMsg = "鎺ュ彛璁块棶澶辫触锛�" + requestName + " " + statuCode + " " + errorInfo + "\r\n";
+
+ errorMsg += "褰撳墠婵�娲荤殑鐣岄潰锛�" + UserCenterResourse.NowActionFormID + "\r\n";
if (pra != null)
{
//搴忓垪鍖栧璞�
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(pra);
- HdlLogLogic.Current.WriteLog(-1, "鍙傛暟锛�" + requestJson);
+ try
+ {
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(pra);
+ errorMsg += "鍙傛暟锛歕r\n" + requestJson;
+ }
+ catch { errorMsg += "鍙傛暟锛氬簭鍒楀寲寮傚父锛�"; }
+ }
+ HdlLogLogic.Current.WriteLog(-1, errorMsg + "\r\n");
+
+ //鍏遍�氱爜
+ if (statuCode == "ParameterOrEmpty")
+ {
+ //璇锋眰鍙傛暟閿欒
+ return Language.StringByID(R.MyInternationalizationString.uParameterError);
+ }
+ else if (statuCode == "NoLogin")
+ {
+ //鏃犳晥鐧诲綍Token
+ return Language.StringByID(R.MyInternationalizationString.uNoLogin);
+ }
+ else if (statuCode == "Fail")
+ {
+ //鎿嶄綔澶辫触锛岃閲嶈瘯
+ return Language.StringByID(R.MyInternationalizationString.uOperationFailed);
}
if (dicMsg.ContainsKey(requestName) == true && dicMsg[requestName].ContainsKey(statuCode) == true)
@@ -534,7 +676,7 @@
//鍦ㄥ唽鐨凪sg
return Language.StringByID(dicMsg[requestName][statuCode]);
}
- return "ERROR:" + statuCode;
+ return "Error:" + statuCode;
}
}
}
--
Gitblit v1.8.0