diff --git a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java index 50221e24cb..aa7a50b18b 100644 --- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java +++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java @@ -201,7 +201,7 @@ public class DetailDownloadUtils { } } else { DownloadDialog.getInstance(mViewHolder.context) - .showPopupWindow(v, mGameEntity, mEntrance, mName + ":" + mTitle); + .showPopupWindow(v, mGameEntity, StringUtils.buildString(mEntrance, "+(", mName, "[", mTitle, "])"), mName + ":" + mTitle); } } else { Utils.toast(mViewHolder.context, "稍等片刻~！游戏正在上传中..."); @@ -210,7 +210,7 @@ public class DetailDownloadUtils { String str = mViewHolder.downloadPer.getText().toString(); if ("下载中".equals(str)) { Intent intent = DownloadManagerActivity.getDownloadMangerIntent(mViewHolder.context, - mGameEntity.getApk().get(0).getUrl(), mEntrance + "("+ mName +"[" + mTitle + "])"); + mGameEntity.getApk().get(0).getUrl(), StringUtils.buildString(mEntrance, "+(", mName, "[", mTitle, "])")); mViewHolder.context.startActivity(intent); } else if ("安装".equals(str)) { PackageUtils.launchSetup(mViewHolder.context, mDownloadEntity.getPath()); @@ -236,9 +236,9 @@ public class DetailDownloadUtils { ApkEntity apkEntity = mGameEntity.getApk().get(0); String msg = FileUtils.isCanDownload(mViewHolder.context, apkEntity.getSize()); if (TextUtils.isEmpty(msg)) { - DataUtils.onGameDownloadEvent(mViewHolder.context, mGameEntity.getName(), apkEntity.getPlatform(), mEntrance, "下载开始"); + DataUtils.onGameDownloadEvent(mViewHolder.context, mGameEntity.getName(), apkEntity.getPlatform(), StringUtils.buildString(mEntrance, "+(", mName, "[", mTitle, "])"), "下载开始"); - DownloadManager.createDownload(mViewHolder.context, apkEntity, mGameEntity, method, mEntrance, mName + ":" + mTitle); + DownloadManager.createDownload(mViewHolder.context, apkEntity, mGameEntity, method, StringUtils.buildString(mEntrance, "+(", mName, "[", mTitle, "])"), mName + ":" + mTitle); mViewHolder.downloadTv.setVisibility(View.GONE); mViewHolder.downloadPb.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 00acf9a2e5..8b160fdc20 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -86,6 +86,7 @@ import rx.functions.Action1; import rx.schedulers.Schedulers; import static com.gh.common.util.EntranceUtils.KEY_DATA; +import static com.gh.common.util.EntranceUtils.KEY_TO; /** * 项目的主Activity，3个Fragment都嵌入在这里。 @@ -105,9 +106,9 @@ public class MainActivity extends BaseActivity { public void run() { if (getIntent() != null && getIntent().getExtras() != null && !isSkipped) { isSkipped = true; - Bundle bundle = getIntent().getBundleExtra("data"); + Bundle bundle = getIntent().getBundleExtra(KEY_DATA); if (bundle != null) { - String to = bundle.getString("to"); + String to = bundle.getString(KEY_TO); if (!TextUtils.isEmpty(to)) { Class clazz = ClassUtils.forName(to); if (clazz != null) { @@ -122,7 +123,7 @@ public class MainActivity extends BaseActivity { bundle.putInt("currentItem", 1); } - skipIntent.putExtra("data", bundle); + skipIntent.putExtra(KEY_DATA, bundle); startActivity(skipIntent); } } diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 0d862bbb35..11d5760812 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -172,7 +172,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, intent.putExtra("url", newsEntity.getLink()); intent.putExtra("gameName", newsEntity.getGameName()); intent.putExtra("newsId", newsEntity.getId()); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance + "+(消息详情[" + newsEntity.getGameName() + "])"); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); context.startActivity(intent); } else { Intent intent = new Intent(context, NewsDetailActivity.class); @@ -194,7 +194,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, intent.putExtra("url", newsEntity.getLink()); intent.putExtra("gameName", newsEntity.getGameName()); intent.putExtra("newsId", newsEntity.getId()); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance + "+(消息详情[" + newsEntity.getGameName() + "])"); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); context.startActivity(intent); } else { Intent intent = new Intent(context, NewsDetailActivity.class); diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index e780477834..4217c32ca0 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -267,7 +267,8 @@ public class NewsSearchActivity extends BaseActivity { // 统计阅读量 NewsUtils.statNewsViews(newsEntity.getId()); - NewsDetailActivity.startNewsDetailActivity(NewsSearchActivity.this, newsEntity, mEntrance + "+(游戏新闻搜索:" + searchKey + ")"); + NewsDetailActivity.startNewsDetailActivity(NewsSearchActivity.this, newsEntity, + mEntrance + "+(游戏新闻搜索[" + searchKey + "])"); } }); } else if (holder instanceof FooterViewHolder) { diff --git a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java index 97e9a0e9c5..d547cec787 100644 --- a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java @@ -14,6 +14,7 @@ import android.widget.TextView; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.BaseActivity; import com.gh.base.OnRequestCallBackListener; +import com.gh.common.util.EntranceUtils; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.adapter.ToolBoxRvAdapter; @@ -56,8 +57,9 @@ public class ToolBoxActivity extends BaseActivity implements SwipeRefreshLayout. }; @NonNull - public static Intent getIntent(Context context) { + public static Intent getIntent(Context context, String entrance) { Intent intent = new Intent(context, ToolBoxActivity.class); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); return intent; } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java index 4c85e79997..d670b35bc3 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java @@ -206,7 +206,8 @@ public class GameNewsAdapter extends BaseRecyclerAdapter { // 统计阅读量 NewsUtils.statNewsViews(newsEntity.getId()); - NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, StringUtils.buildString(mEntrance, "+(游戏新闻列表:", mNewsType + ")")); + NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, + StringUtils.buildString(mEntrance, "+(游戏新闻列表[", mNewsType + "])")); } }); } else if (holder instanceof NewsFooterViewHolder) { @@ -233,7 +234,7 @@ public class GameNewsAdapter extends BaseRecyclerAdapter { String searchKey = ((GameNewsSearchViewHolder) holder).searchEt.getText().toString().trim(); if (searchKey.length() >= 1) { Intent intent = NewsSearchActivity.getIntent(mContext, "搜索结果", searchKey, mGameId, - StringUtils.buildString(mEntrance, "+(游戏新闻列表:", mNewsType, ")")); + StringUtils.buildString(mEntrance, "+(游戏新闻列表[", mNewsType, "])")); mContext.startActivity(intent); } else { Toast.makeText(mContext, "请输入关键字", Toast.LENGTH_SHORT).show(); 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 ddd7d9334b..1a8e096143 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java @@ -97,6 +97,7 @@ public class ImagePagerAdapter extends RecyclingPagerAdapter { GameDetailActivity.startGameDetailActivity(mContext, slideEntity.getLink(), entrance); break; case "news": + //TODO 统一startNewsDetailActivity // 统计阅读量 NewsUtils.statNewsViews(slideEntity.getLink()); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java index 5a7a619e8f..7204584b0c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java @@ -438,11 +438,11 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { Map kv = new HashMap<>(); kv.put("名字", gameEntity.getName()); kv.put("位置", String.valueOf(holder.getPosition() + 1)); - DataUtils.onEvent(mContext, "点击", "我的光环-已安装", kv); + DataUtils.onEvent(mContext, "点击", "我的光环-我的游戏", kv); - DataCollectionUtils.uploadClick(mContext, "列表", "我的光环-已安装", gameEntity.getName()); + DataCollectionUtils.uploadClick(mContext, "列表", "我的光环-我的游戏", gameEntity.getName()); - GameDetailActivity.startGameDetailActivity(mContext, gameEntity.getId(), "(我的光环-已安装)"); + GameDetailActivity.startGameDetailActivity(mContext, gameEntity.getId(), "(我的光环:我的游戏)"); } } }); @@ -470,7 +470,7 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { holder.gameName.setPadding(0, 0, paddRight, 0); DownloadItemUtils.setOnClickListener(mContext, holder.gameDownloadBtn, gameEntity, i, - this, "(我的光环-已安装)", "我的光环-已安装" + ":" + gameEntity.getName()); + this, "(我的光环:我的游戏)", "我的光环-我的游戏" + ":" + gameEntity.getName()); DownloadItemUtils.updateItem(mContext, gameEntity, holder, false); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index 0e9efd3a82..b4a55b1d90 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -288,7 +288,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { viewHolder.imgLayout.setVisibility(View.VISIBLE); viewHolder.imgLayout.removeAllViews(); ConcernContentUtils.addContentPic(mContext, viewHolder.imgLayout, mConcernEntity.getImg(), - StringUtils.buildString(mEntrance, "+(消息详情[", mConcernEntity.getGameName(), "])"), + StringUtils.buildString(mEntrance, "+(消息详情)"), mContext.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(mContext, 34)); } @@ -321,12 +321,12 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { intent.putExtra("url", mConcernEntity.getLink()); intent.putExtra("gameName", mConcernEntity.getGameName()); intent.putExtra("newsId", mConcernEntity.getId()); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(mEntrance, "+(消息详情[", mConcernEntity.getGameName(), "])")); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(mEntrance, "+(消息详情)")); mContext.startActivity(intent); } else { Intent intent = new Intent(mContext, NewsDetailActivity.class); intent.putExtra("newsId", mConcernEntity.getId()); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(mEntrance, "+(消息详情[", mConcernEntity.getGameName(), "])")); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(mEntrance, "+(消息详情)")); mContext.startActivity(intent); } } diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index 232b6392db..e0e4f689c9 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -728,7 +728,9 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadPosition(mContext, "游戏", String.valueOf(finalI + 1), mSubjectDigestList.get(finalI).getName()); } else if (finalI == 3) { - mContext.startActivity(ToolBoxActivity.getIntent(mContext)); + mContext.startActivity(ToolBoxActivity.getIntent(mContext, "(游戏-专题:工具箱[1-5])")); + + DataCollectionUtils.uploadPosition(mContext, "游戏", "5", "工具箱"); } else if (finalI == 4) { Intent intent = KaiFuActivity.getIntent(mContext, "(游戏-专题:开服表[1-6])"); mContext.startActivity(intent); @@ -897,6 +899,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { GameDetailActivity.startGameDetailActivity(mContext, entity.getLink(), "(游戏-专题:" + name + "-大图)"); break; case "news": + //TODO 统一startNewsDetailActivity // 统计阅读量 NewsUtils.statNewsViews(entity.getLink()); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java index 91fae8dc38..77bd2d5aed 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java @@ -23,6 +23,7 @@ import com.gh.common.util.DisplayUtils; import com.gh.common.util.LibaoUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.QQUtils; +import com.gh.common.util.StringUtils; import com.gh.common.view.GridDivider; import com.gh.common.view.MarqueeView; import com.gh.gamecenter.GameDetailActivity; @@ -451,7 +452,8 @@ public class FuLiAdapter extends BaseRecyclerAdapter { @Override public void onClick(View v) { int index = mvNotice.getDisplayedChild(); - NewsDetailActivity.startNewsDetailActivity(mContext, notice.get(index), "游戏详情-公告"); + NewsDetailActivity.startNewsDetailActivity(mContext, notice.get(index), + StringUtils.buildString(entrance, "游戏详情[", mGameEntity.getName(), "]:公告")); } }); } else { @@ -539,7 +541,8 @@ public class FuLiAdapter extends BaseRecyclerAdapter { // 统计阅读量 NewsUtils.statNewsViews(newsEntity.getId()); - NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, entrance + "+(游戏详情[" + mGameEntity.getName() + "]:资讯攻略-列表[" + (ii + 1) + "])"); + NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, + entrance + "+(游戏详情[" + mGameEntity.getName() + "]:资讯攻略-列表[" + (ii + 1) + "])"); } }); viewHolder.newsList.addView(view); @@ -560,7 +563,8 @@ public class FuLiAdapter extends BaseRecyclerAdapter { viewHolder.libaoRv.setLayoutParams(params2); viewHolder.libaoRv.setLayoutManager(new LinearLayoutManager(mContext)); - viewHolder.libaoRv.setAdapter(new GameLibaoGalleryAdapter(mContext, mLibaoList, "")); + viewHolder.libaoRv.setAdapter(new GameLibaoGalleryAdapter(mContext, mLibaoList, + entrance + "+(游戏详情[" + mGameEntity.getName() + "]:游戏礼包")); viewHolder.openList.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java index 5b023634fe..d1f8c6b479 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java @@ -99,7 +99,8 @@ class GameLibaoGalleryAdapter extends BaseRecyclerAdapter { @Override public void onClick(View v) { int index = mvNotice.getDisplayedChild(); - NewsDetailActivity.startNewsDetailActivity(mContext, notice.get(index), "游戏详情-公告"); + NewsDetailActivity.startNewsDetailActivity(mContext, notice.get(index), + StringUtils.buildString(mEntrance, "+(游戏详情[", mGameEntity.getName(), "]:公告)")); } }); } @@ -499,18 +500,18 @@ public class XinXiAdapter extends BaseRecyclerAdapter { Map kv = new HashMap<>(); kv.put("名字", gameEntity.getName()); kv.put("位置", String.valueOf(holder.getPosition() + 1)); - DataUtils.onEvent(mContext, "点击", name, kv); + DataUtils.onEvent(mContext, "点击", "游戏详情-大家都在玩", kv); - DataCollectionUtils.uploadClick(mContext, "列表", name, gameEntity.getName()); + DataCollectionUtils.uploadClick(mContext, "大家都在玩", "游戏详情", gameEntity.getName()); GameDetailActivity.startGameDetailActivity(mContext, gameEntity, - StringUtils.buildString(mEntrance, "+(", name, "[", String.valueOf(position + 1), "])")); + StringUtils.buildString(mEntrance, "+(", "游戏详情", "[", mGameEntity.getName(), "]:大家都在玩[", String.valueOf(position + 1), "])")); } }); DownloadItemUtils.setOnClickListener(mContext, holder.gameDownloadBtn, gameEntity, position, this, - StringUtils.buildString(mEntrance, "+(", name, "[", String.valueOf(position + 1), "])"), - StringUtils.buildString(name, ":", gameEntity.getName())); + StringUtils.buildString(mEntrance, "+(游戏详情[", mGameEntity.getName(), "]:大家都在玩[", String.valueOf(position + 1), "])"), + StringUtils.buildString("游戏详情:", gameEntity.getName())); DownloadItemUtils.updateItem(mContext, gameEntity, holder, true); } diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java index c55e51e85b..14948c646d 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpAdapter.java @@ -61,6 +61,7 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter { private String mGameId; private String mDay; + private String entrance; private int mDataCount; @@ -68,9 +69,10 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter { private boolean mIsNetworkError; private boolean mIsLoaded; - public KaiFuVpAdapter(Context context, OnRequestCallBackListener onCallBackListener, String gameId, String day) { + public KaiFuVpAdapter(Context context, OnRequestCallBackListener onCallBackListener, String gameId, String day, String entrance) { super(context); + this.entrance = entrance; mGameId = gameId; mDay = day; mOnCallBackListener = onCallBackListener; @@ -244,7 +246,7 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter { return mEntityList.size() + 1; } - private void initGameTestViewHolder(final GameEntity gameEntity, GameTestViewHolder viewHolder) { + private void initGameTestViewHolder(final GameEntity gameEntity, final GameTestViewHolder viewHolder) { viewHolder.gameName.setText(gameEntity.getName()); viewHolder.gameThumb.setImageURI(gameEntity.getIcon()); @@ -273,20 +275,20 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter { DownloadItemUtils.setOnClickListener(mContext, viewHolder.gameDownloadBtn, gameEntity, viewHolder.getAdapterPosition(), KaiFuVpAdapter.this, - StringUtils.buildString("首页-推荐入口", "+(", "开服表", "[", String.valueOf(viewHolder.getAdapterPosition() + 1), "])"), - StringUtils.buildString("开服表", ":", gameEntity.getName())); + StringUtils.buildString(entrance, "+(开服表[", String.valueOf(viewHolder.getAdapterPosition() + 1), "])"), + StringUtils.buildString("开服表:", gameEntity.getName())); DownloadItemUtils.updateItem(mContext, gameEntity, viewHolder, true); viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - showSkiptDialog(gameEntity); + showSkiptDialog(gameEntity, viewHolder.getAdapterPosition() + 1); } }); } - private void showSkiptDialog(final GameEntity gameEntity) { + private void showSkiptDialog(final GameEntity gameEntity, final int position) { final Dialog dialog = new Dialog(mContext); @@ -326,7 +328,8 @@ public class KaiFuVpAdapter extends BaseRecyclerAdapter { EventBus.getDefault().post(new EBKaiFuReset(SINGLE_GAME_KAIFU, gameEntity.getId())); break; case "进入游戏详情": - GameDetailActivity.startGameDetailActivity(mContext, gameEntity, ""); + GameDetailActivity.startGameDetailActivity(mContext, gameEntity, + StringUtils.buildString(entrance, "+(开服表[", String.valueOf(position), "])")); break; case "返回所有游戏": EventBus.getDefault().post(new EBKaiFuReset(ALL_GAME_KAIFU, gameEntity.getId())); diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java index bdbf25e055..ade2939765 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java @@ -107,7 +107,7 @@ public class KaiFuVpFragment extends BaseFragment { ((DefaultItemAnimator) mRecyclerView.getItemAnimator()).setSupportsChangeAnimations(false); mLayoutManager = new LinearLayoutManager(getContext()); mRecyclerView.setLayoutManager(mLayoutManager); - mAdapter = new KaiFuVpAdapter(getContext(), this, mGameId, mDay); + mAdapter = new KaiFuVpAdapter(getContext(), this, mGameId, mDay, mEntrance); mRecyclerView.setAdapter(mAdapter); mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() { @@ -219,7 +219,7 @@ public class KaiFuVpFragment extends BaseFragment { mLoading.setVisibility(View.VISIBLE); mNoConn.setVisibility(View.GONE); mNoneData.setVisibility(View.GONE); - mAdapter = new KaiFuVpAdapter(getContext(), this, mGameId, mDay); + mAdapter = new KaiFuVpAdapter(getContext(), this, mGameId, mDay, mEntrance); mRecyclerView.setAdapter(mAdapter); } diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java index 7d62155314..fd7ac3b173 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java @@ -238,7 +238,8 @@ class Libao1FragmentAdapter extends BaseRecyclerAdapter { holder.libaoDes.setText(content); if (libaoEntity.getStatus() != null) { - LibaoUtils.initLibaoBtn(mContext, holder.libaoBtnStatus, libaoEntity, mLibaoDao, false, null, "(礼包中心-最新)"); + LibaoUtils.initLibaoBtn(mContext, holder.libaoBtnStatus, libaoEntity, mLibaoDao, false, null, + mEntrance + "+(礼包中心:最新)"); // holder.libaoBtnStatus.setClickable(false); String tv = holder.libaoBtnStatus.getText().toString(); if ("已结束".equals(tv) || "已领光".equals(tv)) { @@ -263,7 +264,7 @@ class Libao1FragmentAdapter extends BaseRecyclerAdapter { public void startLibaoDetailActivity(int position, LibaoEntity libaoEntity) { skipPosition = position; - Intent intent = LibaoDetailActivity.getIntent(mContext, libaoEntity, mEntrance + "+(礼包中心-最新)"); + Intent intent = LibaoDetailActivity.getIntent(mContext, libaoEntity, mEntrance + "+(礼包中心:最新)"); mLibao1Fragment.startActivityForResult(intent, 0x123); } diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index bb38732186..fd8a80ed27 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -340,7 +340,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { holder.libaoDes.setText(content); if (libaoEntity.getStatus() != null) { - LibaoUtils.initLibaoBtn(mContext, holder.libaoBtnStatus, libaoEntity, mLibaoDao, false, null, "(礼包中心-关注)"); + LibaoUtils.initLibaoBtn(mContext, holder.libaoBtnStatus, libaoEntity, mLibaoDao, false, null, mEntrance + "+(礼包中心:关注)"); holder.libaoBtnStatus.setClickable(false); String tv = holder.libaoBtnStatus.getText().toString(); if ("已结束".equals(tv) || "已领光".equals(tv)) { @@ -365,7 +365,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { public void startLibaoDetailActivity(int position, LibaoEntity libaoEntity) { skipPosition = position; - Intent intent = LibaoDetailActivity.getIntent(mContext, libaoEntity, mEntrance + "+(礼包中心-关注)"); + Intent intent = LibaoDetailActivity.getIntent(mContext, libaoEntity, mEntrance + "+(礼包中心:关注)"); mLibao2Fragment.startActivityForResult(intent, 0x123); } @@ -379,7 +379,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = ConcernActivity.getIntent(mContext, mEntrance + "+(礼包中心-关注)"); + Intent intent = ConcernActivity.getIntent(mContext, mEntrance + "+(礼包中心:关注)"); mLibao2Fragment.startActivityForResult(intent, 0x223); } }); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index 9ef6634552..9796023b98 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -133,7 +133,7 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - mContext.startActivity(LibaoDetailActivity.getIntent(mContext, libaoEntity, mEntrance + "+(礼包中心-存号箱)")); + mContext.startActivity(LibaoDetailActivity.getIntent(mContext, libaoEntity, mEntrance + "+(礼包中心:存号箱)")); } }); diff --git a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java index d20132af19..0f36188e45 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java @@ -15,6 +15,7 @@ import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.NewsUtils; +import com.gh.common.util.StringUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; @@ -122,14 +123,14 @@ public class News1FragmentAdapter extends BaseRecyclerAdapter { public void onClick(View v) { Map kv = new HashMap<>(); kv.put("名字", newsEntity.getTitle()); - kv.put("位置", String.valueOf(viewHolder.getPosition() + 1)); + kv.put("位置", String.valueOf(viewHolder.getAdapterPosition() + 1)); DataUtils.onEvent(mContext, "点击", "资讯-资讯", kv); DataCollectionUtils.uploadClick(mContext, "列表", "资讯-资讯", newsEntity.getTitle()); //统计阅读量 - statNewsViews(newsEntity, viewHolder.getPosition()); - NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, "(资讯:资讯[2-1])"); + statNewsViews(newsEntity, viewHolder.getAdapterPosition()); + NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, StringUtils.buildString("(资讯:资讯[" + viewHolder.getAdapterPosition() + "])")); } }); // viewHolder.thumb.setImageURI(newsEntity.getThumbnail().getUrl().get(0)); @@ -170,14 +171,14 @@ public class News1FragmentAdapter extends BaseRecyclerAdapter { public void onClick(View v) { Map kv = new HashMap<>(); kv.put("名字", newsEntity.getTitle()); - kv.put("位置", String.valueOf(viewHolder.getPosition() + 1)); + kv.put("位置", String.valueOf(viewHolder.getAdapterPosition() + 1)); DataUtils.onEvent(mContext, "点击", "资讯-资讯", kv); DataCollectionUtils.uploadClick(mContext, "列表", "资讯-资讯", newsEntity.getTitle()); //统计阅读量 - statNewsViews(newsEntity, viewHolder.getPosition()); - NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, "(资讯:资讯[2-1])"); + statNewsViews(newsEntity, viewHolder.getAdapterPosition()); + NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, StringUtils.buildString("(资讯:资讯[" + viewHolder.getAdapterPosition() + "])")); } }); viewHolder.title.setText(newsEntity.getTitle()); @@ -206,14 +207,14 @@ public class News1FragmentAdapter extends BaseRecyclerAdapter { public void onClick(View v) { Map kv = new HashMap<>(); kv.put("名字", newsEntity.getTitle()); - kv.put("位置", String.valueOf(viewHolder.getPosition() + 1)); + kv.put("位置", String.valueOf(viewHolder.getAdapterPosition() + 1)); DataUtils.onEvent(mContext, "点击", "资讯-资讯", kv); DataCollectionUtils.uploadClick(mContext, "列表", "资讯-资讯", newsEntity.getTitle()); //统计阅读量 - statNewsViews(newsEntity, viewHolder.getPosition()); - NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, "(资讯:资讯[2-1])"); + statNewsViews(newsEntity, viewHolder.getAdapterPosition()); + NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, StringUtils.buildString("(资讯:资讯[" + viewHolder.getAdapterPosition() + "])")); } }); viewHolder.title.setText(newsEntity.getTitle()); diff --git a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java index efcc9d0bee..dc3803cc44 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java @@ -569,8 +569,8 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { entity = LibaoEntity.Companion.createLibaoEntity(concernEntity, libaoStatusEntity, finalLibaoCode); } } - skipPosition = viewHolder.getPosition(); - Intent intent = LibaoDetailActivity.getIntent(mContext, entity, "(资讯:关注[2-4])"); + skipPosition = viewHolder.getAdapterPosition(); + Intent intent = LibaoDetailActivity.getIntent(mContext, entity, StringUtils.buildString("(资讯:关注[" + viewHolder.getAdapterPosition() + "])")); fragment.startActivityForResult(intent, 0x122); } }); @@ -627,11 +627,11 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { viewHolder.comment.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - skipPosition = viewHolder.getPosition(); + skipPosition = viewHolder.getAdapterPosition(); concernEntity.setItemHeight(viewHolder.itemView.getHeight()); AppController.put("ConcernEntity", concernEntity); Intent intent = new Intent(mContext, MessageDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(资讯:关注[2-4])"); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString("(资讯:关注[" + viewHolder.getAdapterPosition() + "])")); fragment.startActivityForResult(intent, 0x125); } }); @@ -656,7 +656,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { } bundle.putStringArrayList("shareArrImg", (ArrayList) concernEntity.getImg()); intent.putExtras(bundle); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(资讯:关注[2-4])"); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString("(资讯:关注[" + viewHolder.getAdapterPosition() + "])")); mContext.startActivity(intent); } else { Intent intent = ShareCardActivity.getIntent(mContext, concernEntity, shareContent); @@ -670,7 +670,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { public void onClick(View v) { Map kv = new HashMap<>(); kv.put("名字", concernEntity.getTitle()); - kv.put("位置", String.valueOf(viewHolder.getPosition() + 1)); + kv.put("位置", String.valueOf(viewHolder.getAdapterPosition() + 1)); DataUtils.onEvent(mContext, "点击", "资讯-关注", kv); DataCollectionUtils.uploadClick(mContext, "列表", "资讯-关注", concernEntity.getTitle()); @@ -684,13 +684,13 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { intent.putExtra("url", concernEntity.getLink()); intent.putExtra("gameName", concernEntity.getGameName()); intent.putExtra("newsId", concernEntity.getId()); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(资讯:关注[2-4])"); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString("(资讯:关注[" + viewHolder.getAdapterPosition() + "])")); fragment.startActivityForResult(intent, 0x125); } else { // Intent intent = new Intent(mContext, NewsDetailActivity.class); // intent.putExtra("newsId", concernEntity.getId()); // intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(资讯:关注[2-4])"); - Intent intent = NewsDetailActivity.getIntentById(mContext, concernEntity.getId(), "(资讯:关注[2-4])"); + Intent intent = NewsDetailActivity.getIntentById(mContext, concernEntity.getId(), StringUtils.buildString("(资讯:关注[" + viewHolder.getAdapterPosition() + "])")); fragment.startActivityForResult(intent, 0x125); } diff --git a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java index 6f85d6f918..861691d0a5 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import com.gh.common.util.DataUtils; import com.gh.common.util.NewsUtils; +import com.gh.common.util.StringUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.lightgame.adapter.BaseRecyclerAdapter; @@ -95,17 +96,17 @@ public class News3FragmentAdapter extends BaseRecyclerAdapter { Map kv = new HashMap<>(); kv.put("名字", newsEntity.getTitle()); kv.put("位置", String.valueOf(viewHolder.getPosition() + 1)); - DataUtils.onEvent(mContext, "点击", "游戏新闻详情", kv); + DataUtils.onEvent(mContext, "点击", "资讯-攻略", kv); Map map = new HashMap<>(); - map.put("page", "游戏新闻详情"); + map.put("page", "资讯-攻略"); map.put("news", newsEntity.getTitle()); map.put("news_id", newsEntity.getId()); DataCollectionManager.onEvent(mContext, "click-item", map); // 统计阅读量 NewsUtils.statNewsViews(newsEntity.getId()); - NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, "(资讯:攻略[2-2])"); + NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, StringUtils.buildString("(资讯:攻略[" + viewHolder.getAdapterPosition() + "])")); } }); } else { diff --git a/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java index 6ab4f75b74..d1b0a3e9e0 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java @@ -15,6 +15,7 @@ import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.NewsUtils; +import com.gh.common.util.StringUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; @@ -121,14 +122,14 @@ public class News4FragmentAdapter extends BaseRecyclerAdapter { public void onClick(View v) { Map kv = new HashMap<>(); kv.put("名字", newsEntity.getTitle()); - kv.put("位置", String.valueOf(viewHolder.getPosition() + 1)); + kv.put("位置", String.valueOf(viewHolder.getAdapterPosition() + 1)); DataUtils.onEvent(mContext, "点击", "资讯-原创", kv); DataCollectionUtils.uploadClick(mContext, "列表", "资讯-原创", newsEntity.getTitle()); //统计阅读量 - statNewsViews(newsEntity, viewHolder.getPosition()); - NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, "(资讯:原创[2-3])"); + statNewsViews(newsEntity, viewHolder.getAdapterPosition()); + NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, StringUtils.buildString("(资讯:原创[" + viewHolder.getAdapterPosition() + "])")); } }); // viewHolder.thumb.setImageURI(newsEntity.getThumbnail().getUrl().get(0)); @@ -176,7 +177,7 @@ public class News4FragmentAdapter extends BaseRecyclerAdapter { //统计阅读量 statNewsViews(newsEntity, viewHolder.getPosition()); - NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, "(资讯:原创[2-3])"); + NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, StringUtils.buildString("(资讯:原创 [" + viewHolder.getAdapterPosition() + "])")); } }); viewHolder.title.setText(newsEntity.getTitle()); @@ -212,7 +213,7 @@ public class News4FragmentAdapter extends BaseRecyclerAdapter { //统计阅读量 statNewsViews(newsEntity, viewHolder.getPosition()); - NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, "(资讯:原创[2-3])"); + NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity, StringUtils.buildString("(资讯:原创[" + viewHolder.getAdapterPosition() + "])")); } }); viewHolder.title.setText(newsEntity.getTitle()); diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index 496b4616e3..bc3c26323f 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -471,7 +471,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { // 统计阅读量 NewsUtils.statNewsViews(newsEntity.getId()); NewsDetailActivity.startNewsDetailActivity(mContext, newsEntity - , StringUtils.buildString(mEntrance, "+(新闻详情:相关推荐[", String.valueOf(viewHolder.getPosition() + 1), "])")); + , StringUtils.buildString(mEntrance, "+(新闻详情[", mTitle,"]:相关推荐[", String.valueOf(viewHolder.getPosition() + 1), "])")); } }); viewHolder.newsdetail_item_ll_news_more.addView(view); diff --git a/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java index 8a698687ca..b79358620b 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/ActivitySkipReceiver.java @@ -10,6 +10,8 @@ import com.gh.common.util.ClassUtils; import com.gh.common.util.RunningUtils; import com.gh.gamecenter.SplashScreenActivity; +import static com.gh.common.util.EntranceUtils.KEY_DATA; + /** * Created by khy on 2016/9/1. * 光环插件跳转助手 @@ -30,7 +32,7 @@ public class ActivitySkipReceiver extends BroadcastReceiver { if (clazz != null) { Intent intent1 = new Intent(context, clazz); intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent1.putExtra("data", bundle); + intent1.putExtra(KEY_DATA, bundle); context.startActivity(intent1); } } @@ -40,7 +42,7 @@ public class ActivitySkipReceiver extends BroadcastReceiver { intent1.setAction(Intent.ACTION_MAIN); intent1.addCategory(Intent.CATEGORY_LAUNCHER); intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent1.putExtra("data", bundle); + intent1.putExtra(KEY_DATA, bundle); context.startActivity(intent1); } } diff --git a/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java index 53566a99c4..b8c3a5d884 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java @@ -14,6 +14,8 @@ import com.gh.gamecenter.eventbus.EBMiPush; import org.greenrobot.eventbus.EventBus; +import static com.gh.common.util.EntranceUtils.KEY_TO; + /** * Created by LGT on 2016/10/10. @@ -53,7 +55,7 @@ public class InstallReceiver extends BroadcastReceiver { Intent intent2 = new Intent(context, SplashScreenActivity.class); intent2.setAction(Intent.ACTION_MAIN); intent2.addCategory(Intent.CATEGORY_LAUNCHER); - intent2.putExtra("to", DownloadManagerActivity.TAG); + intent2.putExtra(KEY_TO, DownloadManagerActivity.TAG); intent2.putExtra("currentItem", 0); intent2.putExtra("path", path); intent2.putExtra(EntranceUtils.KEY_ENTRANCE, "(安装跳转)"); diff --git a/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java index 22fba6ff2f..2374b33b8b 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java @@ -27,6 +27,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import static com.gh.common.util.EntranceUtils.KEY_TO; + /** * 用于接收点击小米推送的notification的广播 @@ -54,7 +56,7 @@ public class NotificationReceiver extends BroadcastReceiver { Intent intent1 = new Intent(context, SplashScreenActivity.class); intent1.setAction(Intent.ACTION_MAIN); intent1.addCategory(Intent.CATEGORY_LAUNCHER); - intent1.putExtra(EntranceUtils.KEY_TO, "NewsDetailActivity"); + intent1.putExtra(KEY_TO, "NewsDetailActivity"); intent1.putExtra(EntranceUtils.KEY_NEWSID, jsonObject.get("_id").toString()); intent1.putExtra(EntranceUtils.KEY_ENTRANCE, EntranceUtils.ENTRANCE_MIPUSH); intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -109,7 +111,7 @@ public class NotificationReceiver extends BroadcastReceiver { Intent intent2 = new Intent(context, SplashScreenActivity.class); intent2.setAction(Intent.ACTION_MAIN); intent2.addCategory(Intent.CATEGORY_LAUNCHER); - intent2.putExtra("to", DownloadManagerActivity.TAG); + intent2.putExtra(KEY_TO, DownloadManagerActivity.TAG); intent2.putExtra("currentItem", 1); intent2.putExtra("isPushIntent", true); intent2.putExtra(EntranceUtils.KEY_ENTRANCE, "(小米推送)"); @@ -136,7 +138,7 @@ public class NotificationReceiver extends BroadcastReceiver { Intent intent3 = new Intent(context, SplashScreenActivity.class); intent3.setAction(Intent.ACTION_MAIN); intent3.addCategory(Intent.CATEGORY_LAUNCHER); - intent3.putExtra("to", "GameDetailActivity"); + intent3.putExtra(KEY_TO, "GameDetailActivity"); intent3.putExtra(EntranceUtils.KEY_ENTRANCE, "(小米推送)"); Gson gson = new Gson(); GameEntity gameEntity = gson.fromJson(jsonObject.toString(), GameEntity.class); diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java index 6b9a37a593..47b999d7c6 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java @@ -239,27 +239,28 @@ public class SubjectAdapter extends BaseRecyclerAdapter { public void onClick(View v) { Map kv = new HashMap<>(); kv.put("名字", gameEntity.getName()); - kv.put("位置", "大图"); - DataUtils.onEvent(mContext, "点击", "游戏-专题-" + name, kv); + kv.put("位置", "头图"); + DataUtils.onEvent(mContext, "点击", mName, kv); - DataCollectionUtils.uploadClick(mContext, name + "-大图", "游戏-专题"); + DataCollectionUtils.uploadClick(mContext, "头图", mName); switch (gameEntity.getType()) { case "game": - GameDetailActivity.startGameDetailActivity(mContext, gameEntity.getLink(), "(游戏-专题:" + name + "-大图)"); + GameDetailActivity.startGameDetailActivity(mContext, gameEntity.getLink(), mEntrance + "(" + mName + ":大图)"); break; case "news": + //TODO 统一startNewsDetailActivity // 统计阅读量 NewsUtils.statNewsViews(gameEntity.getLink()); Intent intent = new Intent(mContext, NewsDetailActivity.class); intent.putExtra("newsId", gameEntity.getLink()); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(游戏-专题:" + name + "-大图)"); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, mEntrance + "(" + mName + ":大图)"); mContext.startActivity(intent); break; case "column": SubjectActivity.startSubjectActivity(mContext, gameEntity.getLink(), gameEntity.getName(), false - , "(游戏-专题:" + name + "-大图)"); + , mEntrance + "(" + mName + ":大图)"); break; } } @@ -347,13 +348,13 @@ public class SubjectAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadClick(mContext, "列表", mName, gameEntity.getName()); GameDetailActivity.startGameDetailActivity(mContext, gameEntity, - StringUtils.buildString(mEntrance, "+(", mName, "[", String.valueOf(position + 1), "])")); + StringUtils.buildString(mEntrance, "+(", mName, ":列表[", mType, "=", ("latest".equals(mOrder) ? "最新" : "最热"), "=", String.valueOf(position + 1), "])")); } }); DownloadItemUtils.setOnClickListener(mContext, holder.gameDownloadBtn, gameEntity, position, this, - StringUtils.buildString(mEntrance, "+(", mName, "[", String.valueOf(position + 1), "])"), + StringUtils.buildString(mEntrance, "+(", mName, ":列表[", mType, "=", ("latest".equals(mOrder) ? "最新" : "最热"), "=", String.valueOf(position + 1), "])"), StringUtils.buildString(mName, ":", gameEntity.getName())); DownloadItemUtils.updateItem(mContext, gameEntity, holder, true); @@ -430,7 +431,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadClick(mContext, "列表", mName, gameEntity.getName()); GameDetailActivity.startGameDetailActivity(mContext, gameEntity, - StringUtils.buildString(mEntrance, "+(", mName, "[", String.valueOf(position + 1), "])")); + StringUtils.buildString(mEntrance, "+(", mName, ":列表[", mType, "=", ("latest".equals(mOrder) ? "最新" : "最热"), "=", String.valueOf(position + 1), "])")); } }); @@ -445,7 +446,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { DownloadItemUtils.setOnClickListener(mContext, holder.gameDownloadBtn, gameEntity, position, SubjectAdapter.this, - StringUtils.buildString(mEntrance, "+(", mName, "[", String.valueOf(position + 1), "])"), + StringUtils.buildString(mEntrance, "+(", mName, ":列表[", mType, "=", ("latest".equals(mOrder) ? "最新" : "最热"), "=", String.valueOf(position + 1), "])"), StringUtils.buildString(mName, ":", gameEntity.getName())); DownloadItemUtils.updateItem(mContext, gameEntity, holder, true); diff --git a/libraries/LGLibrary b/libraries/LGLibrary index 570837f0a5..bdac8f8275 160000 --- a/libraries/LGLibrary +++ b/libraries/LGLibrary @@ -1 +1 @@ -Subproject commit 570837f0a508c6bcd33ce8c0dce57f905684672d +Subproject commit bdac8f8275817a489000a60128db5c9e89bbfa9f