From f74ae2a8cfd0a587031de4a81fcd4cddbd4ec422 Mon Sep 17 00:00:00 2001
From: huangzhuanghua <401742778@qq.com>
Date: Fri, 22 Jul 2016 13:57:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=92=E4=BB=B6=E5=8C=96?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A1=86=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE?=
=?UTF-8?q?=E4=B8=BA=E6=89=80=E6=9C=89=E7=95=8C=E9=9D=A2=EF=BC=8C=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E5=8D=B8=E8=BD=BD=E5=90=8E=E4=B8=8D=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E8=B7=B3=E5=AE=89=E8=A3=85bug=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=87=8F=E8=B6=85100%bug=EF=BC=8C=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E6=89=93=E5=8C=85=E6=B8=A0=E9=81=93106?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/build.gradle | 5 ++-
app/src/main/AndroidManifest.xml | 4 +-
.../main/java/com/gh/base/BaseActivity.java | 10 +++++
.../com/gh/base/BaseFragmentActivity.java | 10 +++++
.../java/com/gh/common/util/DataUtils.java | 6 +--
.../com/gh/common/util/DownloadItemUtils.java | 4 +-
.../main/java/com/gh/common/util/Utils.java | 2 +-
.../com/gh/common/view/DownloadDialog.java | 12 ++++-
.../com/gh/download/DownloadListener.java | 3 +-
.../java/com/gh/download/DownloadTask.java | 6 ++-
.../java/com/gh/download/DownloadThread.java | 22 ++++-----
.../gh/gamecenter/GameDetailsActivity.java | 45 +------------------
.../java/com/gh/gamecenter/MainActivity.java | 34 ++++++++------
.../java/com/gh/gamecenter/NewsActivity.java | 4 +-
.../gh/gamecenter/SplashScreenActivity.java | 2 +-
.../download/DownLoadManagerFragment.java | 4 +-
16 files changed, 86 insertions(+), 87 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 96847bf8b6..c384416666 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,8 +38,8 @@ android {
applicationId "com.gh.gamecenter"
minSdkVersion 14
targetSdkVersion 19
- versionCode 13
- versionName "1.50"
+ versionCode 14
+ versionName "1.51"
// 默认的渠道
// manifestPlaceholders = [CHANNEL_VALUE: "GH_TEST"]
@@ -82,6 +82,7 @@ android {
GH_102 {}
GH_103 {}
GH_104 {}
+ GH_106 {}
GH_109 {}
GH_110 {}
GH_113 {}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c59f647585..7d3c66c210 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -64,7 +64,7 @@
android:value="81DB144D555386A38A70B833537EC256" />
@@ -74,7 +74,7 @@
android:value="APV567FTBS7J"/>
+ android:value="${CHANNEL_VALUE}"/>
statusMap;
@@ -135,24 +134,6 @@ public class GameDetailsActivity extends BaseFragmentActivity implements
}
}
}
- for (Entry entry : downloadingEntries
- .entrySet()) {
- DownloadEntry downloadEntry = entry.getValue();
- if (DownloadStatus.done.equals(downloadEntry.getStatus())
- && downloadEntry.getMeta().get("isPlugin") != null) {
- if (!RunningUtils
- .isApplicationBroughtToBackground(getApplicationContext())
- && RunningUtils.isEqualsTop(
- getApplicationContext(),
- GameDetailsActivity.class.getName())) {
- if (!isShowPluginDialog) {
- isShowPluginDialog = true;
- showPluginDialog(downloadEntry.getPath(),
- downloadEntry.getName());
- }
- }
- }
- }
}
};
@@ -500,7 +481,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements
if (manager.launchSetup(path)) {
startActivity(PackageUtils.getInstallIntent(path));
} else {
- DialogUtils.showUninstallDialog(this, new DialogUtils.ConfiremListener() {
+ DialogUtils.showPluginDialog(this, new DialogUtils.ConfiremListener() {
@Override
public void onConfirem() {
MainActivity.uninstallMap.put(
@@ -508,7 +489,7 @@ public class GameDetailsActivity extends BaseFragmentActivity implements
startActivity(PackageUtils.getUninstallIntent(GameDetailsActivity.this,
path));
}
- });
+ }, null);
}
} else if("等待".equals(str)){
@@ -638,28 +619,6 @@ public class GameDetailsActivity extends BaseFragmentActivity implements
}
}
- private void showPluginDialog(final String path, final String gameName) {
- DialogUtils.showPluginDialog(this, new DialogUtils.ConfiremListener() {
- @Override
- public void onConfirem() {
- Map kv6 = new HashMap();
- kv6.put("操作", "一次性完成");
- DataUtils.onEvent(GameDetailsActivity.this, "插件化", gameName, kv6);
- if (FileUtils.isEmptyFile(path)) {
- toast("解析包错误");
- } else {
- MainActivity.uninstallMap.put(PackageUtils.getPackageNameByPath(getApplicationContext(), path), path);
- startActivity(PackageUtils.getUninstallIntent(getApplicationContext(), path));
- }
- }
- }, new DialogUtils.DismissListener() {
- @Override
- public void onDismiss() {
- isShowPluginDialog = false;
- }
- });
- }
-
@Override
public void onPageSelected(int position) {
switch (position) {
diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java
index fd03d0b2d1..cc7399a8cb 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -26,6 +26,7 @@ import android.view.Window;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
+import android.widget.Toast;
import com.android.volley.Request.Method;
import com.android.volley.Response;
@@ -293,14 +294,13 @@ public class MainActivity extends BaseFragmentActivity implements
downloadEntry.getMeta().get(
"platform"));
if (platform != null) {
- String msg = downloadEntry.getName()
- + " - " + platform;
if (downloadEntry.getMeta().get("isPlugin") != null) {
- msg = msg + " - 插件化安装包下载完成";
+ EventBus.getDefault().post(new EBShowDialog("plugin", downloadEntry
+ .getPath()));
} else {
- msg = msg + " - 下载完成";
+ toast(downloadEntry.getName()
+ + " - " + platform + " - 下载完成");
}
- toast(msg);
} else {
toast(downloadEntry.getName() + " - 下载完成");
}
@@ -1089,6 +1089,7 @@ public class MainActivity extends BaseFragmentActivity implements
}
public void onEventMainThread(EBPackage busFour) {
+
String packageName = busFour.getPackageName();
// 添加进已安装map中
if ("安装".equals(busFour.getType())) {
@@ -1116,19 +1117,24 @@ public class MainActivity extends BaseFragmentActivity implements
url, sp.getBoolean("autodelete", true));
}
} else if ("卸载".equals(busFour.getType())) {
- for (DownloadEntry downloadEntry : DownloadManager.getInstance(
- getApplicationContext()).getAll()) {
- if (downloadEntry.getMeta().get("isPlugin") != null
- && downloadEntry.getMeta().get("package_name")
- .equals(packageName)) {
- Map kv6 = new HashMap();
- kv6.put("安装或卸载", "卸载完成");
- DataUtils.onEvent(this, "插件化", downloadEntry.getName(), kv6);
- break;
+ try {
+ for (DownloadEntry downloadEntry : DownloadManager.getInstance(
+ getApplicationContext()).getAll()) {
+ if (downloadEntry.getMeta().get("isPlugin") != null
+ && downloadEntry.getMeta().get("package_name")
+ .equals(packageName)) {
+ Map kv6 = new HashMap();
+ kv6.put("安装或卸载", "卸载完成");
+ DataUtils.onEvent(this, "插件化", downloadEntry.getName(), kv6);
+ break;
+ }
}
+ } catch (Exception e) {
+ e.printStackTrace();
}
String path = uninstallMap.get(packageName);
+
if (path != null) {
uninstallMap.remove(packageName);
diff --git a/app/src/main/java/com/gh/gamecenter/NewsActivity.java b/app/src/main/java/com/gh/gamecenter/NewsActivity.java
index 562c00826b..f3ce4b3a64 100644
--- a/app/src/main/java/com/gh/gamecenter/NewsActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/NewsActivity.java
@@ -431,7 +431,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener {
if (manager.launchSetup(path)) {
startActivity(PackageUtils.getInstallIntent(path));
} else {
- DialogUtils.showUninstallDialog(this, new DialogUtils.ConfiremListener() {
+ DialogUtils.showPluginDialog(this, new DialogUtils.ConfiremListener() {
@Override
public void onConfirem() {
MainActivity.uninstallMap.put(
@@ -439,7 +439,7 @@ public class NewsActivity extends BaseActivity implements OnClickListener {
startActivity(PackageUtils.getUninstallIntent(NewsActivity.this,
path));
}
- });
+ }, null);
}
} else if ("等待".equals(str)) {
diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
index 04e03dd4dd..bd1374ad10 100644
--- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
@@ -229,7 +229,7 @@ public class SplashScreenActivity extends BaseActivity {
getPlatform();
}
-// getDownloadStatus();
+ getDownloadStatus();
getUISetting();
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 ed8457f011..eaa8547057 100644
--- a/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/download/DownLoadManagerFragment.java
@@ -349,7 +349,7 @@ public class DownLoadManagerFragment extends Fragment {
startActivity(PackageUtils
.getInstallIntent(path));
} else {
- DialogUtils.showUninstallDialog(getActivity(), new DialogUtils.ConfiremListener() {
+ DialogUtils.showPluginDialog(getActivity(), new DialogUtils.ConfiremListener() {
@Override
public void onConfirem() {
MainActivity.uninstallMap.put(
@@ -357,7 +357,7 @@ public class DownLoadManagerFragment extends Fragment {
startActivity(PackageUtils.getUninstallIntent(getActivity(),
path));
}
- });
+ }, null);
}
}
}