From e9db55bcb67c2a295922bb3b0645dbb4fee2e31f Mon Sep 17 00:00:00 2001 From: jack Date: Tue, 22 Feb 2022 11:15:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9sonarQube=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/base/BaseRichEditorActivity.kt | 2 +- .../common/syncpage/example/ExampleAdapter.kt | 7 +++-- .../java/com/gh/common/util/EmojiUtils.java | 7 ++--- .../java/com/gh/gamecenter/MainActivity.java | 13 --------- .../viewholder/AnswerCommentViewHolder.java | 2 -- .../viewholder/AskTabItemViewHolder.java | 3 -- .../forum/detail/ForumDetailFragment.kt | 2 +- .../game/upload/GameUploadFragment.kt | 6 ++-- .../gamecenter/help/HelpQaCategoryAdapter.kt | 6 ---- .../gamecenter/help/HelpQaCategoryFragment.kt | 7 +++-- .../gh/gamecenter/libao/Libao1Fragment.java | 4 +-- .../gh/gamecenter/libao/Libao2Fragment.java | 10 +++---- .../gh/gamecenter/libao/Libao3Fragment.java | 10 +++---- .../qa/answer/draft/AnswerDraftAdapter.java | 4 --- .../qa/answer/fold/AnswerFoldFragment.java | 5 ++-- .../qa/article/edit/ArticleEditActivity.kt | 4 +-- .../qa/editor/FullScreenVideoView.kt | 1 - .../qa/editor/InsertVideoWrapperActivity.kt | 2 -- .../qa/myqa/ConcernQuestionsAdapter.java | 6 ---- .../qa/questions/detail/AnswerViewHolder.java | 28 ++++++++----------- .../invite/QuestionsInviteViewHolder.java | 26 ++++++++--------- .../QuestionsInviteWrapperFragment.java | 4 +-- 22 files changed, 54 insertions(+), 105 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt index 9196d0cdb0..95d1315fa4 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt @@ -275,7 +275,7 @@ abstract class BaseRichEditorActivity : ToolBarAct mEditorFont.isEnabled = isEnabled } - fun onRichClick() { + private fun onRichClick() { mEditorFont.setOnClickListener { controlEditorFontContainer() } diff --git a/app/src/main/java/com/gh/common/syncpage/example/ExampleAdapter.kt b/app/src/main/java/com/gh/common/syncpage/example/ExampleAdapter.kt index 695739b7b1..29dfea48ce 100644 --- a/app/src/main/java/com/gh/common/syncpage/example/ExampleAdapter.kt +++ b/app/src/main/java/com/gh/common/syncpage/example/ExampleAdapter.kt @@ -62,10 +62,11 @@ class ExampleAdapter(context: Context) : ListAdapter(context), ISy binding.title.setOnClickListener { if ("community_article" == answer.type) { mContext.startActivity(ArticleDetailActivity.getIntent(mContext, UserManager.getInstance().community, answer.id!!, "", getPath())) - } else { - val questions = answer.questions -// mContext.startActivity(QuestionsDetailActivity.getIntent(mContext, questions.id, "", getPath())) } +// else { +// val questions = answer.questions +// mContext.startActivity(QuestionsDetailActivity.getIntent(mContext, questions.id, "", getPath())) +// } } answerViewHolder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/gh/common/util/EmojiUtils.java b/app/src/main/java/com/gh/common/util/EmojiUtils.java index 6baef19f02..97a241e4b6 100644 --- a/app/src/main/java/com/gh/common/util/EmojiUtils.java +++ b/app/src/main/java/com/gh/common/util/EmojiUtils.java @@ -28,6 +28,9 @@ import java.util.Set; */ public class EmojiUtils { + private EmojiUtils() { + } + // Generated from https://unicode.org/Public/14.0.0/ucd/emoji/emoji-data.txt private static final Set EMOJI_HASH_SET = new HashSet<>(Arrays.asList( "1f000", "1f001", "1f002", "1f003", "1f004", "1f005", "1f006", "1f007", "1f008", "1f009", @@ -398,10 +401,6 @@ public class EmojiUtils { "e0072", "e0073", "e0074", "e0075", "e0076", "e0077", "e0078", "e0079", "e007a", "e007b", "e007c", "e007d", "e007e", "e007f", "fe0f")); - private static String toHexStr(char c) { - return Integer.toHexString(c); - } - private static String toHexStr(int c) { return Integer.toHexString(c); } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index bdfe037cd6..ae0ca324d2 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -272,9 +272,6 @@ public class MainActivity extends BaseActivity { ReservationRepository.refreshReservations(); - if (getIntent().getBooleanExtra(SWITCH_TO_COMMUNITY, false)) { - handler.postDelayed(this::switchToCommunityTabAndRefresh, 800); - } if (getIntent().getBooleanExtra(SWITCH_TO_VIDEO, false)) { handler.postDelayed(() -> mMainWrapperFragment.setCurrentItem(2), 800); } @@ -803,21 +800,11 @@ public class MainActivity extends BaseActivity { doSkip(); } - // 跳转到问答社区并刷新 - if (getIntent().getBooleanExtra(SWITCH_TO_COMMUNITY, false)) { - switchToCommunityTabAndRefresh(); - } if (getIntent().getBooleanExtra(SWITCH_TO_VIDEO, false)) { mMainWrapperFragment.setCurrentItem(2); } } - private void switchToCommunityTabAndRefresh() { -// getIntent().putExtra(SWITCH_TO_COMMUNITY, false); -// Log.e("Switch", "true"); -// EventBus.getDefault().post(new EBSkip(MainActivity.EB_SKIP_MAIN, MainWrapperFragment.INDEX_BBS)); -// EventBus.getDefault().post(new EBReuse(CommunityFragment.EB_RETRY_PAGE)); - } private void checkTinkerPath() { // CommonDebug.logMethodWithParams(this, TinkerManager.getTinkerId(), TinkerManager.getNewTinkerId()); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AnswerCommentViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AnswerCommentViewHolder.java index bef5320783..733bab8afc 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AnswerCommentViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AnswerCommentViewHolder.java @@ -3,10 +3,8 @@ package com.gh.gamecenter.adapter.viewholder; import com.gh.gamecenter.databinding.NewCommentItemBinding; public class AnswerCommentViewHolder extends CommentViewHolder { - public NewCommentItemBinding binding; public AnswerCommentViewHolder(NewCommentItemBinding binding) { super(binding.getRoot()); - this.binding = binding; } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AskTabItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AskTabItemViewHolder.java index 074e642669..9f328308ea 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AskTabItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AskTabItemViewHolder.java @@ -9,10 +9,7 @@ import com.gh.gamecenter.databinding.AskOrderTabItemBinding; public class AskTabItemViewHolder extends BaseRecyclerViewHolder { - public AskOrderTabItemBinding binding; - public AskTabItemViewHolder(AskOrderTabItemBinding binding) { super(binding.getRoot()); - this.binding = binding; } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt index 71af5ccf74..78d597f6e1 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt @@ -379,7 +379,7 @@ class ForumDetailFragment : BaseLazyTabFragment() { } } - fun onViewClick() { + private fun onViewClick() { mBinding.searchIv.setOnClickListener { NewLogUtils.logForumSearchEnter("论坛详情页搜索按钮") NewLogUtils.logForumDetailEnterOrClick("click_forum_detail_search") diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt index 350bae68ab..a52dd16c4b 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt @@ -168,7 +168,7 @@ class GameUploadFragment : NormalFragment() { MtaHelper.onEvent("游戏上传", "安装包", "点我选择") showSelectDialog() } - mBinding.gameIsNetworkingRg.setOnCheckedChangeListener { group, checkedId -> + mBinding.gameIsNetworkingRg.setOnCheckedChangeListener { _, checkedId -> when (checkedId) { R.id.gameNetworkingRb -> { mIsOnline = "yes" @@ -180,7 +180,7 @@ class GameUploadFragment : NormalFragment() { } } } - mBinding.gameLanguageRg.setOnCheckedChangeListener { group, checkedId -> + mBinding.gameLanguageRg.setOnCheckedChangeListener { _, checkedId -> when (checkedId) { R.id.gameLanguageChineseRb -> { mGameLanguage = "中文" @@ -196,7 +196,7 @@ class GameUploadFragment : NormalFragment() { } } } - mBinding.gameTypeRg.setOnCheckedChangeListener { group, checkedId -> + mBinding.gameTypeRg.setOnCheckedChangeListener { _, checkedId -> when (checkedId) { R.id.gameTypeLocalRb -> { mGameType = "local" diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt index 5991a84cbd..1e0613d5b6 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryAdapter.kt @@ -5,19 +5,13 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.gh.base.BaseRecyclerViewHolder import com.gh.common.util.DirectUtils import com.gh.common.util.MtaHelper import com.gh.common.util.NewLogUtils -import com.gh.common.util.dip2px -import com.gh.common.util.goneIf import com.gh.common.view.GridSpacingItemColorDecoration -import com.gh.gamecenter.QaActivity import com.gh.gamecenter.R -import com.gh.gamecenter.baselist.ListAdapter import com.gh.gamecenter.databinding.HelpQaCategoryItemBinding import com.gh.gamecenter.entity.HelpCategoryEntity -import com.lightgame.adapter.BaseRecyclerAdapter class HelpQaCategoryAdapter(val context: Context, val mQaCollectionId: String?) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt index 006fc1bc95..65b0de6c0e 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt @@ -3,13 +3,14 @@ package com.gh.gamecenter.help import android.os.Bundle import android.view.View import android.widget.TextView -import androidx.core.content.ContextCompat import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager -import com.gh.common.util.* +import com.gh.common.util.EntranceUtils +import com.gh.common.util.toDrawable +import com.gh.common.util.toObject +import com.gh.common.util.viewModelProvider import com.gh.common.view.CustomDividerItemDecoration -import com.gh.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.databinding.FragmentQaCategoryBinding import com.gh.gamecenter.entity.ErrorEntity diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java index 91aeebddbc..699111887c 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java @@ -75,9 +75,7 @@ public class Libao1Fragment extends BaseFragment implements SwipeRefreshLayout.O return false; }); - TextHelper.limitTheLengthOfEditText(mBinding.searchBar.etSearch, 50, () -> { - Utils.toast(mBinding.searchBar.etSearch.getContext(), "最多输入50个字"); - }); + TextHelper.limitTheLengthOfEditText(mBinding.searchBar.etSearch, 50, () -> Utils.toast(mBinding.searchBar.etSearch.getContext(), "最多输入50个字")); } private void changeFragment() { diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java index c6bc2f5b6c..08fa96106c 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -1,5 +1,7 @@ package com.gh.gamecenter.libao; +import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; + import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; @@ -26,8 +28,6 @@ import com.gh.gamecenter.eventbus.EBUISwitch; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; -import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; - /** * Created by khy on 2016/12/12. */ @@ -178,10 +178,8 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBUISwitch busNine) { if (LibaoFragment.EB_LIBAOACTIVITY_TAG.equals(busNine.getFrom())) { - if (busNine.getPosition() == 1) { - if (mBinding.reuseLoading.getRoot().getVisibility() == View.VISIBLE) { - adapter.addList(); - } + if (busNine.getPosition() == 1 && mBinding.reuseLoading.getRoot().getVisibility() == View.VISIBLE) { + adapter.addList(); } } } diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java index 55dfe3d587..33ec9759e0 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -1,5 +1,7 @@ package com.gh.gamecenter.libao; +import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; + import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; @@ -21,8 +23,6 @@ import com.gh.gamecenter.eventbus.EBUISwitch; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; -import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; - /** * Created by khy on 2016/12/12. */ @@ -153,10 +153,8 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBUISwitch busNine) { if (LibaoFragment.EB_LIBAOACTIVITY_TAG.equals(busNine.getFrom())) { - if (busNine.getPosition() == 2) { - if (mBinding.reuseLoading.getRoot().getVisibility() == View.VISIBLE) { - adapter.loadData(); - } + if (busNine.getPosition() == 2 && mBinding.reuseLoading.getRoot().getVisibility() == View.VISIBLE) { + adapter.loadData(); } } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftAdapter.java index 09a00e4ca4..19337250fc 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/draft/AnswerDraftAdapter.java @@ -122,10 +122,6 @@ class AnswerDraftAdapter extends ListAdapter { } else { img.setVisibility(View.GONE); } - binding.answerDraftItemTitle.setOnClickListener(v -> { -// Questions questions = answerEntity.getQuestions(); -// mContext.startActivity(QuestionsDetailActivity.getIntent(mContext, questions.getId(), mEntrance, "我的问答-我的草稿")); - }); binding.answerDraftItemDelete.setOnClickListener(v -> { DialogHelper.showDialog(mContext, "警告", "确定要删除回答草稿吗？删除之后不可恢复", "确定", "取消", () -> deleteAnswerDraft(answerEntity), () -> { }, false, "", ""); diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldFragment.java b/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldFragment.java index 65498a2224..f9360e942d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/fold/AnswerFoldFragment.java @@ -29,7 +29,6 @@ import io.reactivex.Observable; */ public class AnswerFoldFragment extends ListFragment { - private FragmentQuestionsdetailFoldBinding mBinding; private AnswerFoldAdapter mAdapter; private String mQuestionsId; @@ -59,8 +58,8 @@ public class AnswerFoldFragment extends ListFragment startActivity(NewsDetailActivity.getIntentById(getContext(), + FragmentQuestionsdetailFoldBinding mBinding = FragmentQuestionsdetailFoldBinding.bind(mCachedView); + mBinding.askFoldHint.setOnClickListener(v -> startActivity(NewsDetailActivity.getIntentById(getContext(), "5a50a008d53f8b23008b465a", "(折叠答案)"))); } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt index 41c1f4de81..749e555c07 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt @@ -125,7 +125,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb checkPostButtonEnable() } - mBinding.articleEditTitle.setOnTouchListener { v, event -> + mBinding.articleEditTitle.setOnTouchListener { _, _ -> closeExtendedKeyboard() false } @@ -136,7 +136,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb //setEditTextInputSpace() mBinding.articleEditTitle.filters = arrayOf(TextHelper.getFilter(50, "标题最多50个字")) - mBinding.articleEditTitle.doOnTextChanged { text, start, count, after -> + mBinding.articleEditTitle.doOnTextChanged { text, start, _, _ -> if (text?.contains("\n") == true) { mBinding.articleEditTitle.setText(text.toString().replace("\n", "")) mBinding.articleEditTitle.setSelection(start) diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoView.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoView.kt index cf4468e471..148ef3b8f5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoView.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoView.kt @@ -12,7 +12,6 @@ import android.view.View import android.widget.ImageView import android.widget.SeekBar import androidx.core.content.ContextCompat -import com.facebook.drawee.view.SimpleDraweeView import com.gh.common.constant.Constants import com.gh.common.observer.MuteCallback import com.gh.common.observer.VolumeObserver diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt index 3db4d10cb4..aab641d485 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt @@ -7,9 +7,7 @@ import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout import com.gh.common.util.EntranceUtils import com.gh.gamecenter.R -import com.gh.gamecenter.collection.GamesCollectionFragment import com.gh.gamecenter.collection.VideoFragment -import com.gh.gamecenter.manager.UserManager class InsertVideoWrapperActivity : BaseActivity_TabLayout() { diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsAdapter.java index fbb96db28d..8243ee9c5d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/ConcernQuestionsAdapter.java @@ -61,12 +61,6 @@ class ConcernQuestionsAdapter extends ListAdapter implements ISyncAda case ItemViewType.ITEM_BODY: Questions questions = mEntityList.get(position); ((CommunityQuestionViewHolder) holder).bindMyQuestionViewHolder(questions, mEntrance, "我的问答-关注问题"); - holder.itemView.setOnClickListener(v -> { -// if (mContext instanceof Activity) { -// Intent intent = QuestionsDetailActivity.getIntent(mContext, questions.getId(), mEntrance, "我的问答-关注问题", true); -// ((Activity) mContext).startActivityForResult(intent, ConcernQuestionsFragment.KEY_CHECK_QUESTION_CONCERN); -// } - }); break; case ItemViewType.ITEM_FOOTER: FooterViewHolder footerViewHolder = (FooterViewHolder) holder; diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java index 195d385074..395c243620 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java @@ -67,14 +67,12 @@ public class AnswerViewHolder extends BaseRecyclerViewHolder { binding.sdvUserBadge.setVisibility(View.GONE); binding.tvBadgeName.setVisibility(View.GONE); } - binding.sdvUserBadge.setOnClickListener(v -> { - DialogUtils.showViewBadgeDialog(context, user.getBadge(), - () -> { - MtaHelper.onEvent("进入徽章墙_用户记录", "问题详情", user.getName() + "（" + user.getId() + "）"); - MtaHelper.onEvent("徽章中心", "进入徽章中心", "问题详情"); - DirectUtils.directToBadgeWall(context, user.getId(), user.getName(), user.getIcon()); - }); - }); + binding.sdvUserBadge.setOnClickListener(v -> DialogUtils.showViewBadgeDialog(context, user.getBadge(), + () -> { + MtaHelper.onEvent("进入徽章墙_用户记录", "问题详情", user.getName() + "（" + user.getId() + "）"); + MtaHelper.onEvent("徽章中心", "进入徽章中心", "问题详情"); + DirectUtils.directToBadgeWall(context, user.getId(), user.getName(), user.getIcon()); + })); binding.tvBadgeName.setOnClickListener(v -> binding.sdvUserBadge.performClick()); setAnswerImage(entity.getImages(), entity.getPassVideos()); if (entity.getTime() != null && entity.getTime() != 0) { @@ -120,14 +118,12 @@ public class AnswerViewHolder extends BaseRecyclerViewHolder { } else { key = "插入回答-收藏回答列表"; } - binding.sdvUserBadge.setOnClickListener(v -> { - DialogUtils.showViewBadgeDialog(context, user.getBadge(), - () -> { - MtaHelper.onEvent("进入徽章墙_用户记录", key, user.getName() + "（" + user.getId() + "）"); - MtaHelper.onEvent("徽章中心", "进入徽章中心", key); - DirectUtils.directToBadgeWall(context, user.getId(), user.getName(), user.getIcon()); - }); - }); + binding.sdvUserBadge.setOnClickListener(v -> DialogUtils.showViewBadgeDialog(context, user.getBadge(), + () -> { + MtaHelper.onEvent("进入徽章墙_用户记录", key, user.getName() + "（" + user.getId() + "）"); + MtaHelper.onEvent("徽章中心", "进入徽章中心", key); + DirectUtils.directToBadgeWall(context, user.getId(), user.getName(), user.getIcon()); + })); binding.tvBadgeName.setOnClickListener(v -> binding.sdvUserBadge.performClick()); ImageUtils.displayIcon(binding.askAnswerItemUsericon, user.getIcon()); diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java index 1e816cb518..421bcc905e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java @@ -71,19 +71,17 @@ public class QuestionsInviteViewHolder extends BaseRecyclerViewHolder { - DialogUtils.showViewBadgeDialog(context, entity.getBadge(), - () -> { - String key = ""; - if (path.equals("问题详情-邀请列表")) { - key = "问题详情-邀请"; - } else if (path.equals("问题详情-邀请回答")) { - key = "邀请回答列表"; - } - MtaHelper.onEvent("进入徽章墙_用户记录", key, entity.getName() + "（" + entity.getId() + "）"); - MtaHelper.onEvent("徽章中心", "进入徽章中心", key); - DirectUtils.directToBadgeWall(context, entity.getId(), entity.getName(), entity.getIcon()); - }); - }); + binding.sdvUserBadge.setOnClickListener(v -> DialogUtils.showViewBadgeDialog(context, entity.getBadge(), + () -> { + String key = ""; + if (path.equals("问题详情-邀请列表")) { + key = "问题详情-邀请"; + } else if (path.equals("问题详情-邀请回答")) { + key = "邀请回答列表"; + } + MtaHelper.onEvent("进入徽章墙_用户记录", key, entity.getName() + "（" + entity.getId() + "）"); + MtaHelper.onEvent("徽章中心", "进入徽章中心", key); + DirectUtils.directToBadgeWall(context, entity.getId(), entity.getName(), entity.getIcon()); + })); } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteWrapperFragment.java index b826f7fab1..bad299993a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteWrapperFragment.java @@ -106,9 +106,7 @@ public class QuestionsInviteWrapperFragment extends NormalFragment { mBinding.searchInput.setHint("搜索光环用户"); - TextHelper.limitTheLengthOfEditText(mBinding.searchInput, 12, () -> { - Utils.toast(mBinding.searchInput.getContext(), "最多输入12个字"); - }); + TextHelper.limitTheLengthOfEditText(mBinding.searchInput, 12, () -> Utils.toast(mBinding.searchInput.getContext(), "最多输入12个字")); mBinding.searchInput.setOnEditorActionListener((v, actionId, event) -> { if (actionId == EditorInfo.IME_ACTION_SEARCH) {