diff --git a/app/src/main/java/com/gh/common/util/CommentHelper.kt b/app/src/main/java/com/gh/common/util/CommentHelper.kt index fae0383282..87c8f31030 100644 --- a/app/src/main/java/com/gh/common/util/CommentHelper.kt +++ b/app/src/main/java/com/gh/common/util/CommentHelper.kt @@ -64,7 +64,7 @@ object CommentHelper { } dialogOptions.add("复制") - dialogOptions.add("举报") + dialogOptions.add("投诉") commentEntity.me?.let { if (it.isModerator || (it.moderatorPermissions.hideAnswerComment > Permissions.GUEST @@ -97,20 +97,20 @@ object CommentHelper { "复制" -> copyText(commentEntity.content, context) - "举报" -> { - context.ifLogin("回答详情-评论-举报") { + "投诉" -> { + context.ifLogin("回答详情-评论-投诉") { showReportTypeDialog(context) { reportType -> val commentListener = object : PostCommentUtils.PostCommentListener { override fun postSuccess(response: JSONObject?) { - Utils.toast(context, "感谢您的举报") + Utils.toast(context, "感谢您的投诉") } override fun postFailed(error: Throwable?) { if (error == null) { - Utils.toast(context, "举报失败,请稍后重试") + Utils.toast(context, "投诉失败,请稍后重试") } else { - Utils.toast(context, "举报失败,${error.message}") + Utils.toast(context, "投诉失败,${error.message}") } } } diff --git a/app/src/main/java/com/gh/common/util/CommentUtils.java b/app/src/main/java/com/gh/common/util/CommentUtils.java index f77f5d8420..45e5608eab 100644 --- a/app/src/main/java/com/gh/common/util/CommentUtils.java +++ b/app/src/main/java/com/gh/common/util/CommentUtils.java @@ -92,7 +92,7 @@ public class CommentUtils { } dialogType.add("复制"); - dialogType.add("举报"); + dialogType.add("投诉"); if (commentEntity.getParent() != null && showConversation) { dialogType.add("查看对话"); @@ -130,8 +130,8 @@ public class CommentUtils { case "复制": copyText(commentEntity.getContent(), context); break; - case "举报": - CheckLoginUtils.checkLogin(context, patch + "-举报", + case "投诉": + CheckLoginUtils.checkLogin(context, patch + "-投诉", () -> showReportTypeDialog(commentEntity, context)); break; @@ -187,12 +187,12 @@ public class CommentUtils { new PostCommentUtils.PostCommentListener() { @Override public void postSuccess(JSONObject response) { - Utils.toast(context, "感谢您的举报"); + Utils.toast(context, "感谢您的投诉"); } @Override public void postFailed(Throwable error) { - Utils.toast(context, "举报失败,请检查网络设置"); + Utils.toast(context, "投诉失败,请检查网络设置"); } }); reportTypeDialog.cancel(); diff --git a/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt b/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt index cfb76d2357..af6ab3a6cf 100644 --- a/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt +++ b/app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt @@ -23,7 +23,7 @@ object SimpleRequestHelper { .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : Response() { override fun onResponse(response: ResponseBody?) { - Utils.toast(HaloApp.getInstance().application, "感谢您的举报") + Utils.toast(HaloApp.getInstance().application, "感谢您的投诉") } override fun onFailure(e: HttpException?) { @@ -41,7 +41,7 @@ object SimpleRequestHelper { .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : Response() { override fun onResponse(response: ResponseBody?) { - Utils.toast(HaloApp.getInstance().application, "感谢您的举报") + Utils.toast(HaloApp.getInstance().application, "感谢您的投诉") } override fun onFailure(e: HttpException?) { diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index a7ae249f78..5459cb2808 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -12,10 +12,6 @@ import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; import android.provider.MediaStore; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.text.TextUtils; import android.view.View; @@ -79,6 +75,10 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.OnClick; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -499,14 +499,14 @@ public class SuggestionActivity extends BaseActivity implements OnRequestCallBac String entrance = "我的光环-反馈-[提交]"; if (!TextUtils.isEmpty(mSuggestContent)) { switch (mSuggestContent) { - case "问题举报": - entrance = "问题详情-举报-提交反馈"; + case "问题投诉": + entrance = "问题详情-投诉-提交反馈"; break; - case "回答举报": - entrance = "回答详情-举报-提交反馈"; + case "回答投诉": + entrance = "回答详情-投诉-提交反馈"; break; - case "文章举报": - entrance = "社区文章详情-举报-提交反馈"; + case "文章投诉": + entrance = "社区文章详情-投诉-提交反馈"; break; } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt index 4b7a254a52..f1ef13abac 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt @@ -45,12 +45,12 @@ class DescCommentsAdapter(context: Context, mContext.startActivity(RatingReplyActivity.getIntent(mContext, mViewModel.game!!, commentData, mEntrance, path)) } commentItem.setOnClickListener { - OptionDialogHelper.showOptionDialog(mContext, arrayListOf("查看", "回复", "复制", "举报"), callback = { type -> + OptionDialogHelper.showOptionDialog(mContext, arrayListOf("查看", "回复", "复制", "投诉"), callback = { type -> when (type) { "复制" -> { commentData.content.copyTextAndToast() } - "举报" -> { + "投诉" -> { CheckLoginUtils.checkLogin(mContext, mEntrance) { OptionDialogHelper.showOptionDialog(mContext, Constants.REPORT_LIST.toList(), callback = { reportType -> SimpleRequestHelper.reportGameComment(mViewModel.game?.id!!, commentData.id, reportType) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt index 41f6ece298..a43951c2ec 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt @@ -113,12 +113,12 @@ class RatingAdapter(context: Context, holder.setContent(commentData, mEntrance, path) holder.binding.run { commentItem.setOnClickListener { - OptionDialogHelper.showOptionDialog(mContext, arrayListOf("查看", "回复", "复制", "举报"), callback = { type -> + OptionDialogHelper.showOptionDialog(mContext, arrayListOf("查看", "回复", "复制", "投诉"), callback = { type -> when (type) { "复制" -> { commentData.content.copyTextAndToast() } - "举报" -> { + "投诉" -> { CheckLoginUtils.checkLogin(mContext, mEntrance) { OptionDialogHelper.showOptionDialog(mContext, Constants.REPORT_LIST.toList(), callback = { reportType -> SimpleRequestHelper.reportGameComment(mListViewModel.game.id, commentData.id, reportType) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt index d7d11f1759..1d2e34dac2 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt @@ -187,12 +187,12 @@ class RatingReplyAdapter(context: Context, } holder.itemView.setOnClickListener { - OptionDialogHelper.showOptionDialog(mContext, arrayListOf("回复", "复制", "举报"), callback = { type -> + OptionDialogHelper.showOptionDialog(mContext, arrayListOf("回复", "复制", "投诉"), callback = { type -> when (type) { "复制" -> { commentData.content.copyTextAndToast() } - "举报" -> { + "投诉" -> { mContext.ifLogin(entrance) { OptionDialogHelper.showOptionDialog(mContext, Constants.REPORT_LIST.toList(), callback = { reportType -> SimpleRequestHelper.reportGameComment(mEntityList[0].game!!.id, commentData.id, reportType) @@ -239,7 +239,7 @@ class RatingReplyAdapter(context: Context, } } - val dialogTypeList = arrayListOf("回复", "复制", "举报") + val dialogTypeList = arrayListOf("回复", "复制", "投诉") if (replyEntity.user.id == UserManager.getInstance().userId) { dialogTypeList.remove("回复") replyButton.visibility = View.GONE @@ -252,8 +252,8 @@ class RatingReplyAdapter(context: Context, "复制" -> { replyEntity.content.copyTextAndToast() } - "举报" -> { - mContext.ifLogin("游戏详情-评分-评论详情- 举报评论") { + "投诉" -> { + mContext.ifLogin("游戏详情-评分-评论详情- 投诉评论") { OptionDialogHelper.showOptionDialog(mContext, Constants.REPORT_LIST.toList(), callback = { reportType -> SimpleRequestHelper.reportGameCommentReply( mEntityList[0].game!!.id, diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt index a7299d63d0..b3ca3be770 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt @@ -683,7 +683,7 @@ class AnswerDetailFragment : NormalFragment() { dialog.dismiss() // 跳转意见反馈 SuggestionActivity.startSuggestionActivity(context, SuggestType.normal, "report", - "回答举报($mAnswerId):") + "回答投诉($mAnswerId):") } } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt index fb70d66cf3..f84a595968 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt @@ -573,7 +573,7 @@ class ArticleDetailActivity : BaseActivity() { startActivityForResult(ArticleEditActivity.getPatchIntent(this, mViewModel.detailEntity!!), ARTICLE_PATCH_REQUEST) } else { SuggestionActivity.startSuggestionActivity(this, SuggestType.normal, "report", - "文章举报(" + mViewModel.articleId + "):") + "文章投诉(" + mViewModel.articleId + "):") } } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java index 835d4c0d57..ed69030a5a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java @@ -436,7 +436,7 @@ public class QuestionsDetailFragment dialog.dismiss(); // 跳转意见反馈 SuggestionActivity.startSuggestionActivity(getContext(), SuggestType.normal, "report", - "问题举报(" + mQuestionsDetailEntity.getId() + "):"); + "问题投诉(" + mQuestionsDetailEntity.getId() + "):"); }); item2.setOnClickListener(v -> { GdtHelper.INSTANCE.logAction(ActionType.SHARE, diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 3d85bb5fc2..ac6753d111 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -450,7 +450,7 @@ public interface ApiService { Observable> getNewsCommentnum(@Path("article_id") String article_id, @Query("timestamp") long timestamp); /** - * 提交举报信息 + * 提交投诉信息 */ @POST("articles/comments/{comment_id}:report") Observable postReportData(@Path("comment_id") String comment_id, @Body RequestBody reportData); @@ -957,7 +957,7 @@ public interface ApiService { Observable postVoteAnswerComment(@Path("answer_id") String answerId, @Path("comment_id") String commentId); /** - * 举报回答的评论 + * 投诉回答的评论 */ @POST("answers/{answer_id}/comments/{comment_id}:report") Observable postReportOfAnswerComment(@Path("answer_id") String answerId, @Path("comment_id") String commentId, @Body RequestBody reportData); @@ -1394,7 +1394,7 @@ public interface ApiService { @Path("comment_id") String commentId); /** - * 举报社区文章评论 + * 投诉社区文章评论 */ @POST("communities/{community_id}/articles/{article_id}/comments/{comment_id}:report") Observable postCommunityArticleCommentReport(@Path("community_id") String communityId, @@ -1440,13 +1440,13 @@ public interface ApiService { Observable voteGameComment(@Path("game_id") String gameId, @Path("comment_id") String commentId); /** - * 举报评论 + * 投诉评论 */ @POST("games/{game_id}/comments/{comment_id}:report") Observable reportGameComment(@Path("game_id") String gameId, @Path("comment_id") String commentId, @Body RequestBody body); /** - * 举报评论回复 + * 投诉评论回复 */ @POST("games/{game_id}/comments/{comment_id}/replies/{reply_id}:report") Observable reportGameCommentReply(@Path("game_id") String gameId, diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/CommentService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/CommentService.java index 4a1cba374a..8069b0fb8a 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/CommentService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/CommentService.java @@ -27,7 +27,7 @@ // Observable> getNewsCommentnum(@Path("ids") String ids); // // @POST("report") -// //提交举报信息 +// //提交投诉信息 // Observable postReportData(@Body RequestBody reportData, @Header("TOKEN") String token); // // @Headers({"Content-Type: application/json", "Accept: application/json"}) diff --git a/app/src/main/res/layout/menu_answer_detail_more.xml b/app/src/main/res/layout/menu_answer_detail_more.xml index c0527a8db8..7c84fe3561 100644 --- a/app/src/main/res/layout/menu_answer_detail_more.xml +++ b/app/src/main/res/layout/menu_answer_detail_more.xml @@ -39,7 +39,7 @@ android:id="@+id/tv_report" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="举报" + android:text="投诉" android:textColor="@color/title" android:textSize="15sp" /> diff --git a/app/src/main/res/layout/menu_question_detail_more_item.xml b/app/src/main/res/layout/menu_question_detail_more_item.xml index 1a7fdaa574..9f8ce5af2b 100644 --- a/app/src/main/res/layout/menu_question_detail_more_item.xml +++ b/app/src/main/res/layout/menu_question_detail_more_item.xml @@ -38,7 +38,7 @@ android:id = "@+id/more_item_title1" android:layout_width = "wrap_content" android:layout_height = "wrap_content" - android:text = "举报" + android:text = "投诉" android:textColor = "@color/title" android:textSize = "15sp" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d48d1a618e..13c5b4c93a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -497,7 +497,7 @@ 收藏 关注 编辑 - 举报 + 投诉 操作说明 光环助手 - 回答详情