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

整理页面toolbar，修复开服表跨年显示异常问题

Browse Source
This commit is contained in:
kehaoyuan
2017-12-26 17:30:59 +08:00
parent 4c34333956
commit 719dbeef76
53 changed files with 374 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java
View File

@ -4,7 +4,6 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import com.gh.base.BaseActivity;
import com.gh.common.util.EntranceUtils;
import com.gh.gamecenter.download.DownloadFragment;
@ -13,7 +12,7 @@ import com.gh.gamecenter.download.DownloadFragment;
*
* @author 黄壮华
*/
public class DownloadManagerActivity extends BaseActivity {
public class DownloadManagerActivity extends NormalActivity {
public static final int INDEX_DOWNLOAD = 0;
public static final int INDEX_UPDATE = 1;
@ -22,51 +21,53 @@ public class DownloadManagerActivity extends BaseActivity {
public static final String TAG = "DownloadManagerActivity";
// TODO: 20/09/17 增加currentItem 入口 插件更新可能需要
public static Intent getDownloadMangerIntent(Context context, String url, String entrance) {
Intent intent = new Intent(context, DownloadManagerActivity.class);
intent.putExtra(EntranceUtils.KEY_URL, url);
intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
return intent;
// Intent intent = new Intent(context, DownloadManagerActivity.class);
// intent.putExtra(EntranceUtils.KEY_URL, url);
// intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
Bundle bundle = new Bundle();
bundle.putString(EntranceUtils.KEY_URL, url);
bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
return getIntent(context, DownloadFragment.class, bundle);
}
public static void startDownloadManagerActivity(Context context, String url, String entrance) {
Intent intent = new Intent(context, DownloadManagerActivity.class);
intent.putExtra(EntranceUtils.KEY_URL, url);
intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
}
// public static void startDownloadManagerActivity(Context context, String url, String entrance) {
// Intent intent = new Intent(context, DownloadManagerActivity.class);
// intent.putExtra(EntranceUtils.KEY_URL, url);
// intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
// context.startActivity(intent);
// }
//
// @Override
// protected int getLayoutId() {
// return R.layout.activity_downloadmanager;
// }
@Override
protected int getLayoutId() {
return R.layout.activity_downloadmanager;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setNavigationTitle(getString(R.string.title_downloadmanager));
startDownloadFragment();
}
private void startDownloadFragment() {
int currentItem = getIntent().getIntExtra(EntranceUtils.KEY_CURRENTITEM, 0);
Bundle data = getIntent().getBundleExtra(EntranceUtils.KEY_DATA);
if (data != null) {
currentItem = data.getInt(EntranceUtils.KEY_CURRENTITEM, 0);
}
getSupportFragmentManager().beginTransaction().replace(
R.id.layout_fragment_content, DownloadFragment.newInstance(currentItem)).commitAllowingStateLoss();
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
startDownloadFragment();
setIntent(intent);
}
// @Override
// protected void onCreate(Bundle savedInstanceState) {
// super.onCreate(savedInstanceState);
//
// setNavigationTitle(getString(R.string.title_downloadmanager));
//
// startDownloadFragment();
// }
//
// private void startDownloadFragment() {
// int currentItem = getIntent().getIntExtra(EntranceUtils.KEY_CURRENTITEM, 0);
// Bundle data = getIntent().getBundleExtra(EntranceUtils.KEY_DATA);
// if (data != null) {
// currentItem = data.getInt(EntranceUtils.KEY_CURRENTITEM, 0);
// }
//
// getSupportFragmentManager().beginTransaction().replace(
// R.id.layout_fragment_content, DownloadFragment.newInstance(currentItem)).commitAllowingStateLoss();
// }
//
// @Override
// protected void onNewIntent(Intent intent) {
// super.onNewIntent(intent);
// startDownloadFragment();
// setIntent(intent);
// }
}