From d2f4bb3d4fe6943df21e24e60d05751155240df3 Mon Sep 17 00:00:00 2001
From: hch <16607480311@163.com>
Date: Wed, 27 Mar 2024 10:17:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20[=E4=BF=AE=E6=94=B9-=E8=87=AA=E5=B7=B1?=
=?UTF-8?q?=E7=9A=84=E5=8A=A8=E6=80=81-=E4=B8=8D=E8=83=BD=E6=8B=89?=
=?UTF-8?q?=E9=BB=91,=E4=B8=8D=E6=84=9F=E5=85=B4=E8=B6=A3]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/src/main/res/values-en-rUS/strings.xml | 1 +
common/src/main/res/values-zh-rHK/strings.xml | 1 +
common/src/main/res/values-zh-rTW/strings.xml | 1 +
common/src/main/res/values-zh/strings.xml | 1 +
common/src/main/res/values/strings.xml | 1 +
.../activity/CommunityDetailsActivity.java | 20 +++++++++++--------
6 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/common/src/main/res/values-en-rUS/strings.xml b/common/src/main/res/values-en-rUS/strings.xml
index d473f7815..e7c059f1d 100644
--- a/common/src/main/res/values-en-rUS/strings.xml
+++ b/common/src/main/res/values-en-rUS/strings.xml
@@ -29,4 +29,5 @@
close
Time cannot be greater than the current time
Do you confirm deletion?
+ Cannot blackmail oneself
\ No newline at end of file
diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml
index 9c66b8c6b..e2ad7e6f5 100644
--- a/common/src/main/res/values-zh-rHK/strings.xml
+++ b/common/src/main/res/values-zh-rHK/strings.xml
@@ -1494,4 +1494,5 @@
收起
时间不能大于当前时间
是否確認刪除?
+ 不能拉黑自己
diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml
index f3c973a42..dfdb542d3 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -1494,4 +1494,5 @@
收起
时间不能大于当前时间
是否確認刪除?
+ 不能拉黑自己
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index c65241125..02643bf8f 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1492,4 +1492,5 @@
收起
时间不能大于当前时间
是否確認刪除?
+ 不能拉黑自己
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 75ba5ab5a..2ad802e0c 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1514,6 +1514,7 @@ Limited ride And limited avatar frame
收起
时间不能大于当前时间
是否確認刪除?
+ 不能拉黑自己
diff --git a/main/src/main/java/com/yunbao/main/activity/CommunityDetailsActivity.java b/main/src/main/java/com/yunbao/main/activity/CommunityDetailsActivity.java
index 2060dedcb..d1c11edb8 100644
--- a/main/src/main/java/com/yunbao/main/activity/CommunityDetailsActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/CommunityDetailsActivity.java
@@ -198,15 +198,19 @@ public class CommunityDetailsActivity extends AbsActivity {
DialogUitl.showStringArrayDialog(CommunityDetailsActivity.this, array, new DialogUitl.StringArrayDialogCallback() {
@Override
public void onItemClick(String text, int tag) {
- if (tag == 0) {
- RouteUtil.forwardCommentReportActivity(activeBean.getId(), "0");
+ if (activeBean.getUser_id().equals(CommonAppConfig.getInstance().getUid())) {
+ ToastUtil.show(getResources().getString(com.yunbao.main.R.string.not_blackmail));
} else {
- CommonHttpUtil.noInterest(activeBean.getUser_id(), new HttpCallback() {
- @Override
- public void onSuccess(int code, String msg, String[] info) {
- ToastUtil.show(msg);
- }
- });
+ if (tag == 0) {
+ RouteUtil.forwardCommentReportActivity(activeBean.getId(), "0");
+ } else {
+ CommonHttpUtil.noInterest(activeBean.getUser_id(), new HttpCallback() {
+ @Override
+ public void onSuccess(int code, String msg, String[] info) {
+ ToastUtil.show(msg);
+ }
+ });
+ }
}
}
});