Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

全局替换文案 举报->投诉

Browse Source
This commit is contained in:
kehaoyuan
2019-06-17 17:32:43 +08:00
parent b48a274707
commit 6345bb55d2
15 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/gh/common/util/CommentHelper.kt
View File

@ -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}")
}
}
}

10
app/src/main/java/com/gh/common/util/CommentUtils.java
View File

@ -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();

4
app/src/main/java/com/gh/common/util/SimpleRequestHelper.kt
View File

@ -23,7 +23,7 @@ object SimpleRequestHelper {
.observeOn(AndroidSchedulers.mainThread())
.subscribe(object : Response<ResponseBody>() {
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<ResponseBody>() {
override fun onResponse(response: ResponseBody?) {
Utils.toast(HaloApp.getInstance().application, "感谢您的举报")
Utils.toast(HaloApp.getInstance().application, "感谢您的投诉")
}
override fun onFailure(e: HttpException?) {

20
app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
View File

@ -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;
}
}

4
app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt
View File

@ -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)

4
app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt
View File

@ -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)

10
app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
View File

@ -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,

2
app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt
View File

@ -683,7 +683,7 @@ class AnswerDetailFragment : NormalFragment() {
dialog.dismiss()
// 跳转意见反馈
SuggestionActivity.startSuggestionActivity(context, SuggestType.normal, "report",
"回答举报（$mAnswerId）：")
"回答投诉（$mAnswerId）：")
}
}
}

2
app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
View File

@ -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 + "）：")
}
}
}

2
app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.java
View File

@ -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,

10
app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
View File

@ -450,7 +450,7 @@ public interface ApiService {
Observable<List<CommentnumEntity>> getNewsCommentnum(@Path("article_id") String article_id, @Query("timestamp") long timestamp);
/**
* 提交举报信息
* 提交投诉信息
*/
@POST("articles/comments/{comment_id}:report")
Observable<ResponseBody> postReportData(@Path("comment_id") String comment_id, @Body RequestBody reportData);
@ -957,7 +957,7 @@ public interface ApiService {
Observable<ResponseBody> postVoteAnswerComment(@Path("answer_id") String answerId, @Path("comment_id") String commentId);
/**
* 举报回答的评论
* 投诉回答的评论
*/
@POST("answers/{answer_id}/comments/{comment_id}:report")
Observable<ResponseBody> 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<ResponseBody> postCommunityArticleCommentReport(@Path("community_id") String communityId,
@ -1440,13 +1440,13 @@ public interface ApiService {
Observable<ResponseBody> voteGameComment(@Path("game_id") String gameId, @Path("comment_id") String commentId);
/**
* 举报评论
* 投诉评论
*/
@POST("games/{game_id}/comments/{comment_id}:report")
Observable<ResponseBody> 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<ResponseBody> reportGameCommentReply(@Path("game_id") String gameId,

2
app/src/main/java/com/gh/gamecenter/retrofit/service/CommentService.java
View File

@ -27,7 +27,7 @@
// Observable<List<CommentnumEntity>> getNewsCommentnum(@Path("ids") String ids);
//
// @POST("report")
// //提交举报信息
// //提交投诉信息
// Observable<ResponseBody> postReportData(@Body RequestBody reportData, @Header("TOKEN") String token);
//
// @Headers({"Content-Type: application/json", "Accept: application/json"})

2
app/src/main/res/layout/menu_answer_detail_more.xml
View File

@ -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" />
</LinearLayout>

2
app/src/main/res/layout/menu_question_detail_more_item.xml
View File

@ -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" />
</LinearLayout >

2
app/src/main/res/values/strings.xml
View File

@ -497,7 +497,7 @@
<string name = "menu_collect" >收藏</string >
<string name = "menu_concern" >关注</string >
<string name = "menu_edit" >编辑</string >
<string name = "menu_report" >举报</string >
<string name = "menu_report" >投诉</string >
<string name = "receive_instruction" >操作说明</string >
<string name = "answer_detail_title" >光环助手 - 回答详情</string >