From c6b35c3138b944830b5336bf610f918154dd47c7 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期六, 12 十月 2019 15:45:10 +0800 Subject: [PATCH] 合并门锁,完成住宅管理 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 29 +++++++++++++++++++++-------- 1 files changed, 21 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..4608454 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> /// 鍏ㄩ儴淇℃伅 @@ -496,21 +500,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