From 11ac9f5f3eecadd82e4afbb51624bbb4d326d8e8 Mon Sep 17 00:00:00 2001 From: huangzhuanghua <401742778@qq.com> Date: Mon, 19 Dec 2016 16:33:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=95=B0=E6=8D=AE=E6=94=B6?= =?UTF-8?q?=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/base/BaseActivity.java | 6 +- .../java/com/gh/base/BaseDetailActivity.java | 25 +----- .../com/gh/base/BaseFragmentActivity.java | 2 +- .../main/java/com/gh/base/HomeFragment.java | 5 -- .../java/com/gh/common/util/DataUtils.java | 36 ++++++++ .../com/gh/common/util/DownloadItemUtils.java | 84 +------------------ .../com/gh/gamecenter/GameDetailActivity.java | 2 +- .../com/gh/gamecenter/NewsDetailActivity.java | 5 +- .../gh/gamecenter/adapter/SubjectAdapter.java | 43 ++++------ .../gh/gamecenter/entity/SubjectEntity.java | 9 +- .../gamecenter/game/Game1FragmentAdapter.java | 51 ++++------- .../gamecenter/game/Game2FragmentAdapter.java | 49 ++++------- .../gamecenter/game/GameFragmentAdapter.java | 74 +++++----------- .../com/gh/gamecenter/news/NewsFragment.java | 1 - 14 files changed, 125 insertions(+), 267 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index f6ab4f5a16..d5405a3360 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -139,7 +139,7 @@ public class BaseActivity extends Activity implements OnCallBackListener { } //如果是游戏分享，newsTitle默认为空 - public void showShare(String url, String gameName, String icon, String newsTitle, ArrayList tag, String entrance, String type) { + public void showShare(String url, String gameName, String icon, String newsTitle, ArrayList tag) { //判断是否是官方版 boolean isPlugin = false; @@ -153,9 +153,9 @@ public class BaseActivity extends Activity implements OnCallBackListener { ShareUtils.getInstance(this).showShareWindows(new View(this), url, gameName, icon, newsTitle, isPlugin); - if (newsTitle == null){ + if (newsTitle == null) { DataUtils.onEvent(this, "内容分享", gameName); - }else { + } else { DataUtils.onEvent(this, "内容分享", newsTitle); } } diff --git a/app/src/main/java/com/gh/base/BaseDetailActivity.java b/app/src/main/java/com/gh/base/BaseDetailActivity.java index b721177c32..aaef438017 100644 --- a/app/src/main/java/com/gh/base/BaseDetailActivity.java +++ b/app/src/main/java/com/gh/base/BaseDetailActivity.java @@ -34,9 +34,6 @@ import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.manager.PackageManager; import com.tencent.tauth.Tencent; -import java.util.HashMap; -import java.util.Map; - /** * Created by Administrator on 2016/9/19. * 游戏详情、新闻详情基类（控制底部下载栏） @@ -392,10 +389,7 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On private void download() { String str = detail_tv_download.getText().toString(); if (str.contains("启动")) { - Map kv = new HashMap<>(); - kv.put("版本", gameEntity.getApk().get(0).getPlatform()); - kv.put("页面", name); - DataUtils.onEvent(BaseDetailActivity.this, "游戏启动", gameEntity.getName(), kv); + DataUtils.onGameLaunchEvent(this, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), name); PackageUtils.launchApplicationByPackageName(this, gameEntity.getApk().get(0).getPackageName()); } else { @@ -410,22 +404,7 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On ApkEntity apkEntity = gameEntity.getApk().get(0); String msg = FileUtils.isCanDownload(this, apkEntity.getSize()); if (TextUtils.isEmpty(msg)) { - Map kv = new HashMap<>(); - kv.put("版本", apkEntity.getPlatform()); - kv.put("状态", "下载开始"); - DataUtils.onEvent(BaseDetailActivity.this, "游戏下载", gameEntity.getName(), kv); - - Map kv2 = new HashMap<>(); - kv2.put("版本", apkEntity.getPlatform()); - kv2.put("状态", "下载开始"); - kv2.put("页面", name); - kv2.put("位置", entrance); - DataUtils.onEvent(BaseDetailActivity.this, "游戏下载位置", gameEntity.getName(), kv2); - - Map kv3 = new HashMap<>(); - kv3.put(entrance, "下载数"); - kv3.put(entrance, "下载开始"); - DataUtils.onEvent(BaseDetailActivity.this, "应用数据", gameEntity.getName(), kv3); + DataUtils.onGameDownloadEvent(this, gameEntity.getName(), apkEntity.getPlatform(), entrance, "下载开始"); DownloadManager.createDownload(this, apkEntity, gameEntity, method, entrance, name + ":" + title); diff --git a/app/src/main/java/com/gh/base/BaseFragmentActivity.java b/app/src/main/java/com/gh/base/BaseFragmentActivity.java index ae57e14869..412a810f0e 100644 --- a/app/src/main/java/com/gh/base/BaseFragmentActivity.java +++ b/app/src/main/java/com/gh/base/BaseFragmentActivity.java @@ -131,7 +131,7 @@ public class BaseFragmentActivity extends FragmentActivity { } //如果是游戏分享，newsTitle默认为空 - public void showShare(String url, String gameName, String icon, String newsTitle, ArrayList tag, String entrance, String type) { + public void showShare(String url, String gameName, String icon, String newsTitle, ArrayList tag) { //判断是否是官方版 boolean isPlugin = false; diff --git a/app/src/main/java/com/gh/base/HomeFragment.java b/app/src/main/java/com/gh/base/HomeFragment.java index 41fa9dd3e6..d8d934c695 100644 --- a/app/src/main/java/com/gh/base/HomeFragment.java +++ b/app/src/main/java/com/gh/base/HomeFragment.java @@ -8,8 +8,6 @@ import android.os.Bundle; import android.os.Handler; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.view.ViewPager; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -21,7 +19,6 @@ import com.gh.common.constant.Config; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; -import com.gh.common.util.Utils; import com.gh.download.DownloadManager; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.DownloadManagerActivity; @@ -31,8 +28,6 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.manager.PackageManager; -import java.util.List; - import de.greenrobot.event.EventBus; /** diff --git a/app/src/main/java/com/gh/common/util/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java index 08e39bea8d..b10e4e3c26 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -10,6 +10,7 @@ import com.tencent.stat.StatReportStrategy; import com.tencent.stat.StatService; import com.tendcloud.tenddata.TCAgent; +import java.util.HashMap; import java.util.Map; import java.util.Properties; @@ -69,4 +70,39 @@ public class DataUtils { StatService.onResume(var0); } + // 游戏启动 + public static void onGameLaunchEvent(Context context, String gameName, String platform, String page) { + Map kv = new HashMap<>(); + kv.put("版本", platform); + kv.put("页面", page); + onEvent(context, "游戏启动", gameName, kv); + } + + // 游戏下载 + public static void onGameDownloadEvent(Context context, String gameName, String platform, String entrance, String status) { + Map kv = new HashMap<>(); + kv.put("版本", platform); + kv.put("状态", status); + DataUtils.onEvent(context, "游戏下载", gameName, kv); + + Map kv2 = new HashMap<>(); + kv2.put("版本", platform); + kv2.put("状态", status); + kv2.put("位置", entrance); + DataUtils.onEvent(context, "游戏下载位置", gameName, kv2); + + Map kv3 = new HashMap<>(); + kv3.put(entrance, "下载数"); + kv3.put(entrance, status); + DataUtils.onEvent(context, "应用数据", gameName, kv3); + } + + // 游戏更新 + public static void onGameUpdateEvent(Context context, String gameName, String paltform, String status) { + Map kv = new HashMap<>(); + kv.put("版本", paltform); + kv.put("状态", status); + DataUtils.onEvent(context, "游戏更新", gameName, kv); + } + } diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java index 7401ba6753..a5a11ecf6a 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -23,7 +23,6 @@ import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.PackageManager; import java.util.HashMap; @@ -417,9 +416,7 @@ public class DownloadItemUtils { } else if ("安装".equals(str)) { install(context, gameEntity, position, adapter); } else if ("启动".equals(str)) { - Map kv = new HashMap<>(); - kv.put("版本", gameEntity.getApk().get(0).getPlatform()); - DataUtils.onEvent(context, "游戏启动", gameEntity.getName(), kv); + DataUtils.onGameLaunchEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location); PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk().get(0).getPackageName()); } else if ("下载中".equals(str)) { @@ -476,26 +473,7 @@ public class DownloadItemUtils { GameEntity gameEntity, String entrance, String location) { - ApkEntity apkEntity = gameEntity.getApk().get(0); - //下载可更新游戏 - Map kv = new HashMap<>(); - kv.put("版本", apkEntity.getPlatform()); - kv.put("状态", "下载开始"); - DataUtils.onEvent(context, "游戏更新", gameEntity.getName(), kv); - - Map map = new HashMap<>(); - map.put("game", gameEntity.getName()); - map.put("game_id", gameEntity.getId()); - map.put("method", "更新"); - map.put("platform", PlatformUtils.getInstance(context) - .getPlatformName(gameEntity.getApk().get(0).getPlatform())); - map.put("status", "开始"); - map.put("location", location); - map.put("entrance", entrance); - map.put("btn_status", "更新"); - map.put("network", NetworkUtils.getConnectedType(context)); - DataCollectionManager.onEvent(context, "download", map); - + DataUtils.onGameUpdateEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), "下载开始"); DownloadManager.createDownload(context, gameEntity, "更新", entrance, location); } @@ -507,34 +485,7 @@ public class DownloadItemUtils { String location) { String msg = FileUtils.isCanDownload(context, gameEntity.getApk().get(0).getSize()); if (TextUtils.isEmpty(msg)) { - Map kv = new HashMap<>(); - kv.put("版本", gameEntity.getApk().get(0).getPlatform()); - kv.put("状态", "下载开始"); - DataUtils.onEvent(context, "游戏下载", gameEntity.getName(), kv); - - Map kv2 = new HashMap<>(); - kv2.put("版本", gameEntity.getApk().get(0).getPlatform()); - kv2.put("状态", "下载开始"); - kv2.put("位置", entrance + "-开始"); - DataUtils.onEvent(context, "游戏下载位置", gameEntity.getName(), kv2); - - Map kv3 = new HashMap<>(); - kv3.put(entrance, "下载数"); - kv3.put(entrance, "下载开始"); - DataUtils.onEvent(context, "应用数据", gameEntity.getName(), kv3); - - Map map = new HashMap<>(); - map.put("game", gameEntity.getName()); - map.put("game_id", gameEntity.getId()); - map.put("method", "正常"); - map.put("platform", PlatformUtils.getInstance(context) - .getPlatformName(gameEntity.getApk().get(0).getPlatform())); - map.put("status", "开始"); - map.put("location", location); - map.put("entrance", entrance); - map.put("btn_status", "下载"); - map.put("network", NetworkUtils.getConnectedType(context)); - DataCollectionManager.onEvent(context, "download", map); + DataUtils.onGameDownloadEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), entrance, "下载开始"); DownloadManager.createDownload(context, gameEntity, "下载", entrance, location); Toast.makeText(context, gameEntity.getName() + "已加入下载队列", Toast.LENGTH_SHORT).show(); @@ -557,34 +508,7 @@ public class DownloadItemUtils { String location) { String msg = FileUtils.isCanDownload(context, gameEntity.getApk().get(0).getSize()); if (TextUtils.isEmpty(msg)) { - Map kv = new HashMap<>(); - kv.put("版本", gameEntity.getApk().get(0).getPlatform()); - kv.put("状态", "下载开始"); - DataUtils.onEvent(context, "游戏下载", gameEntity.getName(), kv); - - Map kv2 = new HashMap<>(); - kv2.put("版本", gameEntity.getApk().get(0).getPlatform()); - kv2.put("状态", "下载开始"); - kv2.put("位置", entrance + "-开始"); - DataUtils.onEvent(context, "游戏下载位置", gameEntity.getName(), kv2); - - Map kv3 = new HashMap<>(); - kv3.put(entrance, "下载数"); - kv3.put(entrance, "下载开始"); - DataUtils.onEvent(context, "应用数据", gameEntity.getName(), kv3); - - Map map = new HashMap<>(); - map.put("game", gameEntity.getName()); - map.put("game_id", gameEntity.getId()); - map.put("method", "插件化"); - map.put("platform", PlatformUtils.getInstance(context) - .getPlatformName(gameEntity.getApk().get(0).getPlatform())); - map.put("status", "开始"); - map.put("location", location); - map.put("entrance", entrance); - map.put("btn_status", "插件化"); - map.put("network", NetworkUtils.getConnectedType(context)); - DataCollectionManager.onEvent(context, "download", map); + DataUtils.onGameDownloadEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), entrance, "下载开始"); DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location); Toast.makeText(context, gameEntity.getName() + "已加入下载队列", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index 19bda7f051..a4a379d52b 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -135,7 +135,7 @@ public class GameDetailActivity extends BaseDetailActivity implements View.OnCli DataCollectionUtils.uploadClick(this, "分享", "游戏详情", gameEntity.getName()); String url = "http://www.ghzhushou.com/game/" + adapter.getGameDetailEntity().getShareCode(); - showShare(url, gameEntity.getName(), gameEntity.getIcon(), null, gameEntity.getTag(), entrance, "游戏"); + showShare(url, gameEntity.getName(), gameEntity.getIcon(), null, gameEntity.getTag()); } else if (v == actionbar_rl_back) { if (ChangeSkinUtils.isChecking) { DialogUtils.showWarningDialog(GameDetailActivity.this, "退出提示", diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index b10aa1428d..b409832fe2 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -275,11 +275,10 @@ public class NewsDetailActivity extends BaseDetailActivity implements OnClickLis if (gameEntity == null){ showShare(url, adapter.getNewsDetailEntity().getTitle(), "http://image.ghzhushou.com/pic/57d604808ab49e467d8b4568.png", - adapter.getNewsDetailEntity().getTitle(), null, entrance, "新闻"); + adapter.getNewsDetailEntity().getTitle(), null); }else { showShare(url, gameEntity.getName(), gameEntity.getIcon(), - adapter.getNewsDetailEntity().getTitle(), gameEntity.getTag(), - entrance, "新闻"); + adapter.getNewsDetailEntity().getTitle(), gameEntity.getTag()); } } } else if (v == reuse_no_connection) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java index 0e508862ad..0943cd0dcc 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java @@ -297,7 +297,6 @@ public class SubjectAdapter extends RecyclerView.Adapter endTime) { - // 测试时间已过 - holder.downloadBtn.setVisibility(View.GONE); - } else { - // 测试时间未过 - DownloadItemUtils.setOnClickListener(context, - holder.downloadBtn, gameEntity, position, - SubjectAdapter.this, entrance + "+(" + name + ")", name + ":" + gameEntity.getName()); - - DownloadItemUtils.updateItem(context, holder.gameDes, - holder.game_progressbar, holder.game_ll_info, holder.download_speed, - holder.download_percentage, holder.downloadBtn, gameEntity); - } + if (gameEntity.getTest().getEnd() != 0) { + long endTime = Long.valueOf(gameEntity.getTest().getEnd() + "000"); + long todayTime = new Date().getTime(); + if (todayTime > endTime) { + // 测试时间已过 + gameEntity.setApk(null); } } + + DownloadItemUtils.setOnClickListener(context, + holder.downloadBtn, gameEntity, position, + SubjectAdapter.this, entrance + "+(" + name + ")", name + ":" + gameEntity.getName()); + + DownloadItemUtils.updateItem(context, holder.gameDes, + holder.game_progressbar, holder.game_ll_info, holder.download_speed, + holder.download_percentage, holder.downloadBtn, gameEntity); } private void initGameNormalViewHolder(final GameNormalViewHolder holder, int position) { diff --git a/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.java b/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.java index 8109d722d7..07cec00c91 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.java @@ -16,7 +16,8 @@ public class SubjectEntity { private String more; - private boolean order; + @SerializedName("order") + private boolean isOrder; private String home; @@ -46,12 +47,12 @@ public class SubjectEntity { this.more = more; } - public boolean getOrder() { - return order; + public boolean isOrder() { + return isOrder; } public void setOrder(boolean order) { - this.order = order; + this.isOrder = order; } public String getHome() { diff --git a/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java index 46f25e96d6..bc7a0128f7 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java @@ -617,7 +617,7 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter endTime) { - // 测试时间已过 - holder.downloadBtn.setVisibility(View.GONE); - } else { - // 测试时间未过 - DownloadItemUtils.setOnClickListener(context, - holder.downloadBtn, gameEntity, i, - Game1FragmentAdapter.this, - "(游戏-插件:" + subjectEntity.getName() + "-列表)", - "游戏-插件-" + subjectEntity.getName() + ":" + gameEntity.getName()); - - DownloadItemUtils.updateItem(context, holder.gameDes, - holder.game_progressbar, holder.game_ll_info, holder.download_speed, - holder.download_percentage, holder.downloadBtn, gameEntity); - } + if (gameEntity.getTest().getEnd() != 0) { + long endTime = Long.valueOf(gameEntity.getTest().getEnd() + "000"); + long todayTime = new Date().getTime(); + if (todayTime > endTime) { + // 测试时间已过 + gameEntity.setApk(null); } } + DownloadItemUtils.setOnClickListener(context, + holder.downloadBtn, gameEntity, i, + Game1FragmentAdapter.this, "(游戏-插件:" + subjectEntity.getName() + "-列表)", + "游戏-插件-" + subjectEntity.getName() + ":" + gameEntity.getName()); + + DownloadItemUtils.updateItem(context, holder.gameDes, + holder.game_progressbar, holder.game_ll_info, holder.download_speed, + holder.download_percentage, holder.downloadBtn, gameEntity); } private void initGameNormalViewHolder(GameNormalViewHolder holder, int position) { @@ -744,7 +727,7 @@ public class Game1FragmentAdapter extends RecyclerView.Adapter endTime) { - // 测试时间已过 - holder.downloadBtn.setVisibility(View.GONE); - } else { - // 测试时间未过 - DownloadItemUtils.setOnClickListener(context, - holder.downloadBtn, gameEntity, i, - Game2FragmentAdapter.this, "(游戏-推荐:" + subjectEntity.getName() + "-列表)", - "游戏-推荐-" + subjectEntity.getName() + ":" + gameEntity.getName()); - - DownloadItemUtils.updateItem(context, holder.gameDes, - holder.game_progressbar, holder.game_ll_info, holder.download_speed, - holder.download_percentage, holder.downloadBtn, gameEntity); - } + if (gameEntity.getTest().getEnd() != 0) { + long endTime = Long.valueOf(gameEntity.getTest().getEnd() + "000"); + long todayTime = new Date().getTime(); + if (todayTime > endTime) { + // 测试时间已过 + gameEntity.setApk(null); } } + DownloadItemUtils.setOnClickListener(context, + holder.downloadBtn, gameEntity, i, + Game2FragmentAdapter.this, "(游戏-推荐:" + subjectEntity.getName() + "-列表)", + "游戏-推荐-" + subjectEntity.getName() + ":" + gameEntity.getName()); + + DownloadItemUtils.updateItem(context, holder.gameDes, + holder.game_progressbar, holder.game_ll_info, holder.download_speed, + holder.download_percentage, holder.downloadBtn, gameEntity); } private void initGameImageViewHolder(GameImageViewHolder holder, int position) { 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 8825f483a4..9161de9197 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -20,6 +20,7 @@ import android.widget.Toast; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.common.constant.ItemViewType; +import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; @@ -52,7 +53,6 @@ import com.gh.gamecenter.entity.SlideEntity; import com.gh.gamecenter.entity.SubjectDigestEntity; import com.gh.gamecenter.entity.SubjectEntity; import com.gh.gamecenter.listener.OnCallBackListener; -import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.manager.PackageManager; import com.gh.gamecenter.retrofit.Response; @@ -710,7 +710,7 @@ public class GameFragmentAdapter extends RecyclerView.Adapter map = new HashMap<>(); - map.put("location", subjectEntity.getName() + "-列表"); - map.put("page", "游戏-插件"); - map.put("game", gameEntity.getName()); - map.put("game_id", gameEntity.getId()); - DataCollectionManager.onEvent(context, "click-item", map); + DataCollectionUtils.uploadClick(context, + subjectEntity.getName() + "-列表", "游戏-插件", gameEntity.getName()); GameUtils.startGameDetailActivity(context, gameEntity, "(游戏-插件:" + subjectEntity.getName() + "-列表)"); } }); - if (gameEntity.getApk() == null || gameEntity.getApk().isEmpty()) { - holder.downloadBtn.setVisibility(View.GONE); - } else { - if (gameEntity.getTest().getEnd() == 0) { - DownloadItemUtils.setOnClickListener(context, - holder.downloadBtn, gameEntity, i, - GameFragmentAdapter.this, "(游戏-插件:" + subjectEntity.getName() + "-列表)", - "游戏-插件-" + subjectEntity.getName() + ":" + gameEntity.getName()); - - DownloadItemUtils.updateItem(context, holder.gameDes, - holder.game_progressbar, holder.game_ll_info, holder.download_speed, - holder.download_percentage, holder.downloadBtn, gameEntity); - } else { - long endTime = Long.valueOf(gameEntity.getTest().getEnd() - + "000"); - long todayTime = new Date().getTime(); - if (todayTime > endTime) { - // 测试时间已过 - holder.downloadBtn.setVisibility(View.GONE); - } else { - // 测试时间未过 - DownloadItemUtils.setOnClickListener(context, - holder.downloadBtn, gameEntity, i, - GameFragmentAdapter.this, - "(游戏-插件:" + subjectEntity.getName() + "-列表)", - "游戏-插件-" + subjectEntity.getName() + ":" + gameEntity.getName()); - - DownloadItemUtils.updateItem(context, holder.gameDes, - holder.game_progressbar, holder.game_ll_info, holder.download_speed, - holder.download_percentage, holder.downloadBtn, gameEntity); - } + if (gameEntity.getTest().getEnd() != 0) { + long endTime = Long.valueOf(gameEntity.getTest().getEnd() + "000"); + long todayTime = new Date().getTime(); + if (todayTime > endTime) { + // 测试时间已过 + gameEntity.setApk(null); } } + DownloadItemUtils.setOnClickListener(context, + holder.downloadBtn, gameEntity, i, + GameFragmentAdapter.this, "(游戏-插件:" + subjectEntity.getName() + "-列表)", + "游戏-插件-" + subjectEntity.getName() + ":" + gameEntity.getName()); + + DownloadItemUtils.updateItem(context, holder.gameDes, + holder.game_progressbar, holder.game_ll_info, holder.download_speed, + holder.download_percentage, holder.downloadBtn, gameEntity); } private void initGameNormalViewHolder(GameNormalViewHolder holder, int position) { @@ -842,7 +821,7 @@ public class GameFragmentAdapter extends RecyclerView.Adapter map = new HashMap<>(); - map.put("location", subjectEntity.getName() + "-列表"); - map.put("page", "游戏-插件"); - map.put("game", gameEntity.getName()); - map.put("game_id", gameEntity.getId()); - DataCollectionManager.onEvent(context, "click-item", map); + DataCollectionUtils.uploadClick(context, + subjectEntity.getName() + "-列表", "游戏-插件", gameEntity.getName()); if (gameEntity.isPluggable()) { GameUtils.startGameDetailActivity(context, gameEntity.getId(), "(游戏-插件:" + subjectEntity.getName() + "-列表)"); @@ -930,10 +905,7 @@ public class GameFragmentAdapter extends RecyclerView.Adapter map = new HashMap<>(); - map.put("location", name + "-大图"); - map.put("page", "游戏-插件"); - DataCollectionManager.onEvent(context, "click-item", map); + DataCollectionUtils.uploadClick(context, name + "-大图", "游戏-插件"); if ("game".equals(entity.getType())) { GameUtils.startGameDetailActivity(context, entity.getLink(), "(游戏-插件:" + name + "-大图)"); @@ -1034,7 +1006,7 @@ public class GameFragmentAdapter extends RecyclerView.Adapter