From 1f5636d69332170ea3a41c76c9519f6ff6f0a8d9 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 15:40:30 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index 0cbc0a2..0dcddac 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
@@ -28,6 +28,10 @@
return m_Current;
}
}
+ /// <summary>
+ /// 鏃犺閿欒(璁块棶浜戠鏃讹紝姝ゆ搷浣滃皢涓嶄細寮瑰嚭閿欒)
+ /// </summary>
+ public bool IgnoreError = false;
/// <summary>
/// 鍏ㄩ儴淇℃伅
@@ -71,8 +75,10 @@
dic["BeRestrict"] = R.MyInternationalizationString.uBeRestrict;
//琚粦瀹氱殑瀛愯处鍙蜂笉瀛樺湪锛岃娉ㄥ唽鍚庡啀璇�
dic["AccountNoExists"] = R.MyInternationalizationString.BindSubAccount_AccountNoExists;
- //涓嶈兘娣诲姞鑷繁涓哄瓙璐﹀彿
+ //涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
dic["SameAccount"] = R.MyInternationalizationString.BindSubAccount_SameAccount;
+ //涓嶈兘鎶婁富璐﹀彿娣诲姞涓烘垚鍛�
+ dic["NoAddMainAccount"] = R.MyInternationalizationString.BindSubAccount_NoAddMainAccount;
//鍗囩骇鎴栭檷绾у瓙璐﹀彿
keys = "ZigbeeUsers/UpSubAccount";
@@ -496,21 +502,30 @@
/// </summary>
/// <param name="requestName">鎺ュ彛</param>
/// <param name="statuCode">鐘舵�佺爜</param>
+ /// <param name="pra">璇锋眰鍙傛暟</param>
/// <returns></returns>
- public string GetMsgByRequestName(string requestName, string statuCode)
+ public string GetMsgByRequestName(string requestName, string statuCode, object pra)
{
+ if (IgnoreError == true)
+ {
+ //鏃犺閿欒
+ return null;
+ }
+
+ HdlLogLogic.Current.WriteLog(-1, "鎺ュ彛璁块棶澶辫触锛�" + UserCenterResourse.NowActionFormID + " " + requestName + " " + statuCode);
+ if (pra != null)
+ {
+ //搴忓垪鍖栧璞�
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(pra);
+ HdlLogLogic.Current.WriteLog(-1, "鍙傛暟锛�" + requestJson);
+ }
+
if (dicMsg.ContainsKey(requestName) == true && dicMsg[requestName].ContainsKey(statuCode) == true)
{
//鍦ㄥ唽鐨凪sg
return Language.StringByID(dicMsg[requestName][statuCode]);
}
- string error = "ERROR:NOT_DEFINE_MSG!\r\n";
- if (requestName.Length > 5)
- {
- error += "*" + requestName.Substring(requestName.Length - 5, 5);
- }
- error += "(" + statuCode + ")";
- return error;
+ return "ERROR:NOT_DEFINE_MSG!";
}
}
}
--
Gitblit v1.8.0