From 8b9ce384b26c414db32f98e94e088f5334869c2d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 15:36:28 +0800
Subject: [PATCH] 全部合并了代码，安卓和 IOS 都测试通过了
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index 4608454..ff34a16 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
@@ -75,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";
@@ -187,6 +189,10 @@
dic = dicMsg[keys];
//璐﹀彿鏈敞鍐�
dic["AccountNoExists"] = R.MyInternationalizationString.GetAccountInfo_AccountNoExists;
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //鏃犳晥鐨勭櫥褰昑oken
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
//鑾峰彇浣忓畢鍒嗛〉
keys = "App/GetHomePager";
@@ -493,6 +499,33 @@
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;
+ //鏃犳晥鐧诲綍Token
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
+
+ //鏇存柊楠岃瘉瀵嗙爜
+ keys = "ZigbeeUsers/UpdatEexpandPwd";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //鏃犳晥鐧诲綍Token
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
+
+ //娣诲姞鎰忚鍙嶉
+ keys = "App/AddOpinionFeedback";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //璇锋眰鍙傛暟閿欒
+ dic["ParameterOrEmpty"] = R.MyInternationalizationString.uParameterError;
+ //鏃犳晥鐧诲綍Token
+ dic["NoLogin"] = R.MyInternationalizationString.uNoLogin;
}
/// <summary>
@@ -523,7 +556,7 @@
//鍦ㄥ唽鐨凪sg
return Language.StringByID(dicMsg[requestName][statuCode]);
}
- return "ERROR:NOT_DEFINE_MSG!";
+ return "ERROR:" + statuCode;
}
}
}
--
Gitblit v1.8.0