diff --git a/app/src/main/java/com/gh/common/util/StringUtils.java b/app/src/main/java/com/gh/common/util/StringUtils.java index 2e11b90c0a..29c6e2325c 100644 --- a/app/src/main/java/com/gh/common/util/StringUtils.java +++ b/app/src/main/java/com/gh/common/util/StringUtils.java @@ -47,6 +47,14 @@ public class StringUtils { return displayName + "(" + description + ")"; } + public static String eliminateHtmlContent(String s) { + if (TextUtils.isEmpty(s)) return ""; + + s = Html.fromHtml(s).toString(); + s = s.replace("\n", ""); + return s; + } + /** * 截取字符串部分长度,超出的以 "..." 代替 * diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java index e4619a59cc..a001a0f0d3 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java @@ -88,7 +88,7 @@ public class ImagePagerAdapter extends RecyclingPagerAdapter { , "=", String.valueOf(getPosition(position) + 1) , "])"); - DataUtils.onMtaEvent(mContext, "轮播图", mSource, String.valueOf(position)); + DataUtils.onMtaEvent(mContext, "轮播图", mSource, String.valueOf(getPosition(position) % mSlideEntityList.size() + 1)); switch (slideEntity.getType()) { case "game": diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java index d633837c5d..4e7d6f7e43 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java @@ -214,7 +214,7 @@ public class GameDetailFragment extends NormalFragment { mTanBarXinXiTv.setTextColor(Color.BLACK); mTanBarXinXiTv.setBackgroundDrawable(new ColorDrawable(0)); - DataUtils.onMtaEvent(getContext(), "游戏详情", "默认[动态]", mGameEntity.getName()); + DataUtils.onMtaEvent(getContext(), "游戏详情", "默认_动态", mGameEntity.getName()); } else { mKaifuHint.setVisibility(View.GONE); mTanBarXinXiTv.setTextColor(Color.WHITE); @@ -222,7 +222,7 @@ public class GameDetailFragment extends NormalFragment { mTanBarFuLiTv.setTextColor(Color.BLACK); mTanBarFuLiTv.setBackgroundDrawable(new ColorDrawable(0)); - DataUtils.onMtaEvent(getContext(), "游戏详情", "默认[介绍]", mGameEntity.getName()); + DataUtils.onMtaEvent(getContext(), "游戏详情", "默认_介绍", mGameEntity.getName()); } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt index 93b6d0fd3b..382e407ffb 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt @@ -133,7 +133,7 @@ class FuLiAdapter(context: Context, holder.initItemPadding() holder.itemView.setOnClickListener { SuggestionActivity.startSuggestionActivity(mContext, SuggestType.gameQuestion, "game", mFuLiViewModel?.game?.name + ",问题反馈:") - DataUtils.onMtaEvent(mContext, "游戏详情", "此游戏有问题?点击反馈", mFuLiViewModel?.game?.name) + DataUtils.onMtaEvent(mContext, "游戏详情", "此游戏有问题_点击反馈", mFuLiViewModel?.game?.name) } } } @@ -199,7 +199,7 @@ class FuLiAdapter(context: Context, viewHolder.newsMore.setOnClickListener { DataCollectionUtils.uploadClick(mContext, "资讯攻略-全部", "游戏详情", mFuLiViewModel?.game?.name) - DataUtils.onMtaEvent(mContext, "游戏详情", "资讯攻略[全部]", mFuLiViewModel?.game?.name) + DataUtils.onMtaEvent(mContext, "游戏详情", "资讯攻略_全部", mFuLiViewModel?.game?.name) val intent = GameNewsActivity.getIntent(mContext, mFuLiViewModel?.game?.name, mFuLiViewModel?.game?.id, mEntrance + "+(游戏详情[" + mFuLiViewModel?.game?.name + "]:资讯攻略-全部)") mContext.startActivity(intent) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt index d9e8fd926e..42750f6274 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt @@ -152,7 +152,7 @@ class FuLiFragment : BaseFragment() { EventBus.getDefault().post(EBReuse("showKaifuHint")) } else if (GameDetailFragment.SCROLL_TO_KAIFU == reuse.type && layoutManager != null) { DataUtils.onMtaEvent(context, "游戏详情开服表按钮", mFuLiViewModel?.game?.name) - DataUtils.onMtaEvent(context, "游戏详情", "开服表↓", mFuLiViewModel?.game?.name) + DataUtils.onMtaEvent(context, "游戏详情", "开服表", mFuLiViewModel?.game?.name) val position = getServerPosition() if (position > 0) layoutManager?.smoothScrollToPosition(mRecyclerView, null, position) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.java b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.java index 05f19721a9..4a14871766 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailViewModel.java @@ -9,6 +9,7 @@ import android.text.Html; import com.gh.common.util.DataUtils; import com.gh.common.util.LogUtils; +import com.gh.common.util.StringUtils; import com.gh.gamecenter.qa.entity.AnswerDetailEntity; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -41,14 +42,8 @@ public class AnswerDetailViewModel extends AndroidViewModel { LogUtils.uploadAnswers(getApplication(), entrance, response.getQuestion(), answerId); - String uploadCount; String content = Html.fromHtml(response.getContent()).toString(); - if (content.length() > 30) { - uploadCount = content.substring(0, 30); - } else { - uploadCount = content; - } - DataUtils.onMtaEvent(getApplication(), "详情页面", "答案详情", uploadCount); + DataUtils.onMtaEvent(getApplication(), "详情页面", "答案详情", StringUtils.combineTwoString(content, answerId)); } @Override