From 85849255e61530972e9b7b0cc9ca778e9ac3e997 Mon Sep 17 00:00:00 2001 From: huangzhuanghua <401742778@qq.com> Date: Thu, 12 May 2016 15:47:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8F=92=E4=BB=B6=E5=8C=96?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E4=B8=8D=E5=BC=B9=E5=8D=B8=E8=BD=BD=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/view/DownloadDialog.java | 15 +++-------- .../gh/gamecenter/GameDetailsActivity.java | 7 ++--- .../download/DownLoadManagerFragment.java | 12 +++------ .../personal/PersonalFragmentAdapter.java | 26 +++++-------------- 4 files changed, 15 insertions(+), 45 deletions(-) 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 6ed7ad1ff8..29b6f0d44e 100644 --- a/app/src/main/java/com/gh/common/view/DownloadDialog.java +++ b/app/src/main/java/com/gh/common/view/DownloadDialog.java @@ -565,20 +565,11 @@ public class DownloadDialog { if (FileUtils.isEmptyFile(path)) { Toast.makeText(context, "解析包错误", Toast.LENGTH_SHORT).show(); entryMap.remove(apkEntity.getUrl()); - DownloadManager.getInstance(context).cancel( - apkEntity.getUrl()); + DownloadManager.getInstance(context).cancel(apkEntity.getUrl()); adapter.notifyItemChanged(location); } else { - PackageManager manager = new PackageManager(context); - if (manager.launchSetup(path)) { - context.startActivity(PackageUtils - .getInstallIntent(path)); - } else { - MainActivity.uninstallMap.put(PackageUtils - .getPackageNameByPath(context, path), path); - context.startActivity(PackageUtils.getUninstallIntent( - context, path)); - } + MainActivity.uninstallMap.put(PackageUtils.getPackageNameByPath(context, path), path); + context.startActivity(PackageUtils.getUninstallIntent(context, path)); } } }); diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java index 581255b056..b3a9750229 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java @@ -899,11 +899,8 @@ public class GameDetailsActivity extends BaseFragmentActivity implements if (FileUtils.isEmptyFile(path)) { toast("解析包错误"); } else { - MainActivity.uninstallMap.put( - PackageUtils.getPackageNameByPath( - getApplicationContext(), path), path); - startActivity(PackageUtils.getUninstallIntent( - getApplicationContext(), path)); + MainActivity.uninstallMap.put(PackageUtils.getPackageNameByPath(getApplicationContext(), path), path); + startActivity(PackageUtils.getUninstallIntent(getApplicationContext(), path)); } } }); 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 37a3a96ccf..617605bb54 100644 --- a/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java @@ -554,20 +554,16 @@ public class DownLoadManagerFragment extends Fragment { && downloadEntry.getPath().equals(path)) { Map kv6 = new HashMap(); kv6.put("操作", "点击插件化安装完成"); - TCAgent.onEvent(getActivity(), "插件化", - downloadEntry.getName(), kv6); + TCAgent.onEvent(getActivity(), "插件化", downloadEntry.getName(), kv6); break; } } if (FileUtils.isEmptyFile(path)) { - Toast.makeText(getActivity(), "解析包错误", Toast.LENGTH_SHORT) - .show(); + Toast.makeText(getActivity(), "解析包错误", Toast.LENGTH_SHORT).show(); } else { - MainActivity.uninstallMap.put(PackageUtils - .getPackageNameByPath(getActivity(), path), path); - startActivity(PackageUtils.getUninstallIntent( - getActivity(), path)); + MainActivity.uninstallMap.put(PackageUtils.getPackageNameByPath(getActivity(), path), path); + startActivity(PackageUtils.getUninstallIntent(getActivity(), path)); } } }); 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 4f6a554dc1..a39f08c79e 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragmentAdapter.java @@ -3034,30 +3034,16 @@ public class PersonalFragmentAdapter extends map.put("createOn", System.currentTimeMillis() / 1000); map.put("game", gameName); map.put("page", "我的光环"); - DataCollectionManager.onEvent(fragmentActivity, "click-item", - map); + DataCollectionManager.onEvent(fragmentActivity, "click-item", map); - String path = DownloadManager.getInstance(fragmentActivity) - .get(apkEntity.getUrl()).getPath(); + String path = DownloadManager.getInstance(fragmentActivity).get(apkEntity.getUrl()).getPath(); if (FileUtils.isEmptyFile(path)) { - Toast.makeText(fragmentActivity, "解析包错误", - Toast.LENGTH_SHORT).show(); - DownloadManager.getInstance(fragmentActivity).cancel( - apkEntity.getUrl()); + Toast.makeText(fragmentActivity, "解析包错误", Toast.LENGTH_SHORT).show(); + DownloadManager.getInstance(fragmentActivity).cancel(apkEntity.getUrl()); adapter.notifyItemChanged(location); } else { - PackageManager manager = new PackageManager( - fragmentActivity); - if (manager.launchSetup(path)) { - fragmentActivity.startActivity(PackageUtils - .getInstallIntent(path)); - } else { - MainActivity.uninstallMap.put(PackageUtils - .getPackageNameByPath(fragmentActivity, path), - path); - fragmentActivity.startActivity(PackageUtils - .getUninstallIntent(fragmentActivity, path)); - } + MainActivity.uninstallMap.put(PackageUtils.getPackageNameByPath(fragmentActivity, path), path); + fragmentActivity.startActivity(PackageUtils.getUninstallIntent(fragmentActivity, path)); } } });