From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index 2f3a945..53ad764 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,27 @@
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;
}
/// <summary>
--
Gitblit v1.8.0