yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8

Browse Source
This commit is contained in:
zlzw 2024-03-27 10:32:12 +08:00
commit b3aed71dd6
6 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,4 +29,5 @@
<string name="close">close</string> <string name="close">close</string>
<string name="time_cannot_be_greater_than_the_current_time">Time cannot be greater than the current time</string> <string name="time_cannot_be_greater_than_the_current_time">Time cannot be greater than the current time</string>
<string name="msg_del_sure">Do you confirm deletion?</string> <string name="msg_del_sure">Do you confirm deletion?</string>
<string name="not_blackmail">Cannot blackmail oneself</string>
</resources> </resources>

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

@ -1494,4 +1494,5 @@
<string name="close">收起</string> <string name="close">收起</string>
<string name="time_cannot_be_greater_than_the_current_time">时间不能大于当前时间</string> <string name="time_cannot_be_greater_than_the_current_time">时间不能大于当前时间</string>
<string name="msg_del_sure">是否確認刪除？</string> <string name="msg_del_sure">是否確認刪除？</string>
<string name="not_blackmail">不能拉黑自己</string>
</resources> </resources>

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

@ -1494,4 +1494,5 @@
<string name="close">收起</string> <string name="close">收起</string>
<string name="time_cannot_be_greater_than_the_current_time">时间不能大于当前时间</string> <string name="time_cannot_be_greater_than_the_current_time">时间不能大于当前时间</string>
<string name="msg_del_sure">是否確認刪除？</string> <string name="msg_del_sure">是否確認刪除？</string>
<string name="not_blackmail">不能拉黑自己</string>
</resources> </resources>

1
common/src/main/res/values-zh/strings.xml
View File

@ -1492,4 +1492,5 @@
<string name="close">收起</string> <string name="close">收起</string>
<string name="time_cannot_be_greater_than_the_current_time">时间不能大于当前时间</string> <string name="time_cannot_be_greater_than_the_current_time">时间不能大于当前时间</string>
<string name="msg_del_sure">是否確認刪除？</string> <string name="msg_del_sure">是否確認刪除？</string>
<string name="not_blackmail">不能拉黑自己</string>
</resources> </resources>

1
common/src/main/res/values/strings.xml
View File

@ -1514,6 +1514,7 @@ Limited ride And limited avatar frame</string>
<string name="close">收起</string> <string name="close">收起</string>
<string name="time_cannot_be_greater_than_the_current_time">时间不能大于当前时间</string> <string name="time_cannot_be_greater_than_the_current_time">时间不能大于当前时间</string>
<string name="msg_del_sure">是否確認刪除？</string> <string name="msg_del_sure">是否確認刪除？</string>
<string name="not_blackmail">不能拉黑自己</string>
</resources> </resources>

4
main/src/main/java/com/yunbao/main/activity/CommunityDetailsActivity.java
View File

@ -198,6 +198,9 @@ public class CommunityDetailsActivity extends AbsActivity {
DialogUitl.showStringArrayDialog(CommunityDetailsActivity.this, array, new DialogUitl.StringArrayDialogCallback() { DialogUitl.showStringArrayDialog(CommunityDetailsActivity.this, array, new DialogUitl.StringArrayDialogCallback() {
@Override @Override
public void onItemClick(String text, int tag) { public void onItemClick(String text, int tag) {
if (activeBean.getUser_id().equals(CommonAppConfig.getInstance().getUid())) {
ToastUtil.show(getResources().getString(com.yunbao.main.R.string.not_blackmail));
} else {
if (tag == 0) { if (tag == 0) {
RouteUtil.forwardCommentReportActivity(activeBean.getId(), "0"); RouteUtil.forwardCommentReportActivity(activeBean.getId(), "0");
} else { } else {
@ -209,6 +212,7 @@ public class CommunityDetailsActivity extends AbsActivity {
}); });
} }
} }
}
}); });
} }
}); });