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 | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index 0dcddac..64e4901 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
@@ -75,10 +75,8 @@
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";
@@ -495,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>
@@ -525,7 +532,7 @@
//鍦ㄥ唽鐨凪sg
return Language.StringByID(dicMsg[requestName][statuCode]);
}
- return "ERROR:NOT_DEFINE_MSG!";
+ return "ERROR:" + statuCode;
}
}
}
--
Gitblit v1.8.0