diff --git a/app/libs/mid-sdk-2.3.jar b/app/libs/mid-sdk-2.3.jar new file mode 100644 index 0000000000..c57e1ab0de Binary files /dev/null and b/app/libs/mid-sdk-2.3.jar differ diff --git a/app/libs/mta-android-stat-sdk-2.2.0_20160504.jar b/app/libs/mta-android-stat-sdk-2.2.0_20160504.jar new file mode 100644 index 0000000000..c77a04d051 Binary files /dev/null and b/app/libs/mta-android-stat-sdk-2.2.0_20160504.jar differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 37d032f5a3..5a5dc0413c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -65,6 +65,7 @@ android:icon="@drawable/logo" android:label="@string/app_name" android:theme="@style/AppThemeNormal" > + @@ -72,6 +73,14 @@ android:name="TD_CHANNEL_ID" android:value="GH_200" /> + + + + map = new HashMap(); map.put("content", errorMsg); map.put("createdOn", System.currentTimeMillis() / 1000); diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index dacf2f5801..b23b873124 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -17,6 +17,7 @@ import android.widget.TextView; import android.widget.Toast; import com.gh.common.constant.Config; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.RunningUtils; @@ -25,11 +26,8 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBShowDialog; import com.gh.gamecenter.manager.SystemBarTintManager; import com.gh.gamecenter.manager.SystemBarTintManager.SystemBarConfig; -import com.tendcloud.tenddata.TCAgent; import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; import cn.sharesdk.framework.ShareSDK; import de.greenrobot.event.EventBus; @@ -179,20 +177,6 @@ public class BaseActivity extends Activity { // siteUrl是分享此内容的网站地址，仅在QQ空间使用 oks.setSiteUrl(url); - final Map map = new HashMap(); - map.put("title", title); - map.put("url", url); - map.put("from", entrance); - map.put("createdOn", System.currentTimeMillis() / 1000); - -// oks.setOnShareButtonClickListener(new OnShareButtonClickListener() { -// @Override -// public void onClick(View v, List checkPlatforms) { -// map.put("method", checkPlatforms.get(0).getClass().getSimpleName()); -// DataCollectionManager.onEvent(BaseActivity.this, "share", map); -// } -// }); - oks.setOnFinishListener(new PlatformPage.OnFinishListener() { @Override public void onFinish() { @@ -203,7 +187,7 @@ public class BaseActivity extends Activity { // 启动分享GUI oks.show(this); - TCAgent.onEvent(this, "内容分享", title); + DataUtils.onEvent(this, "内容分享", title); isShowShare = true; } @@ -229,7 +213,7 @@ public class BaseActivity extends Activity { protected void onPause() { super.onPause(); AppLog("onPause"); - TCAgent.onPause(this); + DataUtils.onPause(this); isPause = true; } @@ -243,7 +227,7 @@ public class BaseActivity extends Activity { protected void onResume() { super.onResume(); AppLog("onResume"); - TCAgent.onResume(this); + DataUtils.onResume(this); isPause = false; } diff --git a/app/src/main/java/com/gh/base/BaseFragmentActivity.java b/app/src/main/java/com/gh/base/BaseFragmentActivity.java index 1562ba8137..bd3075f9f9 100644 --- a/app/src/main/java/com/gh/base/BaseFragmentActivity.java +++ b/app/src/main/java/com/gh/base/BaseFragmentActivity.java @@ -17,6 +17,7 @@ import android.widget.TextView; import android.widget.Toast; import com.gh.common.constant.Config; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.RunningUtils; @@ -25,11 +26,8 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBShowDialog; import com.gh.gamecenter.manager.SystemBarTintManager; import com.gh.gamecenter.manager.SystemBarTintManager.SystemBarConfig; -import com.tendcloud.tenddata.TCAgent; import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; import cn.sharesdk.framework.ShareSDK; import de.greenrobot.event.EventBus; @@ -172,22 +170,6 @@ public class BaseFragmentActivity extends FragmentActivity { // siteUrl是分享此内容的网站地址，仅在QQ空间使用 oks.setSiteUrl(url); - final Map map = new HashMap(); - map.put("title", title); - map.put("url", url); - map.put("from", entrance); - map.put("createdOn", System.currentTimeMillis() / 1000); - -// oks.setOnShareButtonClickListener(new OnShareButtonClickListener() { -// @Override -// public void onClick(View v, List checkPlatforms) { -// map.put("method", checkPlatforms.get(0).getClass() -// .getSimpleName()); -// DataCollectionManager.onEvent(BaseFragmentActivity.this, -// "share", map); -// } -// }); - oks.setOnFinishListener(new PlatformPage.OnFinishListener() { @Override public void onFinish() { @@ -198,7 +180,7 @@ public class BaseFragmentActivity extends FragmentActivity { // 启动分享GUI oks.show(this); - TCAgent.onEvent(this, "内容分享", title); + DataUtils.onEvent(this, "内容分享", title); isShowShare = true; } @@ -224,7 +206,7 @@ public class BaseFragmentActivity extends FragmentActivity { protected void onPause() { super.onPause(); AppLog("onPause"); - TCAgent.onPause(this); + DataUtils.onPause(this); isPause = true; } @@ -238,7 +220,7 @@ public class BaseFragmentActivity extends FragmentActivity { protected void onResume() { super.onResume(); AppLog("onResume"); - TCAgent.onResume(this); + DataUtils.onResume(this); isPause = false; } diff --git a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java deleted file mode 100644 index a60a024636..0000000000 --- a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.gh.common.util; - -import android.content.Context; - -import com.android.volley.Request.Method; -import com.android.volley.Response; -import com.android.volley.VolleyError; -import com.gh.base.AppController; -import com.gh.common.constant.Constants; -import com.gh.gamecenter.db.DataCollectionDao; -import com.gh.gamecenter.db.info.DataCollectionInfo; -import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -public class DataCollectionUtils { - - public static void uploadData(Context context) { - final DataCollectionDao dao = new DataCollectionDao(context); - List list = dao.getAll(); - if (list.size() >= Constants.DATA_AMOUNT) { - String url = "http://114.215.139.210/data/collection/upload"; - HashMap> params = new HashMap>(); - final ArrayList ids = new ArrayList(); - DataCollectionInfo entity = null; - ArrayList data = null; - for (int i = 0, size = list.size(); i < size; i++) { - entity = list.get(i); - ids.add(entity.getId()); - String type = entity.getType(); - entity.getData(); - data = params.get(type); - if (data == null) { - data = new ArrayList(); - params.put(type, data); - } - data.add(entity.getData()); - } - JSONArray body = new JSONArray(); - JSONObject jsonObject = null; - try { - for (String key : params.keySet()) { - data = params.get(key); - jsonObject = new JSONObject(); - jsonObject.put("type", key); - jsonObject.put("data", data); - body.put(jsonObject); - } - } catch (JSONException e) { - e.printStackTrace(); - } - - JsonObjectExtendedRequest request = new JsonObjectExtendedRequest( - Method.POST, url, body.toString(), - new Response.Listener() { - @Override - public void onResponse(JSONObject response) { - Utils.log(response.toString()); - try { - if ("success".equals(response - .getString("status"))) { - // 删除数据库数据 - dao.delete(ids); - } - } catch (JSONException e) { - e.printStackTrace(); - } - } - }, new Response.ErrorListener() { - @Override - public void onErrorResponse(VolleyError error) { - Utils.log(error.toString()); - if (error.networkResponse != null) { - Utils.log(new String(error.networkResponse.data)); - } - } - }); - AppController.addToRequestQueue(request, DataCollectionUtils.class); - } - - } - -} diff --git a/app/src/main/java/com/gh/common/util/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java new file mode 100644 index 0000000000..562233bdb2 --- /dev/null +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -0,0 +1,71 @@ +package com.gh.common.util; + +import android.app.Activity; +import android.app.Application; +import android.content.Context; + +import com.tencent.stat.MtaSDkException; +import com.tencent.stat.StatConfig; +import com.tencent.stat.StatReportStrategy; +import com.tencent.stat.StatService; +import com.tendcloud.tenddata.TCAgent; + +import java.util.Map; +import java.util.Properties; + +/** + * Created by LGT on 2016/6/15. + */ +public class DataUtils { + + public static void init(Application application) { + //TalkingData + //dubug true release false + TCAgent.LOG_ON = true; + TCAgent.init(application); + TCAgent.setReportUncaughtExceptions(true); + + //MTA + // 打开debug开关，可查看mta上报日志或错误 + // dubug true release false + StatConfig.setDebugEnable(true); + // 收集未处理的异常 + StatConfig.setAutoExceptionCaught(true); + // 设置数据上报策略 + StatConfig.setStatSendStrategy(StatReportStrategy.PERIOD); + StatConfig.setSendPeriodMinutes(5); + // 开启收集服务 + String TA_APPKEY = (String) PackageUtils.getMetaData(application, application.getPackageName(), "TA_APPKEY"); + try { + StatService.startStatService(application, TA_APPKEY, com.tencent.stat.common.StatConstants.VERSION); + } catch (MtaSDkException e) { + e.printStackTrace(); + } + } + + public static void onEvent(Context var0, String var1, String var2) { + TCAgent.onEvent(var0, var1, var2); + StatService.trackCustomEvent(var0, var1, var2); + } + + public static void onEvent(Context var0, String var1, String var2, Map var3) { + TCAgent.onEvent(var0, var1, var2, var3); + Properties prop = new Properties(); + prop.setProperty("label", var2); + for (String key : var3.keySet()) { + prop.setProperty(key, var3.get(key) + ""); + } + StatService.trackCustomBeginKVEvent(var0, var1, prop); + } + + public static void onPause(Activity var0) { + TCAgent.onPause(var0); + StatService.onPause(var0); + } + + public static void onResume(Activity var0) { + TCAgent.onResume(var0); + StatService.onResume(var0); + } + +} 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 f9781931b7..32014d5cf9 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -28,7 +28,6 @@ import com.gh.gamecenter.eventbus.EBPutUrl; import com.gh.gamecenter.eventbus.EBRedDot; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.PackageManager; -import com.tendcloud.tenddata.TCAgent; import java.util.HashMap; import java.util.List; @@ -374,106 +373,76 @@ public class DownloadItemUtils { .getApk().get(0).getSize()); if (TextUtils.isEmpty(msg)) { Map kv = new HashMap(); - kv.put("版本", entity.getApk().get(0) - .getPlatform()); + kv.put("版本", entity.getApk().get(0).getPlatform()); kv.put("状态", "下载开始"); - TCAgent.onEvent(context, "游戏下载", - entity.getName(), kv); + DataUtils.onEvent(context, "游戏下载", entity.getName(), kv); Map kv2 = new HashMap(); kv2.put("版本", entity.getApk().get(0) .getPlatform()); kv2.put("状态", "下载开始"); kv2.put("位置", entrance + "-开始"); - TCAgent.onEvent(context, "游戏下载位置", - entity.getName(), kv2); + DataUtils.onEvent(context, "游戏下载位置", entity.getName(), kv2); Map kv3 = new HashMap(); kv3.put(entrance, "下载数"); kv3.put(entrance, "下载开始"); - TCAgent.onEvent(context, "应用数据", - entity.getName(), kv3); + DataUtils.onEvent(context, "应用数据", entity.getName(), kv3); if ("主页-最新插件".equals(entrance)) { Map kv4 = new HashMap(); kv4.put(entity.getName(), "下载数"); - TCAgent.onEvent(context, "主页数据", - "最新插件", kv4); + DataUtils.onEvent(context, "主页数据", "最新插件", kv4); } else if ("主页-热门卡牌".equals(entrance)) { Map kv4 = new HashMap(); kv4.put(entity.getName(), "下载数"); - TCAgent.onEvent(context, "主页数据", - "热门卡牌", kv4); + DataUtils.onEvent(context, "主页数据", "热门卡牌", kv4); } else if ("主页-新测卡牌".equals(entrance)) { Map kv4 = new HashMap(); kv4.put(entity.getName(), "下载数"); - TCAgent.onEvent(context, "主页数据", - "新测卡牌", kv4); + DataUtils.onEvent(context, "主页数据", "新测卡牌", kv4); } Map map = new HashMap(); map.put("game", entity.getName()); map.put("method", "正常"); - map.put("platform", - PlatformUtils - .getInstance(context) - .getPlatformName( - entity.getApk() - .get(0) - .getPlatform())); + map.put("platform", PlatformUtils.getInstance(context) + .getPlatformName(entity.getApk().get(0).getPlatform())); map.put("status", "开始"); - map.put("location", - "游戏详情:" + entity.getName()); + map.put("location", "游戏详情:" + entity.getName()); map.put("from", entrance); - map.put("network", NetworkUtils - .getConnectedType(context)); - map.put("createdOn", - System.currentTimeMillis() / 1000); - DataCollectionManager.onEvent(context, - "download", map); + map.put("network", NetworkUtils.getConnectedType(context)); + map.put("createdOn", System.currentTimeMillis() / 1000); + DataCollectionManager.onEvent(context, "download", map); DownloadManager.getInstance(context).add( - getDownloadEntry(context, entity, - 0, entrance)); - Toast.makeText(context, - entity.getName() + "已加入下载队列", - Toast.LENGTH_SHORT).show(); + getDownloadEntry(context, entity, 0, entrance)); + Toast.makeText(context, entity.getName() + "已加入下载队列", Toast.LENGTH_SHORT).show(); downloadBtn.setText("暂停"); - downloadBtn - .setBackgroundResource(R.drawable.textview_gray_style); + downloadBtn.setBackgroundResource(R.drawable.textview_gray_style); downloadBtn.setTextColor(0xFF999999); EventBus.getDefault().post(new EBRedDot(1)); - statusMap.put(entity.getApk().get(0) - .getUrl(), "downloading"); + statusMap.put(entity.getApk().get(0).getUrl(), "downloading"); } else { - Toast.makeText(context, msg, - Toast.LENGTH_SHORT).show(); + Toast.makeText(context, msg, Toast.LENGTH_SHORT).show(); } } else { if (!dismissEntity.isShow()) { dismissEntity.setShow(true); DownloadDialog.getInstance(context) - .showPopupWindow(viewBtn, entity, - entrance, statusMap, - download_speed, - download_percentage, - location); + .showPopupWindow(viewBtn, entity, entrance, statusMap, + download_speed, download_percentage, location); } } } else { final Dialog dialog = new Dialog(context); - View view = View - .inflate( - context, - R.layout.search_history_delete_dialog, - null); + View view = View.inflate(context, R.layout.search_history_delete_dialog, null); TextView title = (TextView) view .findViewById(R.id.delete_dialog_title); title.setText("警告"); - TextView content = (TextView) view - .findViewById(R.id.delete_dialog_message); + TextView content = (TextView) view.findViewById(R.id.delete_dialog_message); content.setText("您当前的网络为2G/3G/4G，下载将会消耗移动流量，是否继续下载？"); @@ -509,71 +478,38 @@ public class DownloadItemUtils { kv.put("版本", entity.getApk() .get(0).getPlatform()); kv.put("状态", "下载开始"); - TCAgent.onEvent(context, - "游戏下载", - entity.getName(), kv); + DataUtils.onEvent(context, "游戏下载", entity.getName(), kv); Map kv2 = new HashMap(); - kv2.put("版本", entity.getApk() - .get(0).getPlatform()); + kv2.put("版本", entity.getApk().get(0).getPlatform()); kv2.put("状态", "下载开始"); kv2.put("位置", entrance + "-开始"); - TCAgent.onEvent(context, - "游戏下载位置", - entity.getName(), kv2); + DataUtils.onEvent(context, "游戏下载位置", entity.getName(), kv2); Map map = new HashMap(); - map.put("game", - entity.getName()); + map.put("game", entity.getName()); map.put("method", "正常"); - map.put("platform", - PlatformUtils - .getInstance( - context) - .getPlatformName( - entity.getApk() - .get(0) - .getPlatform())); + map.put("platform", PlatformUtils.getInstance(context) + .getPlatformName(entity.getApk().get(0).getPlatform())); map.put("status", "开始"); - map.put("location", "游戏详情:" - + entity.getName()); + map.put("location", "游戏详情:" + entity.getName()); map.put("from", entrance); - map.put("network", - NetworkUtils - .getConnectedType(context)); - map.put("createdOn", - System.currentTimeMillis() / 1000); - DataCollectionManager.onEvent( - context, "download", - map); + map.put("network", NetworkUtils.getConnectedType(context)); + map.put("createdOn", System.currentTimeMillis() / 1000); + DataCollectionManager.onEvent(context, "download", map); - DownloadManager.getInstance( - context).add( - getDownloadEntry( - context, - entity, 0, - entrance)); - Toast.makeText( - context, - entity.getName() - + "已加入下载队列", - Toast.LENGTH_SHORT) - .show(); + DownloadManager.getInstance(context).add( + getDownloadEntry(context, entity, 0, entrance)); + Toast.makeText(context, entity.getName() + "已加入下载队列", + Toast.LENGTH_SHORT).show(); downloadBtn.setText("暂停"); - downloadBtn - .setBackgroundResource(R.drawable.textview_gray_style); - downloadBtn - .setTextColor(0xFF999999); - EventBus.getDefault().post( - new EBRedDot(1)); + downloadBtn.setBackgroundResource(R.drawable.textview_gray_style); + downloadBtn.setTextColor(0xFF999999); + EventBus.getDefault().post(new EBRedDot(1)); - statusMap.put(entity.getApk() - .get(0).getUrl(), - "downloading"); + statusMap.put(entity.getApk().get(0).getUrl(), "downloading"); } else { - Toast.makeText(context, msg, - Toast.LENGTH_SHORT) - .show(); + Toast.makeText(context, msg, Toast.LENGTH_SHORT).show(); } } else { if (!dismissEntity.isShow()) { @@ -743,7 +679,7 @@ public class DownloadItemUtils { Map kv = new HashMap(); kv.put("版本", entity.getApk().get(0).getPlatform()); - TCAgent.onEvent(context, "游戏启动", entity.getName(), kv); + DataUtils.onEvent(context, "游戏启动", entity.getName(), kv); PackageUtils.launchApplicationByPackageName(context, entity .getApk().get(0).getPackageName()); diff --git a/app/src/main/java/com/gh/common/util/Utils.java b/app/src/main/java/com/gh/common/util/Utils.java index e927d73a9f..a6324e497a 100644 --- a/app/src/main/java/com/gh/common/util/Utils.java +++ b/app/src/main/java/com/gh/common/util/Utils.java @@ -13,12 +13,18 @@ import java.lang.reflect.Field; public class Utils { + private static final boolean DEBUG = true; + public static void log(String msg) { - Log.e("result", msg); + if (DEBUG) { + Log.e("result", msg); + } } public static void log(Object obj) { - Log.e("result", obj.getClass().getSimpleName() + " = " + obj.toString()); + if (DEBUG) { + Log.e("result", obj.getClass().getSimpleName() + " = " + obj.toString()); + } } public static void toast(Context context, String text) { diff --git a/app/src/main/java/com/gh/common/view/DownloadDialog.java b/app/src/main/java/com/gh/common/view/DownloadDialog.java index e17ccd859f..e1df932ec5 100644 --- a/app/src/main/java/com/gh/common/view/DownloadDialog.java +++ b/app/src/main/java/com/gh/common/view/DownloadDialog.java @@ -37,6 +37,7 @@ import android.widget.Toast; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.FileUtils; @@ -63,7 +64,6 @@ import com.gh.gamecenter.eventbus.EBPutUrl; import com.gh.gamecenter.eventbus.EBRedDot; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.PackageManager; -import com.tendcloud.tenddata.TCAgent; import java.io.File; import java.util.ArrayList; @@ -544,7 +544,7 @@ public class DownloadDialog { Map kv6 = new HashMap(); kv6.put("操作", "点击插件化安装完成"); - TCAgent.onEvent(context, "插件化", gameName, kv6); + DataUtils.onEvent(context, "插件化", gameName, kv6); String path = entryMap.get(apkEntity.getUrl()).getPath(); if (FileUtils.isEmptyFile(path)) { @@ -606,38 +606,38 @@ public class DownloadDialog { Map kv = new HashMap(); kv.put("版本", apkEntity.getPlatform()); kv.put("状态", "下载开始"); - TCAgent.onEvent(context, "游戏下载", gameName, kv); + DataUtils.onEvent(context, "游戏下载", gameName, kv); Map kv2 = new HashMap(); kv2.put("版本", apkEntity.getPlatform()); kv2.put("状态", "下载开始"); kv2.put("位置", entrance + "-开始"); - TCAgent.onEvent(context, "游戏下载位置", gameName, kv2); + DataUtils.onEvent(context, "游戏下载位置", gameName, kv2); Map kv3 = new HashMap(); kv3.put(entrance, "下载数"); kv3.put(entrance, "下载开始"); - TCAgent.onEvent(context, "应用数据", gameName, kv3); + DataUtils.onEvent(context, "应用数据", gameName, kv3); if ("主页-最新插件".equals(entrance)) { Map kv4 = new HashMap(); kv4.put(gameName, "下载数"); - TCAgent.onEvent(context, "主页数据", "最新插件", kv4); + DataUtils.onEvent(context, "主页数据", "最新插件", kv4); } else if ("主页-热门卡牌".equals(entrance)) { Map kv4 = new HashMap(); kv4.put(gameName, "下载数"); - TCAgent.onEvent(context, "主页数据", "热门卡牌", kv4); + DataUtils.onEvent(context, "主页数据", "热门卡牌", kv4); } else if ("主页-新测卡牌".equals(entrance)) { Map kv4 = new HashMap(); kv4.put(gameName, "下载数"); - TCAgent.onEvent(context, "主页数据", "新测卡牌", kv4); + DataUtils.onEvent(context, "主页数据", "新测卡牌", kv4); } if (entrance.contains("游戏详情")) { Map kv5 = new HashMap(); kv5.put("下载", "下载量"); kv5.put("下载", apkEntity.getPlatform()); - TCAgent.onEvent(context, "插件数据", gameName, kv5); + DataUtils.onEvent(context, "插件数据", gameName, kv5); } Map map = new HashMap(); @@ -650,18 +650,14 @@ public class DownloadDialog { map.put("from", entrance); map.put("network", NetworkUtils.getConnectedType(context)); map.put("createdOn", System.currentTimeMillis() / 1000); - DataCollectionManager.onEvent(context, "download", - map); + DataCollectionManager.onEvent(context, "download", map); DownloadEntry entry = new DownloadEntry(); entry.setUrl(apkEntity.getUrl()); entry.setName(gameName); - entry.setPath(FileUtils.getDownloadPath( - context, - MD5Utils.getContentMD5(gameName + "_" - + System.currentTimeMillis()) - + ".apk")); + entry.setPath(FileUtils.getDownloadPath(context, + MD5Utils.getContentMD5(gameName + "_" + System.currentTimeMillis()) + ".apk")); HashMap meta = new HashMap(); meta.put("ETag", apkEntity.getEtag()); meta.put("icon", gameIcon); @@ -680,12 +676,10 @@ public class DownloadDialog { statusMap.put(entry.getUrl(), "downloading"); } else { - Toast.makeText(context, msg, Toast.LENGTH_SHORT) - .show(); + Toast.makeText(context, msg, Toast.LENGTH_SHORT).show(); } } else { - String status = viewHolder.download_item_tv_status - .getText().toString(); + String status = viewHolder.download_item_tv_status.getText().toString(); Utils.log("status = " + status); if ("继续".equals(status)) { statusMap.put(apkEntity.getUrl(), "downloading"); @@ -751,7 +745,7 @@ public class DownloadDialog { } else if ("启动".equals(status)) { Map kv = new HashMap(); kv.put("版本", apkEntity.getPlatform()); - TCAgent.onEvent(context, "游戏启动", gameName, kv); + DataUtils.onEvent(context, "游戏启动", gameName, kv); PackageUtils.launchApplicationByPackageName( context, apkEntity.getPackageName()); @@ -763,67 +757,56 @@ public class DownloadDialog { Map kv = new HashMap(); kv.put("版本", apkEntity.getPlatform()); kv.put("状态", "下载开始"); - TCAgent.onEvent(context, "游戏下载", gameName, kv); + DataUtils.onEvent(context, "游戏下载", gameName, kv); Map kv2 = new HashMap(); kv2.put("版本", apkEntity.getPlatform()); kv2.put("状态", "下载开始"); kv2.put("位置", entrance + "-开始"); - TCAgent.onEvent(context, "游戏下载位置", gameName, - kv2); + DataUtils.onEvent(context, "游戏下载位置", gameName, kv2); Map kv3 = new HashMap(); kv3.put(entrance, "下载数"); kv3.put(entrance, "下载开始"); - TCAgent.onEvent(context, "应用数据", gameName, kv3); + DataUtils.onEvent(context, "应用数据", gameName, kv3); if ("主页-最新插件".equals(entrance)) { Map kv4 = new HashMap(); kv4.put(gameName, "下载数"); - TCAgent.onEvent(context, "主页数据", "最新插件", - kv4); + DataUtils.onEvent(context, "主页数据", "最新插件", kv4); } else if ("主页-热门卡牌".equals(entrance)) { Map kv4 = new HashMap(); kv4.put(gameName, "下载数"); - TCAgent.onEvent(context, "主页数据", "热门卡牌", - kv4); + DataUtils.onEvent(context, "主页数据", "热门卡牌", kv4); } else if ("主页-新测卡牌".equals(entrance)) { Map kv4 = new HashMap(); kv4.put(gameName, "下载数"); - TCAgent.onEvent(context, "主页数据", "新测卡牌", - kv4); + DataUtils.onEvent(context, "主页数据", "新测卡牌", kv4); } if (entrance.contains("游戏详情")) { Map kv5 = new HashMap(); kv5.put("下载", "下载开始"); kv5.put("下载", apkEntity.getPlatform()); - TCAgent.onEvent(context, "插件数据", gameName, - kv5); + DataUtils.onEvent(context, "插件数据", gameName, kv5); } Map kv6 = new HashMap(); kv6.put("下载", "下载开始"); kv6.put("版本", apkEntity.getPlatform()); - TCAgent.onEvent(context, "插件化", gameName, kv6); + DataUtils.onEvent(context, "插件化", gameName, kv6); Map map = new HashMap(); map.put("game", gameName); map.put("method", "插件化"); - map.put("platform", - PlatformUtils - .getInstance(context) - .getPlatformName( - apkEntity.getPlatform())); + map.put("platform", PlatformUtils.getInstance(context) + .getPlatformName(apkEntity.getPlatform())); map.put("status", "开始"); map.put("location", mlocation); map.put("from", entrance); - map.put("network", - NetworkUtils.getConnectedType(context)); - map.put("createdOn", - System.currentTimeMillis() / 1000); - DataCollectionManager.onEvent(context, - "download", map); + map.put("network", NetworkUtils.getConnectedType(context)); + map.put("createdOn", System.currentTimeMillis() / 1000); + DataCollectionManager.onEvent(context, "download", map); DownloadEntry entry = new DownloadEntry(); @@ -881,8 +864,7 @@ public class DownloadDialog { && downloadEntry.getMeta().get("isPlugin") != null) { Map kv6 = new HashMap(); kv6.put("操作", "点击安装完成"); - TCAgent.onEvent(context, "插件化", - downloadEntry.getName(), kv6); + DataUtils.onEvent(context, "插件化", downloadEntry.getName(), kv6); } String path = entryMap.get(apkEntity.getUrl()) .getPath(); diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index 8a1d3a56e9..7b3c4271f6 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -19,6 +19,7 @@ import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.TimestampUtils; import com.gh.common.util.Utils; @@ -31,7 +32,6 @@ import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; import org.json.JSONObject; @@ -222,7 +222,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { Map kv = new HashMap(); kv.put("状态", "取消关注"); - TCAgent.onEvent(ConcernActivity.this, "游戏关注", concernInfo.getGameName(), kv); + DataUtils.onEvent(ConcernActivity.this, "游戏关注", concernInfo.getGameName(), kv); Map map = new HashMap(); map.put("game", concernInfo.getGameName()); @@ -324,7 +324,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { Map kv = new HashMap(); kv.put("状态", "关注"); - TCAgent.onEvent(ConcernActivity.this, "游戏关注", gameEntity.getName(), kv); + DataUtils.onEvent(ConcernActivity.this, "游戏关注", gameEntity.getName(), kv); Map map = new HashMap(); map.put("game", gameEntity.getName()); diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java index 368d1f11ab..1f50fd0dee 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java @@ -33,6 +33,7 @@ import com.gh.base.AppController; import com.gh.base.BaseFragmentActivity; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.FileUtils; @@ -68,7 +69,6 @@ import com.gh.gamecenter.manager.PackageManager; import com.gh.gamecenter.personal.PersonalFragmentAdapter; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; import com.google.gson.Gson; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONObject; @@ -411,12 +411,12 @@ public class GameDetailsActivity extends BaseFragmentActivity implements Map kv = new HashMap(); kv.put("状态", "关注"); - TCAgent.onEvent(GameDetailsActivity.this, "游戏关注", + DataUtils.onEvent(GameDetailsActivity.this, "游戏关注", entity.getName(), kv); Map kv2 = new HashMap(); kv2.put("点击", "关注"); - TCAgent.onEvent(GameDetailsActivity.this, "插件数据", + DataUtils.onEvent(GameDetailsActivity.this, "插件数据", entity.getName(), kv2); Map map = new HashMap(); @@ -435,7 +435,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements } else { Map kv2 = new HashMap(); kv2.put("点击", "取消关注"); - TCAgent.onEvent(GameDetailsActivity.this, "插件数据", + DataUtils.onEvent(GameDetailsActivity.this, "插件数据", entity.getName(), kv2); showCancelDialog(); @@ -444,7 +444,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements case R.id.gamedetails_tv_download: Map kv0 = new HashMap(); kv0.put("点击", "下载"); - TCAgent.onEvent(GameDetailsActivity.this, "插件数据", entity.getName(), + DataUtils.onEvent(GameDetailsActivity.this, "插件数据", entity.getName(), kv0); if (entity.getApk() != null && !entity.getApk().isEmpty()) { if (NetworkUtils.isWifiConnected(this)) { @@ -454,7 +454,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements Map kv = new HashMap(); kv.put("版本", entity.getApk().get(0).getPlatform()); - TCAgent.onEvent(GameDetailsActivity.this, "游戏启动", + DataUtils.onEvent(GameDetailsActivity.this, "游戏启动", entity.getName(), kv); PackageUtils.launchApplicationByPackageName( @@ -468,20 +468,20 @@ public class GameDetailsActivity extends BaseFragmentActivity implements Map kv = new HashMap(); kv.put("版本", apkEntity.getPlatform()); kv.put("状态", "下载开始"); - TCAgent.onEvent(GameDetailsActivity.this, + DataUtils.onEvent(GameDetailsActivity.this, "游戏下载", entity.getName(), kv); Map kv2 = new HashMap(); kv2.put("版本", apkEntity.getPlatform()); kv2.put("状态", "下载开始"); kv2.put("位置", entrance + "-游戏详情-开始"); - TCAgent.onEvent(GameDetailsActivity.this, + DataUtils.onEvent(GameDetailsActivity.this, "游戏下载位置", entity.getName(), kv2); Map kv3 = new HashMap(); kv3.put(entrance, "下载数"); kv3.put(entrance, "下载开始"); - TCAgent.onEvent(GameDetailsActivity.this, + DataUtils.onEvent(GameDetailsActivity.this, "应用数据", entity.getName(), kv3); Map map = new HashMap(); @@ -586,7 +586,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements Map kv = new HashMap(); kv.put("版本", entity.getApk().get(0) .getPlatform()); - TCAgent.onEvent(GameDetailsActivity.this, + DataUtils.onEvent(GameDetailsActivity.this, "游戏启动", entity.getName(), kv); PackageUtils @@ -603,7 +603,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements Map kv = new HashMap(); kv.put("版本", apkEntity.getPlatform()); kv.put("状态", "下载开始"); - TCAgent.onEvent( + DataUtils.onEvent( GameDetailsActivity.this, "游戏下载", entity.getName(), kv); @@ -611,14 +611,14 @@ public class GameDetailsActivity extends BaseFragmentActivity implements kv2.put("版本", apkEntity.getPlatform()); kv2.put("状态", "下载开始"); kv2.put("位置", entrance + "-游戏详情-开始"); - TCAgent.onEvent( + DataUtils.onEvent( GameDetailsActivity.this, "游戏下载位置", entity.getName(), kv2); Map kv3 = new HashMap(); kv3.put("下载", "下载量"); kv3.put("下载", apkEntity.getPlatform()); - TCAgent.onEvent( + DataUtils.onEvent( GameDetailsActivity.this, "插件数据", entity.getName(), kv3); @@ -717,7 +717,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements // http://news.ghzhushou.com Map kv = new HashMap(); kv.put("点击", "分享"); - TCAgent.onEvent(this, "插件数据", entity.getName(), kv); + DataUtils.onEvent(this, "插件数据", entity.getName(), kv); Map map = new HashMap(); map.put("location", "分享"); @@ -824,7 +824,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements Map kv = new HashMap(); kv.put("状态", "取消关注"); - TCAgent.onEvent(GameDetailsActivity.this, "游戏关注", + DataUtils.onEvent(GameDetailsActivity.this, "游戏关注", entity.getName(), kv); Map map = new HashMap(); @@ -878,7 +878,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements dialog.dismiss(); Map kv6 = new HashMap(); kv6.put("操作", "一次性完成"); - TCAgent.onEvent(GameDetailsActivity.this, "插件化", gameName, kv6); + DataUtils.onEvent(GameDetailsActivity.this, "插件化", gameName, kv6); if (FileUtils.isEmptyFile(path)) { toast("解析包错误"); } else { @@ -1225,20 +1225,20 @@ public class GameDetailsActivity extends BaseFragmentActivity implements Map kv = new HashMap(); kv.put("停留时长", cost); - TCAgent.onEvent(this, "插件数据", entity.getName(), kv); + DataUtils.onEvent(this, "插件数据", entity.getName(), kv); if ("主页-最新插件".equals(entrance)) { Map kv2 = new HashMap(); kv2.put(entity.getName(), "阅读时长:" + cost); - TCAgent.onEvent(this, "主页数据", "最新插件", kv2); + DataUtils.onEvent(this, "主页数据", "最新插件", kv2); } else if ("主页-热门卡牌".equals(entrance)) { Map kv2 = new HashMap(); kv2.put(entity.getName(), "阅读时长:" + cost); - TCAgent.onEvent(this, "主页数据", "热门卡牌", kv2); + DataUtils.onEvent(this, "主页数据", "热门卡牌", kv2); } else if ("主页-新测卡牌".equals(entrance)) { Map kv2 = new HashMap(); kv2.put(entity.getName(), "阅读时长:" + cost); - TCAgent.onEvent(this, "主页数据", "新测卡牌", kv2); + DataUtils.onEvent(this, "主页数据", "新测卡牌", kv2); } Map map = new HashMap(); @@ -1249,13 +1249,6 @@ public class GameDetailsActivity extends BaseFragmentActivity implements DataCollectionManager.onEvent(this, "game", map); super.finish(); - // if (gameId != null - // && !RunningUtils.isEqualsBase(this, - // MainActivity.class.getName())) { - // Intent intent = new Intent(GameDetailsActivity.this, - // MainActivity.class); - // startActivity(intent); - // } } @Override diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index f6c0f42502..4c3ff75ced 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -33,6 +33,7 @@ import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.base.BaseFragmentActivity; import com.gh.common.constant.Config; +import com.gh.common.util.DataUtils; import com.gh.common.util.FileUtils; import com.gh.common.util.MD5Utils; import com.gh.common.util.NetworkUtils; @@ -71,7 +72,6 @@ import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; import org.json.JSONException; @@ -173,7 +173,7 @@ public class MainActivity extends BaseFragmentActivity implements if (doneMap.get(downloadEntry.getUrl()) == null) { doneMap.put(downloadEntry.getUrl(), "done"); if (downloadEntry.getName().contains("光环助手")) { - TCAgent.onEvent(MainActivity.this, "软件更新", "下载完成"); + DataUtils.onEvent(MainActivity.this, "软件更新", "下载完成"); startActivity(PackageUtils .getInstallIntent(downloadEntry.getPath())); if (appEntity != null && appEntity.isIs_force()) { @@ -191,10 +191,10 @@ public class MainActivity extends BaseFragmentActivity implements String entrance = downloadEntry.getMeta().get( "entrance"); if (isUpdate != null && "true".equals(isUpdate)) { - TCAgent.onEvent(MainActivity.this, "游戏更新", + DataUtils.onEvent(MainActivity.this, "游戏更新", downloadEntry.getName(), kv); } else { - TCAgent.onEvent(MainActivity.this, "游戏下载", + DataUtils.onEvent(MainActivity.this, "游戏下载", downloadEntry.getName(), kv); Map kv2 = new HashMap(); @@ -202,7 +202,7 @@ public class MainActivity extends BaseFragmentActivity implements downloadEntry.getMeta().get("platform")); kv2.put("状态", "下载完成"); kv2.put("位置", entrance + "-完成"); - TCAgent.onEvent(MainActivity.this, "游戏下载位置", + DataUtils.onEvent(MainActivity.this, "游戏下载位置", downloadEntry.getName(), kv2); } if (downloadEntry.getMeta().get("isPlugin") != null) { @@ -210,7 +210,7 @@ public class MainActivity extends BaseFragmentActivity implements kv6.put("下载", "下载完成"); kv6.put("版本", downloadEntry.getMeta().get("platform")); - TCAgent.onEvent(MainActivity.this, "插件化", + DataUtils.onEvent(MainActivity.this, "插件化", downloadEntry.getName(), kv6); } @@ -335,7 +335,7 @@ public class MainActivity extends BaseFragmentActivity implements } } else { Utils.log("It is already done!"); - TCAgent.onEvent( + DataUtils.onEvent( MainActivity.this, "多次弹框数据", downloadEntry.getName() @@ -826,7 +826,7 @@ public class MainActivity extends BaseFragmentActivity implements if (file.exists() && file.length() > 0) { startActivity(PackageUtils.getInstallIntent(path)); } else { - TCAgent.onEvent(MainActivity.this, "软件更新", "下载开始"); + DataUtils.onEvent(MainActivity.this, "软件更新", "下载开始"); showDownloadDialog(md5); } } @@ -1143,7 +1143,7 @@ public class MainActivity extends BaseFragmentActivity implements && downloadEntry.getMeta().get("isPlugin") != null) { Map kv6 = new HashMap(); kv6.put("安装或卸载", "安装完成"); - TCAgent.onEvent(this, "插件化", downloadEntry.getName(), kv6); + DataUtils.onEvent(this, "插件化", downloadEntry.getName(), kv6); } // 删除数据库 和 文件 @@ -1158,7 +1158,7 @@ public class MainActivity extends BaseFragmentActivity implements .equals(packageName)) { Map kv6 = new HashMap(); kv6.put("安装或卸载", "卸载完成"); - TCAgent.onEvent(this, "插件化", downloadEntry.getName(), kv6); + DataUtils.onEvent(this, "插件化", downloadEntry.getName(), kv6); break; } } diff --git a/app/src/main/java/com/gh/gamecenter/NewsActivity.java b/app/src/main/java/com/gh/gamecenter/NewsActivity.java index 264acfae53..88dcc9376c 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsActivity.java @@ -39,6 +39,7 @@ import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.FileUtils; @@ -71,7 +72,6 @@ import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; import org.json.JSONObject; @@ -282,7 +282,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { Map kv = new HashMap(); kv.put("版本", gameEntity.getApk().get(0) .getPlatform()); - TCAgent.onEvent(NewsActivity.this, "游戏启动", + DataUtils.onEvent(NewsActivity.this, "游戏启动", gameEntity.getName(), kv); PackageUtils.launchApplicationByPackageName( @@ -296,20 +296,20 @@ public class NewsActivity extends BaseActivity implements OnClickListener { Map kv = new HashMap(); kv.put("版本", apkEntity.getPlatform()); kv.put("状态", "下载开始"); - TCAgent.onEvent(NewsActivity.this, "游戏下载", + DataUtils.onEvent(NewsActivity.this, "游戏下载", gameEntity.getName(), kv); Map kv2 = new HashMap(); kv2.put("版本", apkEntity.getPlatform()); kv2.put("状态", "下载开始"); kv2.put("位置", entrance + "-文章详情-开始"); - TCAgent.onEvent(NewsActivity.this, "游戏下载位置", + DataUtils.onEvent(NewsActivity.this, "游戏下载位置", gameEntity.getName(), kv2); Map kv3 = new HashMap(); kv3.put(entrance, "下载数"); kv3.put(entrance, "下载开始"); - TCAgent.onEvent(NewsActivity.this, "应用数据", + DataUtils.onEvent(NewsActivity.this, "应用数据", gameEntity.getName(), kv3); Map map = new HashMap(); @@ -416,7 +416,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { Map kv = new HashMap(); kv.put("版本", gameEntity.getApk().get(0) .getPlatform()); - TCAgent.onEvent(NewsActivity.this, "游戏启动", + DataUtils.onEvent(NewsActivity.this, "游戏启动", gameEntity.getName(), kv); PackageUtils @@ -433,7 +433,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { Map kv = new HashMap(); kv.put("版本", apkEntity.getPlatform()); kv.put("状态", "下载开始"); - TCAgent.onEvent(NewsActivity.this, + DataUtils.onEvent(NewsActivity.this, "游戏下载", gameEntity.getName(), kv); @@ -441,7 +441,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { kv2.put("版本", apkEntity.getPlatform()); kv2.put("状态", "下载开始"); kv2.put("位置", entrance + "-文章详情-开始"); - TCAgent.onEvent(NewsActivity.this, + DataUtils.onEvent(NewsActivity.this, "游戏下载位置", gameEntity.getName(), kv2); @@ -831,7 +831,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { Map kv = new HashMap(); kv.put("状态", "取消关注"); - TCAgent.onEvent(NewsActivity.this, "游戏关注", + DataUtils.onEvent(NewsActivity.this, "游戏关注", gameEntity.getName(), kv); Map map = new HashMap(); @@ -952,11 +952,11 @@ public class NewsActivity extends BaseActivity implements OnClickListener { Map kv = new HashMap(); kv.put("状态", "关注"); - TCAgent.onEvent(NewsActivity.this, "游戏关注", gameEntity.getName(), kv); + DataUtils.onEvent(NewsActivity.this, "游戏关注", gameEntity.getName(), kv); Map kv2 = new HashMap(); kv2.put("点击", "关注"); - TCAgent.onEvent(NewsActivity.this, "插件数据", gameEntity.getName(), kv2); + DataUtils.onEvent(NewsActivity.this, "插件数据", gameEntity.getName(), kv2); Map map = new HashMap(); map.put("game", gameEntity.getName()); @@ -972,7 +972,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { } else { Map kv2 = new HashMap(); kv2.put("点击", "取消关注"); - TCAgent.onEvent(NewsActivity.this, "插件数据", gameEntity.getName(), kv2); + DataUtils.onEvent(NewsActivity.this, "插件数据", gameEntity.getName(), kv2); showCancelDialog(essaydetails_attention); } @@ -1269,18 +1269,18 @@ public class NewsActivity extends BaseActivity implements OnClickListener { Map kv = new HashMap(); kv.put(entrance, "阅读数"); kv.put(entrance, "用时:" + cost); - TCAgent.onEvent(NewsActivity.this, "文章数据", entity.getTitle(), kv); + DataUtils.onEvent(NewsActivity.this, "文章数据", entity.getTitle(), kv); if ("主页-卡牌头条".equals(entrance)) { Map kv2 = new HashMap(); kv2.put(entity.getTitle(), "阅读数"); kv2.put(entity.getTitle(), "用时:" + cost); - TCAgent.onEvent(this, "主页数据", "卡牌头条", kv2); + DataUtils.onEvent(this, "主页数据", "卡牌头条", kv2); } else if ("主页-卡牌攻略".equals(entrance)) { Map kv2 = new HashMap(); kv2.put(entity.getTitle(), "阅读数"); kv2.put(entity.getTitle(), "用时:" + cost); - TCAgent.onEvent(this, "主页数据", "卡牌攻略", kv2); + DataUtils.onEvent(this, "主页数据", "卡牌攻略", kv2); } Map map = new HashMap(); @@ -1322,7 +1322,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener { // 阅读报告 Map kv = new HashMap(); kv.put("用时", cost); - TCAgent.onEvent(NewsActivity.this, "阅读文章", entity.getTitle(), kv); + DataUtils.onEvent(NewsActivity.this, "阅读文章", entity.getTitle(), kv); isSentReport = true; } } diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.java b/app/src/main/java/com/gh/gamecenter/SearchActivity.java index 178e70ed41..b2fee04dc4 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.java @@ -23,6 +23,7 @@ import android.widget.TextView.OnEditorActionListener; import com.gh.base.BaseFragmentActivity; import com.gh.common.constant.Config; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.db.SearchHistoryDao; import com.gh.gamecenter.eventbus.EBSearch; @@ -32,7 +33,6 @@ import com.gh.gamecenter.manager.SystemBarTintManager.SystemBarConfig; import com.gh.gamecenter.search.Search1DetailFragment; import com.gh.gamecenter.search.Search2GameListFragment; import com.gh.gamecenter.search.Search3HistoryFragment; -import com.tendcloud.tenddata.TCAgent; import java.util.HashMap; import java.util.List; @@ -275,7 +275,7 @@ public class SearchActivity extends BaseFragmentActivity { currentTab = 1; break; case 2: - TCAgent.onEvent(SearchActivity.this, "搜索页面", searchKey); + DataUtils.onEvent(SearchActivity.this, "搜索页面", searchKey); Map map = new HashMap(); map.put("key", searchKey); diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index 09fbd9d865..840d569986 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -21,6 +21,7 @@ import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.FileUtils; import com.gh.common.util.MD5Utils; @@ -37,7 +38,6 @@ import com.gh.gamecenter.manager.PackageManager; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; import com.google.gson.Gson; import com.kyleduo.switchbutton.SwitchButton; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONObject; @@ -437,8 +437,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { if (file.exists() && file.length() > 0) { startActivity(PackageUtils.getInstallIntent(path)); } else { - TCAgent.onEvent(SettingActivity.this, "软件更新", - "下载开始"); + DataUtils.onEvent(SettingActivity.this, "软件更新", "下载开始"); showDownloadDialog(md5); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/HotCardAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/HotCardAdapter.java index 0f65bd8644..04a8e3f78f 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/HotCardAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/HotCardAdapter.java @@ -9,6 +9,7 @@ import android.view.View; import android.view.ViewGroup; import com.gh.base.AppController; +import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; @@ -17,7 +18,6 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.GameViewHolder; import com.gh.gamecenter.entity.DismissEntity; import com.gh.gamecenter.entity.GameEntity; -import com.tendcloud.tenddata.TCAgent; import java.util.ArrayList; import java.util.HashMap; @@ -104,7 +104,7 @@ public class HotCardAdapter extends Map kv = new HashMap(); kv.put("入口", "热门卡牌"); - TCAgent.onEvent(context, "游戏详情", entity.getName(), kv); + DataUtils.onEvent(context, "游戏详情", entity.getName(), kv); AppController.put("GameEntity", entity); Intent intent = new Intent(context, GameDetailsActivity.class); 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 d6e35661df..ebc18b2432 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java @@ -12,12 +12,12 @@ import android.view.ViewGroup; import android.widget.ImageView; import com.gh.base.AppController; +import com.gh.common.util.DataUtils; import com.gh.common.util.ImageUtils; import com.gh.gamecenter.GameDetailsActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.manager.DataCollectionManager; -import com.tendcloud.tenddata.TCAgent; import java.util.HashMap; import java.util.List; @@ -90,7 +90,7 @@ public class ImagePagerAdapter extends RecyclingPagerAdapter { Map kv = new HashMap(); kv.put("入口", "插件-精品-滚动图"); - TCAgent.onEvent(context, "游戏详情", gameEntity.getName(), kv); + DataUtils.onEvent(context, "游戏详情", gameEntity.getName(), kv); Map map = new HashMap(); map.put("location", "精品-滚动图"); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/NewsOrRaidersListAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/NewsOrRaidersListAdapter.java index 1a611e9e2d..5fd17aed52 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/NewsOrRaidersListAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/NewsOrRaidersListAdapter.java @@ -23,6 +23,7 @@ import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.NewsUtils; @@ -46,7 +47,6 @@ import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; import org.json.JSONObject; @@ -872,7 +872,7 @@ public class NewsOrRaidersListAdapter extends Map kv = new HashMap(); kv.put("入口", type + "-我的游戏"); - TCAgent.onEvent(context, "游戏详情", entry.getName(), kv); + DataUtils.onEvent(context, "游戏详情", entry.getName(), kv); Map map = new HashMap(); map.put("location", "我的游戏"); @@ -932,7 +932,7 @@ public class NewsOrRaidersListAdapter extends Map kv = new HashMap(); kv.put("文章类型", newsEntity.getType()); kv.put("入口", type + "-今天"); - TCAgent.onEvent(context, "文章阅读-" + type, newsEntity.getTitle(), kv); + DataUtils.onEvent(context, "文章阅读-" + type, newsEntity.getTitle(), kv); Map map = new HashMap(); map.put("location", "今天"); @@ -1012,7 +1012,7 @@ public class NewsOrRaidersListAdapter extends Map kv = new HashMap(); kv.put("文章类型", entity.getType()); kv.put("入口", type + "-" + entrance); - TCAgent.onEvent(context, "文章阅读-" + type, entity.getTitle(), kv); + DataUtils.onEvent(context, "文章阅读-" + type, entity.getTitle(), kv); Map map = new HashMap(); map.put("location", entrance); diff --git a/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java b/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java index 1fb00818b2..8ccc4371c7 100644 --- a/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java @@ -25,6 +25,7 @@ import android.widget.TextView; import android.widget.Toast; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.FileUtils; @@ -48,7 +49,6 @@ import com.gh.gamecenter.eventbus.EBPutUrl; import com.gh.gamecenter.eventbus.EBShowDone; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.manager.PackageManager; -import com.tendcloud.tenddata.TCAgent; import java.util.ArrayList; import java.util.HashMap; @@ -336,7 +336,7 @@ public class DownLoadManagerFragment extends Fragment { if (downloadEntry.getMeta().get("isPlugin") != null) { Map kv6 = new HashMap(); kv6.put("操作", "点击安装完成"); - TCAgent.onEvent(getActivity(), "插件化", + DataUtils.onEvent(getActivity(), "插件化", downloadEntry.getName(), kv6); } if (FileUtils.isEmptyFile(path)) { @@ -383,7 +383,7 @@ public class DownLoadManagerFragment extends Fragment { kv.put("版本", list.get(getPosition() - 1).getMeta() .get("platform")); - TCAgent.onEvent(getActivity(), "游戏启动", + DataUtils.onEvent(getActivity(), "游戏启动", list.get(getPosition() - 1).getName(), kv); PackageUtils.launchApplicationByPackageName( @@ -532,7 +532,7 @@ public class DownLoadManagerFragment extends Fragment { && downloadEntry.getPath().equals(path)) { Map kv6 = new HashMap(); kv6.put("操作", "点击插件化安装完成"); - TCAgent.onEvent(getActivity(), "插件化", downloadEntry.getName(), kv6); + DataUtils.onEvent(getActivity(), "插件化", downloadEntry.getName(), kv6); break; } } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java index 7e38dfa888..b5753892ee 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java @@ -24,6 +24,7 @@ import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.FileUtils; import com.gh.common.util.ImageUtils; @@ -48,7 +49,6 @@ import com.gh.gamecenter.manager.PackageManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; @@ -502,7 +502,7 @@ public class GameUpdateFragment extends Fragment { Map kv = new HashMap(); kv.put("版本", game.getPlatform()); - TCAgent.onEvent(getActivity(), "游戏启动", game.getName(), kv); + DataUtils.onEvent(getActivity(), "游戏启动", game.getName(), kv); PackageUtils.launchApplicationByPackageName(getActivity(), game.getPackageName()); @@ -531,7 +531,7 @@ public class GameUpdateFragment extends Fragment { Map kv = new HashMap(); kv.put("版本", game.getPlatform()); kv.put("状态", "下载开始"); - TCAgent.onEvent(getActivity(), "游戏更新", game.getName(), kv); + DataUtils.onEvent(getActivity(), "游戏更新", game.getName(), kv); DownloadEntry entry = new DownloadEntry(); entry.setUrl(game.getUrl()); 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 8f8ea510a0..c6211ea232 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java @@ -19,6 +19,7 @@ import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; @@ -37,7 +38,6 @@ import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; @@ -247,7 +247,7 @@ public class Game1FragmentAdapter extends Map kv = new HashMap(); kv.put("入口", "新游-新游推荐"); - TCAgent.onEvent(context, "游戏详情", detailedEntity.getName(), + DataUtils.onEvent(context, "游戏详情", detailedEntity.getName(), kv); Map map = new HashMap(); diff --git a/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java index 85a72e0ebc..56a95f241a 100644 --- a/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/Game2FragmentAdapter.java @@ -22,6 +22,7 @@ import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; @@ -39,7 +40,6 @@ import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; @@ -625,7 +625,7 @@ public class Game2FragmentAdapter extends Map kv = new HashMap(); kv.put("入口", "新游-新测卡牌"); - TCAgent.onEvent(context, "游戏详情", gameEntity.getName(), + DataUtils.onEvent(context, "游戏详情", gameEntity.getName(), kv); Map map = new HashMap(); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetails/GameDetailsFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetails/GameDetailsFragment.java index 2ba93528c1..2ca286a47c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetails/GameDetailsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetails/GameDetailsFragment.java @@ -27,6 +27,7 @@ import com.android.volley.TimeoutError; import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.common.constant.Config; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.NewsUtils; @@ -49,7 +50,6 @@ import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; import org.json.JSONException; @@ -636,7 +636,7 @@ public class GameDetailsFragment extends Fragment { if (id == R.id.fm_gamedetails_newsstrategy_more) { Map kv = new HashMap(); kv.put("点击", "新闻攻略-更多>"); - TCAgent.onEvent(getActivity(), "插件数据", gameName, kv); + DataUtils.onEvent(getActivity(), "插件数据", gameName, kv); Map map = new HashMap(); map.put("location", "新闻攻略-更多"); @@ -657,7 +657,7 @@ public class GameDetailsFragment extends Fragment { Map kv0 = new HashMap(); kv0.put("点击", "插件介绍-收回^"); - TCAgent.onEvent(getActivity(), "插件数据", gameName, kv0); + DataUtils.onEvent(getActivity(), "插件数据", gameName, kv0); Map map = new HashMap(); map.put("location", "插件介绍-收回"); @@ -672,7 +672,7 @@ public class GameDetailsFragment extends Fragment { } else { Map kv0 = new HashMap(); kv0.put("点击", "插件介绍-详情v"); - TCAgent.onEvent(getActivity(), "插件数据", gameName, kv0); + DataUtils.onEvent(getActivity(), "插件数据", gameName, kv0); Map map = new HashMap(); map.put("location", "插件介绍-详情"); @@ -866,7 +866,7 @@ public class GameDetailsFragment extends Fragment { public void onClick(View v) { Map kv = new HashMap(); kv.put("点击", "新闻攻略"); - TCAgent.onEvent(getActivity(), "插件数据", gameName, kv); + DataUtils.onEvent(getActivity(), "插件数据", gameName, kv); NewsUtils.startNewsActivity(getActivity(), newsEntity, entrance + "-游戏详情-详情"); @@ -1227,7 +1227,7 @@ public class GameDetailsFragment extends Fragment { public void onClick(View v) { Map kv = new HashMap(); kv.put("点击", "游戏截图"); - TCAgent.onEvent(getActivity(), "插件数据", gameName, kv); + DataUtils.onEvent(getActivity(), "插件数据", gameName, kv); Map map = new HashMap(); map.put("location", "游戏截图"); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetails/GameInformationFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetails/GameInformationFragment.java index 918cd4bd63..e8b52cb798 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetails/GameInformationFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetails/GameInformationFragment.java @@ -39,6 +39,7 @@ import com.android.volley.TimeoutError; import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.common.constant.Config; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.Utils; @@ -51,7 +52,6 @@ import com.gh.gamecenter.eventbus.EBSlide; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; import org.json.JSONException; @@ -430,7 +430,7 @@ public class GameInformationFragment extends Fragment { Map kv = new HashMap(); kv.put("文章类型", newsEntity.getType()); kv.put("入口", "游戏详情-资讯"); - TCAgent.onEvent(getActivity(), "文章阅读-资讯", + DataUtils.onEvent(getActivity(), "文章阅读-资讯", newsEntity.getTitle(), kv); Map map = new HashMap(); @@ -453,7 +453,7 @@ public class GameInformationFragment extends Fragment { Map kv = new HashMap(); kv.put("关键字", keyword); - TCAgent.onEvent(getActivity(), "搜索-游戏详情", gameName, kv); + DataUtils.onEvent(getActivity(), "搜索-游戏详情", gameName, kv); Map map = new HashMap(); map.put("key", keyword); @@ -515,7 +515,7 @@ public class GameInformationFragment extends Fragment { Map kv = new HashMap(); kv.put("关键字", keyword); - TCAgent.onEvent(getActivity(), "搜索-游戏详情", gameName, kv); + DataUtils.onEvent(getActivity(), "搜索-游戏详情", gameName, kv); Map map = new HashMap(); map.put("key", keyword); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetails/GameStrategyFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetails/GameStrategyFragment.java index 47bfddd3fe..23e197b1e9 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetails/GameStrategyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetails/GameStrategyFragment.java @@ -39,6 +39,7 @@ import com.android.volley.TimeoutError; import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.common.constant.Config; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.Utils; @@ -51,7 +52,6 @@ import com.gh.gamecenter.eventbus.EBSlide; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; import org.json.JSONException; @@ -436,7 +436,7 @@ public class GameStrategyFragment extends Fragment { Map kv = new HashMap(); kv.put("文章类型", newsEntity.getType()); kv.put("入口", "游戏详情-攻略"); - TCAgent.onEvent(getActivity(), "文章阅读-攻略", + DataUtils.onEvent(getActivity(), "文章阅读-攻略", newsEntity.getTitle(), kv); Map map = new HashMap(); @@ -459,7 +459,7 @@ public class GameStrategyFragment extends Fragment { Map kv = new HashMap(); kv.put("关键字", keyword); - TCAgent.onEvent(getActivity(), "搜索-游戏详情", gameName, kv); + DataUtils.onEvent(getActivity(), "搜索-游戏详情", gameName, kv); Map map = new HashMap(); map.put("key", keyword); @@ -521,7 +521,7 @@ public class GameStrategyFragment extends Fragment { Map kv = new HashMap(); kv.put("关键字", keyword); - TCAgent.onEvent(getActivity(), "搜索-游戏详情", gameName, kv); + DataUtils.onEvent(getActivity(), "搜索-游戏详情", gameName, kv); Map map = new HashMap(); map.put("key", keyword); diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.java b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.java index 533b844279..6e1ecd0586 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.java +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.java @@ -28,6 +28,7 @@ import android.widget.TextView; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.view.VerticalItemDecoration; @@ -51,7 +52,6 @@ import com.gh.gamecenter.eventbus.EBTopState; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.PackageManager; -import com.tendcloud.tenddata.TCAgent; import java.util.ArrayList; import java.util.HashMap; @@ -266,7 +266,7 @@ public class HomeFragment extends Fragment implements OnClickListener { public void onClick(View v) { final int id = v.getId(); if (id == R.id.actionbar_notification) { - TCAgent.onEvent(getActivity(), "主页", "关注图标"); + DataUtils.onEvent(getActivity(), "主页", "关注图标"); Map map = new HashMap(); map.put("location", "关注图标"); @@ -276,7 +276,7 @@ public class HomeFragment extends Fragment implements OnClickListener { startActivity(new Intent(getActivity(), ConcernActivity.class)); } else if (id == R.id.actionbar_rl_download) { - TCAgent.onEvent(getActivity(), "主页", "下载图标"); + DataUtils.onEvent(getActivity(), "主页", "下载图标"); Map map = new HashMap(); map.put("location", "下载图标"); @@ -292,7 +292,7 @@ public class HomeFragment extends Fragment implements OnClickListener { startActivity(new Intent(getActivity(), DownloadManagerActivity.class)); } else if (id == R.id.actionbar_search_input) { - TCAgent.onEvent(getActivity(), "主页", "搜索框"); + DataUtils.onEvent(getActivity(), "主页", "搜索框"); Map map = new HashMap(); map.put("location", "搜索框"); @@ -305,7 +305,7 @@ public class HomeFragment extends Fragment implements OnClickListener { goSearch.putExtra("hint", hint); startActivity(goSearch); } else if (id == R.id.actionbar_iv_search) { - TCAgent.onEvent(getActivity(), "主页", "搜索图标"); + DataUtils.onEvent(getActivity(), "主页", "搜索图标"); Map map = new HashMap(); map.put("location", "搜索图标"); @@ -319,7 +319,7 @@ public class HomeFragment extends Fragment implements OnClickListener { searchIntent.putExtra("hint", hint); startActivity(searchIntent); } else if (id == R.id.actionbar_overflow) { - TCAgent.onEvent(getActivity(), "主页", "更多图标"); + DataUtils.onEvent(getActivity(), "主页", "更多图标"); Map map = new HashMap(); map.put("location", "更多图标"); diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.java index af1eda65d4..ee58d9f0b2 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.java @@ -29,6 +29,7 @@ import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; @@ -59,7 +60,6 @@ import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; @@ -1382,7 +1382,7 @@ public class HomeFragmentAdapter extends gameImg.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - TCAgent.onEvent(context, "主页", "游戏栏目"); + DataUtils.onEvent(context, "主页", "游戏栏目"); Map map = new HashMap(); map.put("location", "游戏"); @@ -1398,7 +1398,7 @@ public class HomeFragmentAdapter extends newsImg.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - TCAgent.onEvent(context, "主页", "资讯栏目"); + DataUtils.onEvent(context, "主页", "资讯栏目"); Map map = new HashMap(); map.put("location", "资讯"); @@ -1417,7 +1417,7 @@ public class HomeFragmentAdapter extends gonglueImg.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - TCAgent.onEvent(context, "主页", "攻略栏目"); + DataUtils.onEvent(context, "主页", "攻略栏目"); Map map = new HashMap(); map.put("location", "攻略"); @@ -1435,7 +1435,7 @@ public class HomeFragmentAdapter extends databaseImg.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - TCAgent.onEvent(context, "主页", "原创栏目"); + DataUtils.onEvent(context, "主页", "原创栏目"); Map map = new HashMap(); map.put("location", "原创"); @@ -1471,7 +1471,7 @@ public class HomeFragmentAdapter extends link.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - TCAgent.onEvent(context, "更多>", "卡牌头条"); + DataUtils.onEvent(context, "更多>", "卡牌头条"); Map map = new HashMap(); map.put("location", "卡牌头条-更多"); @@ -1494,7 +1494,7 @@ public class HomeFragmentAdapter extends link.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - TCAgent.onEvent(context, "更多>", "最新插件"); + DataUtils.onEvent(context, "更多>", "最新插件"); Map map = new HashMap(); map.put("location", "最新插件-更多"); @@ -1517,7 +1517,7 @@ public class HomeFragmentAdapter extends link.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - TCAgent.onEvent(context, "更多>", "热门卡牌"); + DataUtils.onEvent(context, "更多>", "热门卡牌"); Map map = new HashMap(); map.put("location", "热门卡牌-更多"); @@ -1539,7 +1539,7 @@ public class HomeFragmentAdapter extends link.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - TCAgent.onEvent(context, "更多>", "卡牌攻略"); + DataUtils.onEvent(context, "更多>", "卡牌攻略"); Map map = new HashMap(); map.put("location", "卡牌攻略-更多"); @@ -1562,7 +1562,7 @@ public class HomeFragmentAdapter extends link.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - TCAgent.onEvent(context, "更多>", "新测卡牌"); + DataUtils.onEvent(context, "更多>", "新测卡牌"); Map map = new HashMap(); map.put("location", "新测卡牌-更多"); @@ -1749,15 +1749,15 @@ public class HomeFragmentAdapter extends Map kv = new HashMap(); kv.put("文章类型", newsEntity.getType()); kv.put("入口", "主页-卡牌头条"); - TCAgent.onEvent(context, "文章阅读-资讯", newsEntity.getTitle(), kv); + DataUtils.onEvent(context, "文章阅读-资讯", newsEntity.getTitle(), kv); Map kv2 = new HashMap(); kv2.put(newsEntity.getTitle(), "点击量"); - TCAgent.onEvent(context, "主页数据", "卡牌头条", kv2); + DataUtils.onEvent(context, "主页数据", "卡牌头条", kv2); Map kv3 = new HashMap(); kv3.put("卡牌头条-首栏", i + ""); - TCAgent.onEvent(context, "主页数据", "位置数据", kv3); + DataUtils.onEvent(context, "主页数据", "位置数据", kv3); Map map = new HashMap(); map.put("location", "卡牌头条-首栏"); @@ -1919,11 +1919,11 @@ public class HomeFragmentAdapter extends Map kv2 = new HashMap(); kv2.put(newsEntity.getTitle(), "点击量"); - TCAgent.onEvent(context, "主页数据", "阅读精品", kv2); + DataUtils.onEvent(context, "主页数据", "阅读精品", kv2); Map kv3 = new HashMap(); kv3.put("阅读精品", i + ""); - TCAgent.onEvent(context, "主页数据", "位置数据", kv3); + DataUtils.onEvent(context, "主页数据", "位置数据", kv3); Map map = new HashMap(); map.put("location", "阅读精品"); @@ -1975,15 +1975,15 @@ public class HomeFragmentAdapter extends Map kv = new HashMap(); kv.put("文章类型", newsEntity.getType()); kv.put("入口", "主页-卡牌头条"); - TCAgent.onEvent(context, "文章阅读-资讯", newsEntity.getTitle(), kv); + DataUtils.onEvent(context, "文章阅读-资讯", newsEntity.getTitle(), kv); Map kv2 = new HashMap(); kv2.put(newsEntity.getTitle(), "点击量"); - TCAgent.onEvent(context, "主页数据", "卡牌头条", kv2); + DataUtils.onEvent(context, "主页数据", "卡牌头条", kv2); Map kv3 = new HashMap(); kv3.put("卡牌头条-次栏", i + ""); - TCAgent.onEvent(context, "主页数据", "位置数据", kv3); + DataUtils.onEvent(context, "主页数据", "位置数据", kv3); Map map = new HashMap(); map.put("location", "卡牌头条-次栏"); @@ -2013,15 +2013,15 @@ public class HomeFragmentAdapter extends Map kv = new HashMap(); kv.put("文章类型", newsEntity.getType()); kv.put("入口", "主页-卡牌攻略"); - TCAgent.onEvent(context, "文章阅读-攻略", newsEntity.getTitle(), kv); + DataUtils.onEvent(context, "文章阅读-攻略", newsEntity.getTitle(), kv); Map kv2 = new HashMap(); kv2.put(newsEntity.getTitle(), "点击量"); - TCAgent.onEvent(context, "主页数据", "卡牌攻略", kv2); + DataUtils.onEvent(context, "主页数据", "卡牌攻略", kv2); Map kv3 = new HashMap(); kv3.put("卡牌攻略", i + ""); - TCAgent.onEvent(context, "主页数据", "位置数据", kv3); + DataUtils.onEvent(context, "主页数据", "位置数据", kv3); Map map = new HashMap(); map.put("location", "卡牌攻略"); @@ -2116,15 +2116,15 @@ public class HomeFragmentAdapter extends Map kv = new HashMap(); kv.put("入口", "主页-" + entrance); - TCAgent.onEvent(context, "游戏详情", gameInfoEntity.getName(), kv); + DataUtils.onEvent(context, "游戏详情", gameInfoEntity.getName(), kv); Map kv2 = new HashMap(); kv2.put(gameInfoEntity.getName(), "点击量"); - TCAgent.onEvent(context, "主页数据", entrance, kv2); + DataUtils.onEvent(context, "主页数据", entrance, kv2); Map kv3 = new HashMap(); kv3.put(entrance, ii + ""); - TCAgent.onEvent(context, "主页数据", "位置数据", kv3); + DataUtils.onEvent(context, "主页数据", "位置数据", kv3); Map map = new HashMap(); map.put("location", entrance); @@ -2226,15 +2226,15 @@ public class HomeFragmentAdapter extends Map kv = new HashMap(); kv.put("入口", "主页-新测卡牌"); - TCAgent.onEvent(context, "游戏详情", entity.getName(), kv); + DataUtils.onEvent(context, "游戏详情", entity.getName(), kv); Map kv2 = new HashMap(); kv2.put(entity.getName(), "点击量"); - TCAgent.onEvent(context, "主页数据", "新测卡牌", kv2); + DataUtils.onEvent(context, "主页数据", "新测卡牌", kv2); Map kv3 = new HashMap(); kv3.put("新测卡牌", i + ""); - TCAgent.onEvent(context, "主页数据", "位置数据", kv3); + DataUtils.onEvent(context, "主页数据", "位置数据", kv3); Map map = new HashMap(); map.put("location", "新测卡牌"); diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java index 6281651478..a3d50f1146 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java @@ -46,6 +46,7 @@ import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.FileUtils; import com.gh.common.util.ImageUtils; @@ -83,7 +84,6 @@ import com.gh.gamecenter.manager.PackageManager; import com.gh.gamecenter.manager.SuspectedGameManager; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; import com.google.gson.Gson; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONObject; @@ -648,7 +648,7 @@ public class PersonalFragmentAdapter extends public void onClick(View v) { final int id = v.getId(); if (id == R.id.me_ll_concern) { - TCAgent.onEvent(fragmentActivity, "我的光环", "我的关注"); + DataUtils.onEvent(fragmentActivity, "我的光环", "我的关注"); Map map = new HashMap(); map.put("location", "我的关注"); @@ -660,7 +660,7 @@ public class PersonalFragmentAdapter extends fragmentActivity.startActivity(new Intent(fragmentActivity, ConcernActivity.class)); } else if (id == R.id.me_ll_download) { - TCAgent.onEvent(fragmentActivity, "我的光环", "下载管理"); + DataUtils.onEvent(fragmentActivity, "我的光环", "下载管理"); Map map = new HashMap(); map.put("location", "下载管理"); @@ -675,7 +675,7 @@ public class PersonalFragmentAdapter extends downloadIntent.putExtra("currentItem", 0); fragmentActivity.startActivity(downloadIntent); } else if (id == R.id.me_ll_setting) { - TCAgent.onEvent(fragmentActivity, "我的光环", "设置"); + DataUtils.onEvent(fragmentActivity, "我的光环", "设置"); Map map = new HashMap(); map.put("location", "设置"); @@ -687,7 +687,7 @@ public class PersonalFragmentAdapter extends fragmentActivity.startActivity(new Intent(fragmentActivity, SettingActivity.class)); } else if (id == R.id.me_ll_update) { - TCAgent.onEvent(fragmentActivity, "我的光环", "更新管理"); + DataUtils.onEvent(fragmentActivity, "我的光环", "更新管理"); Map map = new HashMap(); map.put("location", "更新管理"); @@ -832,7 +832,7 @@ public class PersonalFragmentAdapter extends GameEntity entity = gameDetailedList.get(position - 2); Map kv = new HashMap(); kv.put("入口", "我的光环-我的游戏"); - TCAgent.onEvent(fragmentActivity, "游戏详情", entity.getName(), kv); + DataUtils.onEvent(fragmentActivity, "游戏详情", entity.getName(), kv); Map map = new HashMap(); map.put("location", "我的游戏"); @@ -866,7 +866,7 @@ public class PersonalFragmentAdapter extends break; } } - TCAgent.onEvent(fragmentActivity, "游戏启动", entity.getName(), + DataUtils.onEvent(fragmentActivity, "游戏启动", entity.getName(), kv); Map map = new HashMap(); @@ -1013,8 +1013,7 @@ public class PersonalFragmentAdapter extends if (viewHolder.platform_item_iv_pic.getVisibility() == View.VISIBLE) { Map kv = new HashMap(); kv.put("版本", pList.get(viewHolder.getPosition()).getPlatform()); - TCAgent.onEvent(fragmentActivity, "游戏启动", - gEntity.getName(), kv); + DataUtils.onEvent(fragmentActivity, "游戏启动", gEntity.getName(), kv); Map map = new HashMap(); map.put("location", "我的游戏-游戏启动"); @@ -1039,26 +1038,26 @@ public class PersonalFragmentAdapter extends Map kv = new HashMap(); kv.put("版本", apkEntity.getPlatform()); kv.put("状态", "下载开始"); - TCAgent.onEvent(fragmentActivity, "游戏下载", + DataUtils.onEvent(fragmentActivity, "游戏下载", gEntity.getName(), kv); Map kv2 = new HashMap(); kv2.put("版本", apkEntity.getPlatform()); kv2.put("状态", "下载开始"); kv2.put("位置", "我的关注-开始"); - TCAgent.onEvent(fragmentActivity, "游戏下载位置", + DataUtils.onEvent(fragmentActivity, "游戏下载位置", gEntity.getName(), kv2); Map kv3 = new HashMap(); kv3.put("我的关注", "下载数"); kv3.put("我的关注", "下载开始"); - TCAgent.onEvent(fragmentActivity, "应用数据", + DataUtils.onEvent(fragmentActivity, "应用数据", gEntity.getName(), kv3); Map kv6 = new HashMap(); kv6.put("下载", "下载开始"); kv6.put("版本", apkEntity.getPlatform()); - TCAgent.onEvent(fragmentActivity, "插件化", + DataUtils.onEvent(fragmentActivity, "插件化", gEntity.getName(), kv6); Map map = new HashMap(); @@ -1292,7 +1291,7 @@ public class PersonalFragmentAdapter extends Map kv6 = new HashMap(); kv6.put("操作", "点击插件化安装完成"); - TCAgent.onEvent(fragmentActivity, "插件化", gameName, kv6); + DataUtils.onEvent(fragmentActivity, "插件化", gameName, kv6); Map map = new HashMap(); map.put("location", "我的游戏-插件化安装"); diff --git a/app/src/main/java/com/gh/gamecenter/plugin/Plugin1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/plugin/Plugin1FragmentAdapter.java index 8fc28c20dc..eeb80a99a4 100644 --- a/app/src/main/java/com/gh/gamecenter/plugin/Plugin1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/plugin/Plugin1FragmentAdapter.java @@ -24,6 +24,7 @@ import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; @@ -45,7 +46,6 @@ import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; @@ -405,7 +405,7 @@ public class Plugin1FragmentAdapter extends Map kv = new HashMap(); kv.put("入口", "插件-精品-列表"); - TCAgent.onEvent(context, "游戏详情", detailedEntity.getName(), + DataUtils.onEvent(context, "游戏详情", detailedEntity.getName(), kv); Map map = new HashMap(); diff --git a/app/src/main/java/com/gh/gamecenter/plugin/Plugin2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/plugin/Plugin2FragmentAdapter.java index 3dc24faddf..0b17054817 100644 --- a/app/src/main/java/com/gh/gamecenter/plugin/Plugin2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/plugin/Plugin2FragmentAdapter.java @@ -19,6 +19,7 @@ import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; @@ -37,7 +38,6 @@ import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; @@ -282,7 +282,7 @@ public class Plugin2FragmentAdapter extends Map kv = new HashMap(); kv.put("入口", "插件-最新"); - TCAgent.onEvent(context, "游戏详情", detailedEntity.getName(), + DataUtils.onEvent(context, "游戏详情", detailedEntity.getName(), kv); Map map = new HashMap(); diff --git a/app/src/main/java/com/gh/gamecenter/plugin/Plugin3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/plugin/Plugin3FragmentAdapter.java index d4c02cf259..080272db78 100644 --- a/app/src/main/java/com/gh/gamecenter/plugin/Plugin3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/plugin/Plugin3FragmentAdapter.java @@ -19,6 +19,7 @@ import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadItemUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; @@ -37,7 +38,6 @@ import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; @@ -295,7 +295,7 @@ public class Plugin3FragmentAdapter extends Map kv = new HashMap(); kv.put("入口", "插件-单机"); - TCAgent.onEvent(context, "游戏详情", detailedEntity.getName(), + DataUtils.onEvent(context, "游戏详情", detailedEntity.getName(), kv); Map map = new HashMap(); diff --git a/app/src/main/java/com/gh/gamecenter/plugin/PluginFragment.java b/app/src/main/java/com/gh/gamecenter/plugin/PluginFragment.java index a92e069c98..27dc69d56e 100644 --- a/app/src/main/java/com/gh/gamecenter/plugin/PluginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/plugin/PluginFragment.java @@ -28,6 +28,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.gh.common.constant.Config; +import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.Utils; import com.gh.download.DownloadManager; @@ -43,7 +44,6 @@ import com.gh.gamecenter.eventbus.EBTopState; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.manager.PackageManager; -import com.tendcloud.tenddata.TCAgent; import java.util.HashMap; import java.util.List; @@ -253,7 +253,7 @@ public class PluginFragment extends Fragment implements OnClickListener, } else if (id == R.id.danji_text) { viewPager.setCurrentItem(2); } else if (id == R.id.actionbar_notification) { - TCAgent.onEvent(getActivity(), "主页", "关注图标"); + DataUtils.onEvent(getActivity(), "主页", "关注图标"); Map map = new HashMap(); map.put("location", "关注图标"); @@ -263,7 +263,7 @@ public class PluginFragment extends Fragment implements OnClickListener, startActivity(new Intent(getActivity(), ConcernActivity.class)); } else if (id == R.id.actionbar_rl_download) { - TCAgent.onEvent(getActivity(), "主页", "下载图标"); + DataUtils.onEvent(getActivity(), "主页", "下载图标"); Map map = new HashMap(); map.put("location", "下载图标"); @@ -279,7 +279,7 @@ public class PluginFragment extends Fragment implements OnClickListener, startActivity(new Intent(getActivity(), DownloadManagerActivity.class)); } else if (id == R.id.actionbar_search_input) { - TCAgent.onEvent(getActivity(), "主页", "搜索框"); + DataUtils.onEvent(getActivity(), "主页", "搜索框"); Map map = new HashMap(); map.put("location", "搜索框"); @@ -292,7 +292,7 @@ public class PluginFragment extends Fragment implements OnClickListener, goSearch.putExtra("hint", hint); startActivity(goSearch); } else if (id == R.id.actionbar_iv_search) { - TCAgent.onEvent(getActivity(), "主页", "搜索图标"); + DataUtils.onEvent(getActivity(), "主页", "搜索图标"); Map map = new HashMap(); map.put("location", "搜索图标"); @@ -306,7 +306,7 @@ public class PluginFragment extends Fragment implements OnClickListener, searchIntent.putExtra("hint", hint); startActivity(searchIntent); } else if (id == R.id.actionbar_overflow) { - TCAgent.onEvent(getActivity(), "主页", "更多图标"); + DataUtils.onEvent(getActivity(), "主页", "更多图标"); Map map = new HashMap(); map.put("location", "更多图标"); diff --git a/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java index 11650661c4..07bb76a854 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/InstallAndUninstallReceiver.java @@ -4,9 +4,9 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import com.gh.common.util.DataUtils; import com.gh.common.util.Utils; import com.gh.gamecenter.eventbus.EBPackage; -import com.tendcloud.tenddata.TCAgent; import de.greenrobot.event.EventBus; @@ -42,7 +42,7 @@ public class InstallAndUninstallReceiver extends BroadcastReceiver { packageName = packageName.substring(packageName.indexOf(":") + 1); Utils.log("替换了:" + packageName + "包名的程序"); if (packageName.equals(context.getPackageName())) { - TCAgent.onEvent(context, "软件更新", "更新完成"); + DataUtils.onEvent(context, "软件更新", "更新完成"); } EventBus.getDefault().post(new EBPackage("替换", packageName)); } diff --git a/app/src/main/java/com/gh/gamecenter/search/Search1DetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/Search1DetailFragmentAdapter.java index 607c902827..08a3ce71cf 100644 --- a/app/src/main/java/com/gh/gamecenter/search/Search1DetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/Search1DetailFragmentAdapter.java @@ -18,6 +18,7 @@ import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.TimestampUtils; @@ -31,7 +32,6 @@ import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; @@ -152,7 +152,7 @@ public class Search1DetailFragmentAdapter extends RecyclerView.Adapter kv = new HashMap(); kv.put("入口", "搜索"); - TCAgent.onEvent(context, "游戏详情", gameEntity.getName(), kv); + DataUtils.onEvent(context, "游戏详情", gameEntity.getName(), kv); Map map = new HashMap(); map.put("location", "搜索"); diff --git a/app/src/main/java/com/gh/gamecenter/search/Search2GameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/Search2GameListFragmentAdapter.java index 9aac72043c..cdca065f61 100644 --- a/app/src/main/java/com/gh/gamecenter/search/Search2GameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/Search2GameListFragmentAdapter.java @@ -13,12 +13,12 @@ import android.view.inputmethod.InputMethodManager; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.volley.NoConnectionError; import com.android.volley.Response; import com.android.volley.VolleyError; import com.gh.base.AppController; import com.gh.common.constant.Config; import com.gh.common.constant.Constants; +import com.gh.common.util.DataUtils; import com.gh.common.util.GameViewUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.TimestampUtils; @@ -32,7 +32,6 @@ import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.volley.extended.JsonArrayExtendedRequest; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.tendcloud.tenddata.TCAgent; import org.json.JSONArray; @@ -147,7 +146,7 @@ public class Search2GameListFragmentAdapter extends @Override public void onClick(View v) { - TCAgent.onEvent(context, "搜索页面", key); + DataUtils.onEvent(context, "搜索页面", key); Map map = new HashMap(); map.put("key", key); @@ -157,7 +156,7 @@ public class Search2GameListFragmentAdapter extends Map kv = new HashMap(); kv.put("入口", "搜索"); - TCAgent.onEvent(context, "游戏详情", gameEntity.getName(), kv); + DataUtils.onEvent(context, "游戏详情", gameEntity.getName(), kv); Map map2 = new HashMap(); map2.put("location", "搜索"); @@ -204,7 +203,7 @@ public class Search2GameListFragmentAdapter extends holder.rootItem.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - TCAgent.onEvent(context, "搜索页面", key); + DataUtils.onEvent(context, "搜索页面", key); Map map = new HashMap(); map.put("key", key); diff --git a/app/src/main/java/com/gh/gamecenter/search/Search3HistoryFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/Search3HistoryFragmentAdapter.java index a4b47bf42b..b1c6cf694f 100644 --- a/app/src/main/java/com/gh/gamecenter/search/Search3HistoryFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/Search3HistoryFragmentAdapter.java @@ -13,11 +13,11 @@ import android.view.Window; import android.widget.ImageView; import android.widget.TextView; +import com.gh.common.util.DataUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.db.SearchHistoryDao; import com.gh.gamecenter.eventbus.EBSearch; import com.gh.gamecenter.manager.DataCollectionManager; -import com.tendcloud.tenddata.TCAgent; import java.util.ArrayList; import java.util.HashMap; @@ -145,7 +145,7 @@ public class Search3HistoryFragmentAdapter extends RecyclerView.Adapter map = new HashMap(); map.put("key", str);