From 7862426144fb8529c03f05af1d17d3c20decd8c2 Mon Sep 17 00:00:00 2001 From: khy <18814188563@163.com> Date: Tue, 1 Nov 2016 09:59:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8B=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/MainActivity.java | 40 ++++++++++++++++--- .../com/gh/gamecenter/SettingActivity.java | 32 +++++++++++++++ 2 files changed, 66 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 23c5ed3632..b807a05344 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -163,6 +163,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene if (downloadEntity.getName().contains("光环助手")) { DataUtils.onEvent(MainActivity.this, "软件更新", "下载完成"); startActivity(PackageUtils.getInstallIntent(downloadEntity.getPath())); + uploadUpgradeLog("install");//上传更新安装数据 if (appEntity != null && appEntity.isForce()) { finish(); } @@ -683,12 +684,13 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene concernInfo.setPackageNames(packageNames); concernManager.updateByConcern(concernInfo); } - if (isNewFirstLaunch) { - //默认安装即为关注 - if (!concernManager.isConcern(gameEntity.getId())) { - concernManager.addByEntity(gameEntity); - } - } + //无需默认关注 +// if (isNewFirstLaunch) { +// //默认安装即为关注 +// if (!concernManager.isConcern(gameEntity.getId())) { +// concernManager.addByEntity(gameEntity); +// } +// } } addConcernCount(); if (cCount == size) { @@ -1178,6 +1180,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } private void showUpdateDialog(final String md5) { + uploadUpgradeLog("notice"); //上传更新通知弹窗数据 final Dialog updateDialog = new Dialog(this); View view = View.inflate(this, R.layout.app_update_hint_dialog, null); @@ -1211,6 +1214,7 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene "光环助手V" + appEntity.getVersion() + "_" + md5 + ".apk"); File file = new File(path); if (file.exists() && file.length() > 0) { + uploadUpgradeLog("install");//上传更新安装数据 startActivity(PackageUtils.getInstallIntent(path)); } else { DataUtils.onEvent(MainActivity.this, "软件更新", "下载开始"); @@ -1299,6 +1303,30 @@ public class MainActivity extends BaseFragmentActivity implements OnClickListene } } + private void uploadUpgradeLog(String step) { + Map map = new HashMap<>(); + String version = PackageUtils.getVersion(this); + String user = DeviceUtils.getDeviceID(this); + String channel = (String) PackageUtils.getMetaData(this, + getPackageName(), "TD_CHANNEL_ID"); + map.put("step", step); + map.put("version", version); + map.put("user", user); + map.put("device_id", TokenUtils.getDeviceId(this)); + map.put("channel", channel); + String url = "http://data.ghzhushou.com/api/v1d0/log"; + Map params = new HashMap<>(); + params.put("topic", "upgrade"); + params.put("source", "GH-ASSIST-Client"); + params.put("time", String.valueOf(Utils.getTime(this))); + params.put("content", new JSONObject(map).toString()); + StringExtendedRequest request = new StringExtendedRequest(Method.POST, url, null, null); + request.setParams(params); + request.setShouldCache(false); + AppController.addToRequestQueue(request, TAG); + Utils.log("提交更新数据" + new JSONObject(params).toString()); + } + // 获取META-INF中的plugin_update 文件，判断是否从游戏插件中下载的app，是则获取游戏id，启动游戏更新，下载该游戏 private void getPluginUpdate() { ApplicationInfo appinfo = getApplicationInfo(); diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index ea1de0c1e3..c3e1074544 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -20,17 +20,20 @@ import android.widget.RadioGroup; import android.widget.TextView; import android.widget.Toast; +import com.android.volley.Request; import com.android.volley.Response; 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.DeviceUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.FileUtils; import com.gh.common.util.MD5Utils; import com.gh.common.util.PackageUtils; import com.gh.common.util.SpeedUtils; +import com.gh.common.util.TokenUtils; import com.gh.common.util.Utils; import com.gh.download.DataWatcher; import com.gh.download.DownloadEntity; @@ -41,12 +44,15 @@ import com.gh.gamecenter.entity.GameUpdateEntity; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.manager.PackageManager; import com.gh.gamecenter.volley.extended.JsonObjectExtendedRequest; +import com.gh.gamecenter.volley.extended.StringExtendedRequest; import com.google.gson.Gson; import com.kyleduo.switchbutton.SwitchButton; import org.json.JSONObject; import java.io.File; +import java.util.HashMap; +import java.util.Map; import de.greenrobot.event.EventBus; @@ -428,6 +434,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { } private void showUpdateDialog(final String md5) { + uploadUpgradeLog("notice"); //上传更新通知弹窗数据 final Dialog updateDialog = new Dialog(this); View view = View.inflate(this, R.layout.app_update_hint_dialog, null); @@ -463,6 +470,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { "光环助手V" + appEntity.getVersion() + "_" + md5 + ".apk"); File file = new File(path); if (file.exists() && file.length() > 0) { + uploadUpgradeLog("install");//上传更新安装数据 startActivity(PackageUtils.getInstallIntent(path)); } else { DataUtils.onEvent(SettingActivity.this, "软件更新", "下载开始"); @@ -538,6 +546,30 @@ public class SettingActivity extends BaseActivity implements OnClickListener { DownloadManager.getInstance(getApplicationContext()).add(downloadEntity); } + private void uploadUpgradeLog(String step) { + Map map = new HashMap<>(); + String version = PackageUtils.getVersion(this); + String user = DeviceUtils.getDeviceID(this); + String channel = (String) PackageUtils.getMetaData(this, + getPackageName(), "TD_CHANNEL_ID"); + map.put("step", step); + map.put("version", version); + map.put("user", user); + map.put("device_id", TokenUtils.getDeviceId(this)); + map.put("channel", channel); + String url = "http://data.ghzhushou.com/api/v1d0/log"; + Map params = new HashMap<>(); + params.put("topic", "upgrade"); + params.put("source", "GH-ASSIST-Client"); + params.put("time", String.valueOf(Utils.getTime(this))); + params.put("content", new JSONObject(map).toString()); + StringExtendedRequest request = new StringExtendedRequest(Request.Method.POST, url, null, null); + request.setParams(params); + request.setShouldCache(false); + AppController.addToRequestQueue(request, TAG); + Utils.log("提交更新数据" + new JSONObject(params).toString()); + } + @Override public void onResume() { super.onResume();