1、统一了entrance

2、统一了部分跳转intent,传参返回intent
3、修改出dialogfragment
4、clipboardmanager等处理
This commit is contained in:
CsHeng
2017-05-17 18:18:46 +08:00
parent 6d4de6795e
commit 4c762a1aa8
108 changed files with 1470 additions and 1099 deletions

View File

@ -40,7 +40,6 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On
protected GameEntity gameEntity;
protected DownloadEntity mDownloadEntity;
protected String entrance;
protected String name;
protected String title;
protected String downloadAddWord;
@ -71,11 +70,6 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
entrance = getIntent().getStringExtra("entrance");
if (getIntent().getBundleExtra("data") != null) {
entrance = getIntent().getBundleExtra("data").getString("entrance");
}
// View contentView = View.inflate(this, R.layout.activity_detail, null);
// 添加分享图标
@ -326,7 +320,7 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On
});
}
} else {
DownloadDialog.getInstance(this).showPopupWindow(v, gameEntity, entrance, name + ":" + title);
DownloadDialog.getInstance(this).showPopupWindow(v, gameEntity, mEntrance, name + ":" + title);
}
} else {
toast("稍等片刻~!游戏正在上传中...");
@ -337,7 +331,7 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On
Intent intent = new Intent(this, DownloadManagerActivity.class);
intent.putExtra("currentItem", 1);
intent.putExtra("url", gameEntity.getApk().get(0).getUrl());
intent.putExtra("entrance", entrance + "+(" + name + "[" + title + "])");
intent.putExtra(EntranceUtils.KEY_ENTRANCE, mEntrance + "+(" + name + "[" + title + "])");
startActivity(intent);
} else if ("安装".equals(str)) {
PackageUtils.launchSetup(this, mDownloadEntity.getPath());
@ -363,9 +357,9 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On
ApkEntity apkEntity = gameEntity.getApk().get(0);
String msg = FileUtils.isCanDownload(this, apkEntity.getSize());
if (TextUtils.isEmpty(msg)) {
DataUtils.onGameDownloadEvent(this, gameEntity.getName(), apkEntity.getPlatform(), entrance, "下载开始");
DataUtils.onGameDownloadEvent(this, gameEntity.getName(), apkEntity.getPlatform(), mEntrance, "下载开始");
DownloadManager.createDownload(this, apkEntity, gameEntity, method, entrance, name + ":" + title);
DownloadManager.createDownload(this, apkEntity, gameEntity, method, mEntrance, name + ":" + title);
detail_tv_download.setVisibility(View.GONE);
detail_pb_progressbar.setVisibility(View.VISIBLE);