From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 08 五月 2020 17:46:44 +0800
Subject: [PATCH] 请合并最新代码，优化绑定信息
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index 65e77ea..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;
//缁戝畾鎴栬�呮洿鎹富璐﹀彿
@@ -499,6 +499,8 @@
dic["Fail"] = R.MyInternationalizationString.uOperationFailed;
//璐﹀彿涓嶅瓨鍦�
dic["AccountNoExists"] = R.MyInternationalizationString.uAccountNoExists;
+ //鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
+ dic["NewPasswordAndOldPasswordEqual"] = R.MyInternationalizationString.UpdatePassword_NewPasswordAndOldPasswordEqual;
//鏇存柊鐢ㄦ埛澶寸浉
keys = "ZigbeeUsers/UpdateHeadImage";
@@ -583,6 +585,41 @@
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>
@@ -601,15 +638,21 @@
}
string statuCode = revertObj.StateCode;
- string errorMsg = "鎺ュ彛璁块棶澶辫触锛�" + requestName + " " + statuCode + " " + revertObj.ErrorInfo == null ? string.Empty : revertObj.ErrorInfo + "\r\n";
+ 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);
- errorMsg += "鍙傛暟锛歕r\n" + requestJson;
+ try
+ {
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(pra);
+ errorMsg += "鍙傛暟锛歕r\n" + requestJson;
+ }
+ catch { errorMsg += "鍙傛暟锛氬簭鍒楀寲寮傚父锛�"; }
}
- HdlLogLogic.Current.WriteLog(-1, errorMsg);
+ HdlLogLogic.Current.WriteLog(-1, errorMsg + "\r\n");
//鍏遍�氱爜
if (statuCode == "ParameterOrEmpty")
@@ -633,7 +676,7 @@
//鍦ㄥ唽鐨凪sg
return Language.StringByID(dicMsg[requestName][statuCode]);
}
- return "ERROR:" + statuCode;
+ return "Error:" + statuCode;
}
}
}
--
Gitblit v1.8.0