Commit fbf605bf authored by fallenstardust's avatar fallenstardust

tweak

parent 94d22641
...@@ -2,6 +2,7 @@ package cn.garymb.ygomobile.ui.activities; ...@@ -2,6 +2,7 @@ package cn.garymb.ygomobile.ui.activities;
import static cn.garymb.ygomobile.Constants.URL_YGO233_ADVANCE; import static cn.garymb.ygomobile.Constants.URL_YGO233_ADVANCE;
import static cn.garymb.ygomobile.Constants.URL_YGO233_FILE; import static cn.garymb.ygomobile.Constants.URL_YGO233_FILE;
import static cn.garymb.ygomobile.utils.DownloadUtil.TYPE_DOWNLOAD_EXCEPTION;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
...@@ -38,12 +39,6 @@ public class WebActivity extends BaseActivity { ...@@ -38,12 +39,6 @@ public class WebActivity extends BaseActivity {
private String mUrl; private String mUrl;
private String mTitle; private String mTitle;
private Button btn_download; private Button btn_download;
private static final int TYPE_DOWNLOAD_EXCEPTION = 1;
private static final int TYPE_DOWNLOAD_ING = 2;
private static final int ZIP_READY = 600;
private static final int ZIP_UPDATE_PATH_PROGRESS = 601;
private static final int ZIP_UNZIP_OK = 602;
private static final int ZIP_UNZIP_EXCEPTION = 603;
@SuppressLint("HandlerLeak") @SuppressLint("HandlerLeak")
Handler handler = new Handler() { Handler handler = new Handler() {
...@@ -51,16 +46,16 @@ public class WebActivity extends BaseActivity { ...@@ -51,16 +46,16 @@ public class WebActivity extends BaseActivity {
public void handleMessage(@NonNull Message msg) { public void handleMessage(@NonNull Message msg) {
super.handleMessage(msg); super.handleMessage(msg);
switch (msg.what) { switch (msg.what) {
case TYPE_DOWNLOAD_ING: case DownloadUtil.TYPE_DOWNLOAD_ING:
btn_download.setText(msg.arg1 + "%"); btn_download.setText(msg.arg1 + "%");
break; break;
case TYPE_DOWNLOAD_EXCEPTION: case DownloadUtil.TYPE_DOWNLOAD_EXCEPTION:
YGOUtil.show("error" + msg.obj); YGOUtil.show("error" + msg.obj);
break; break;
case ZIP_READY: case UnzipUtils.ZIP_READY:
btn_download.setText(R.string.title_use_ex); btn_download.setText(R.string.title_use_ex);
break; break;
case ZIP_UNZIP_OK: case UnzipUtils.ZIP_UNZIP_OK:
if (!AppsSettings.get().isReadExpansions()) { if (!AppsSettings.get().isReadExpansions()) {
Intent startSetting = new Intent(getContext(), SettingsActivity.class); Intent startSetting = new Intent(getContext(), SettingsActivity.class);
startActivity(startSetting); startActivity(startSetting);
...@@ -71,7 +66,7 @@ public class WebActivity extends BaseActivity { ...@@ -71,7 +66,7 @@ public class WebActivity extends BaseActivity {
} }
btn_download.setVisibility(View.GONE); btn_download.setVisibility(View.GONE);
break; break;
case ZIP_UNZIP_EXCEPTION: case UnzipUtils.ZIP_UNZIP_EXCEPTION:
Toast.makeText(getContext(), getString(R.string.install_failed_bcos) + msg.obj, Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), getString(R.string.install_failed_bcos) + msg.obj, Toast.LENGTH_SHORT).show();
break; break;
...@@ -211,13 +206,13 @@ public class WebActivity extends BaseActivity { ...@@ -211,13 +206,13 @@ public class WebActivity extends BaseActivity {
@Override @Override
public void onDownloadSuccess(File file) { public void onDownloadSuccess(File file) {
Message message = new Message(); Message message = new Message();
message.what = ZIP_READY; message.what = UnzipUtils.ZIP_READY;
try { try {
UnzipUtils.upZipFile(file, AppsSettings.get().getResourcePath()); UnzipUtils.upZipFile(file, AppsSettings.get().getResourcePath());
} catch (Exception e) { } catch (Exception e) {
message.what = ZIP_UNZIP_EXCEPTION; message.what = UnzipUtils.ZIP_UNZIP_EXCEPTION;
} finally { } finally {
message.what = ZIP_UNZIP_OK; message.what = UnzipUtils.ZIP_UNZIP_OK;
} }
handler.sendMessage(message); handler.sendMessage(message);
} }
...@@ -226,7 +221,7 @@ public class WebActivity extends BaseActivity { ...@@ -226,7 +221,7 @@ public class WebActivity extends BaseActivity {
@Override @Override
public void onDownloading(int progress) { public void onDownloading(int progress) {
Message message = new Message(); Message message = new Message();
message.what = TYPE_DOWNLOAD_ING; message.what = DownloadUtil.TYPE_DOWNLOAD_ING;
message.arg1 = progress; message.arg1 = progress;
handler.sendMessage(message); handler.sendMessage(message);
} }
......
...@@ -20,6 +20,8 @@ public class DownloadUtil { ...@@ -20,6 +20,8 @@ public class DownloadUtil {
private static DownloadUtil downloadUtil; private static DownloadUtil downloadUtil;
private final OkHttpClient okHttpClient; private final OkHttpClient okHttpClient;
public static final int TYPE_DOWNLOAD_EXCEPTION = 1;
public static final int TYPE_DOWNLOAD_ING = 2;
//暂时关闭 //暂时关闭
private static final boolean ENABLE_CACHE = false; private static final boolean ENABLE_CACHE = false;
private static final Map<String, Call> cache = new HashMap<>(); private static final Map<String, Call> cache = new HashMap<>();
......
...@@ -12,7 +12,9 @@ import java.util.zip.ZipFile; ...@@ -12,7 +12,9 @@ import java.util.zip.ZipFile;
public class UnzipUtils { public class UnzipUtils {
private static final int BUFFER_SIZE = 1024 * 1024;//1M Byte private static final int BUFFER_SIZE = 1024 * 1024;//1M Byte
public static final int ZIP_READY = 600;
public static final int ZIP_UNZIP_OK = 601;
public static final int ZIP_UNZIP_EXCEPTION = 602;
/** /**
* 解压缩一个文件 * 解压缩一个文件
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment