From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index 165d370..2f3a945 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
@@ -481,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;
//璐﹀彿涓嶅瓨鍦�
@@ -568,32 +568,56 @@
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;
}
/// <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")
{
//璇锋眰鍙傛暟閿欒
--
Gitblit v1.8.0