Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DownloadEntry修改为DownloadEntity

Browse Source
This commit is contained in:
黄壮华
2016-09-13 07:23:02 +08:00
parent d95d5d5e6b
commit fc68b9add5
36 changed files with 1121 additions and 1009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/com/gh/gamecenter/SettingActivity.java
View File

@ -32,7 +32,7 @@ import com.gh.common.util.PackageUtils;
import com.gh.common.util.SpeedUtils;
import com.gh.common.util.Utils;
import com.gh.download.DataWatcher;
import com.gh.download.DownloadEntry;
import com.gh.download.DownloadEntity;
import com.gh.download.DownloadManager;
import com.gh.download.DownloadStatus;
import com.gh.gamecenter.entity.AppEntity;
@ -46,7 +46,6 @@ import com.kyleduo.switchbutton.SwitchButton;
import org.json.JSONObject;
import java.io.File;
import java.util.HashMap;
import de.greenrobot.event.EventBus;
@ -81,17 +80,17 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
private DataWatcher dataWatcher = new DataWatcher() {
@Override
public void onDataChanged(DownloadEntry downloadEntry) {
if (downloadEntry.getName().contains("光环助手") && isShowDownload) {
public void onDataChanged(DownloadEntity downloadEntity) {
if (downloadEntity.getName().contains("光环助手") && isShowDownload) {
app_tv_speed.setText(String.format("%s(剩%s)",
SpeedUtils.getSpeed(downloadEntry.getSpeed()),
SpeedUtils.getRemainTime(downloadEntry.getSize(), downloadEntry.getProgress(),
downloadEntry.getSpeed() * 1024)));
app_pb_progress.setProgress((int) (downloadEntry.getPercent() * 10));
app_tv_percent.setText(downloadEntry.getPercent() + "%");
if (DownloadStatus.done.equals(downloadEntry.getStatus())) {
SpeedUtils.getSpeed(downloadEntity.getSpeed()),
SpeedUtils.getRemainTime(downloadEntity.getSize(), downloadEntity.getProgress(),
downloadEntity.getSpeed() * 1024)));
app_pb_progress.setProgress((int) (downloadEntity.getPercent() * 10));
app_tv_percent.setText(downloadEntity.getPercent() + "%");
if (DownloadStatus.done.equals(downloadEntity.getStatus())) {
DownloadManager.getInstance(getApplicationContext())
.cancel(downloadEntry.getUrl(), false);
.cancel(downloadEntity.getUrl(), false);
if (appEntity != null && appEntity.isIs_force()) {
AppController.getInstance().finishActivity();
} else {
@ -530,20 +529,18 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
file.delete();
}
DownloadEntry downloadEntry = new DownloadEntry();
downloadEntry.setUrl(appEntity.getUrl());
downloadEntry.setName("光环助手V" + appEntity.getVersion());
downloadEntry.setPath(path);
HashMap<String, String> meta = new HashMap<String, String>();
meta.put("platform", "官方版");
downloadEntry.setMeta(meta);
DownloadEntity downloadEntity = new DownloadEntity();
downloadEntity.setUrl(appEntity.getUrl());
downloadEntity.setName("光环助手V" + appEntity.getVersion());
downloadEntity.setPath(path);
downloadEntity.setPlatform("官方版");
DownloadManager.getInstance(getApplicationContext()).cancel(
downloadEntry.getUrl(), false);
downloadEntity.getUrl(), false);
DownloadManager.getInstance(getApplicationContext()).pauseAll();
DownloadManager.getInstance(getApplicationContext()).add(downloadEntry);
DownloadManager.getInstance(getApplicationContext()).add(downloadEntity);
}
@Override