From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index 0cbc0a2..64e4901 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>
/// 鍏ㄩ儴淇℃伅
@@ -489,6 +493,15 @@
dic["Fail"] = R.MyInternationalizationString.uOperationFailed;
//璐﹀彿涓嶅瓨鍦�
dic["AccountNoExists"] = R.MyInternationalizationString.uAccountNoExists;
+
+ //鏇存柊鐢ㄦ埛澶寸浉
+ keys = "ZigbeeUsers/UpdateHeadImage";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //纭瀵嗙爜涓嶄竴鑷达紝璇烽噸鏂拌緭鍏�
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
}
/// <summary>
@@ -496,21 +509,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:" + statuCode;
}
}
}
--
Gitblit v1.8.0