Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支

common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java

@@ -618,7 +618,7 @@ public class CommonHttpUtil {
      * 动态-不感兴趣
      */
     public static void noInterest(String uid, HttpCallback callback) {
-        HttpClient.getInstance().get("User.setBlack", "User.setBlack")
+        HttpClient.getInstance().get("Pdluser.setBlack", "User.setBlack")
                 .params("touid", uid)
                 .execute(callback);
     }

common/src/main/res/values-en-rUS/strings.xml

@@ -2,4 +2,6 @@
 <resources>
     <string name="real_person">真人认证</string>
     <string name="trade_union">工会</string>
+    <string name="set_back">已拉黑，无法查看</string>
+    <string name="cancel_back">取消黑名单</string>
 </resources>

common/src/main/res/values-zh-rHK/strings.xml

@@ -1467,4 +1467,6 @@
     <string name="trade_union">工会</string>
     <string name="activity_msg_chat_top_status_online">在線</string>
     <string name="activity_msg_chat_top_status_offline">離線</string>
+    <string name="set_back">已拉黑，无法查看</string>
+    <string name="cancel_back">取消黑名单</string>
 </resources>

common/src/main/res/values-zh-rTW/strings.xml

@@ -1467,4 +1467,6 @@
 
     <string name="activity_msg_chat_top_status_online">在線</string>
     <string name="activity_msg_chat_top_status_offline">離線</string>
+    <string name="set_back">已拉黑，无法查看</string>
+    <string name="cancel_back">取消黑名单</string>
 </resources>

common/src/main/res/values-zh/strings.xml

@@ -1464,4 +1464,6 @@
     <string name="activity_msg_chat_top_status_online">在線</string>
     <string name="activity_msg_chat_top_status_offline">離線</string>
     <string name="praise">獲讚</string>
+    <string name="set_back">已拉黑，无法查看</string>
+    <string name="cancel_back">取消黑名单</string>
 </resources>

common/src/main/res/values/strings.xml

@@ -1486,6 +1486,8 @@ Limited ride And limited avatar frame</string>
     <string name="real_person">真人认证</string>
     <string name="trade_union">工会</string>
     <string name="praise">Like</string>
+    <string name="set_back">已拉黑，无法查看</string>
+    <string name="cancel_back">取消黑名单</string>
 
 
 </resources>