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

107
app/src/main/java/com/gh/gamecenter/WebActivity.java
View File

@ -2,6 +2,7 @@ package com.gh.gamecenter;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import com.gh.common.util.EntranceUtils;
@ -9,73 +10,99 @@ import com.gh.gamecenter.entity.ConcernEntity;
import com.gh.gamecenter.entity.NewsEntity;
import com.gh.gamecenter.entity.ToolBoxEntity;
import com.halo.assistant.fragment.WebFragment;
import com.halo.assistant.ui.IntentFactory;
/**
* Created by khy on 2016/10/18.
*/
@Deprecated
public class WebActivity extends CommonActivity {
public class WebActivity extends NormalActivity {
@NonNull
public static Intent getWebIntent(Context context) {
Intent intent = new Intent(context, WebActivity.class);
intent.putExtra(EntranceUtils.KEY_GAMENAME, context.getString(R.string.disclaimer_title));
intent.putExtra(EntranceUtils.KEY_URL, context.getString(R.string.disclaimer_url));
return new IntentFactory.Builder(context)
.setArgs(intent.getExtras())
.setActivity(WebActivity.class)
.setFragment(WebFragment.class).build();
// return new IntentFactory.Builder(context)
// .setArgs(intent.getExtras())
// .setActivity(WebActivity.class)
// .setFragment(WebFragment.class).build();
Bundle bundle = new Bundle();
bundle.putString(EntranceUtils.KEY_GAMENAME, context.getString(R.string.disclaimer_title));
bundle.putString(EntranceUtils.KEY_URL, context.getString(R.string.disclaimer_url));
return getIntent(context, WebFragment.class, bundle);
}
@NonNull
public static Intent getWebByCollectionTools(Context context, ToolBoxEntity toolBoxEntity, boolean isCollectionTools) {
Intent intent = new Intent(context, WebActivity.class);
intent.putExtra(EntranceUtils.KEY_URL, toolBoxEntity.getUrl());
intent.putExtra(WebFragment.KEY_ISTOOLS, true);
// intent.putExtra("gameName", toolBoxEntity.getName());
intent.putExtra(ToolBoxEntity.TAG, toolBoxEntity);
intent.putExtra(WebFragment.KEY_ISCOLLECTIONTOOLS, isCollectionTools);
return new IntentFactory.Builder(context)
.setArgs(intent.getExtras())
.setActivity(WebActivity.class)
.setFragment(WebFragment.class).build();
// Intent intent = new Intent(context, WebActivity.class);
// intent.putExtra(EntranceUtils.KEY_URL, toolBoxEntity.getUrl());
// intent.putExtra(WebFragment.KEY_ISTOOLS, true);
//// intent.putExtra("gameName", toolBoxEntity.getName());
// intent.putExtra(ToolBoxEntity.TAG, toolBoxEntity);
// intent.putExtra(WebFragment.KEY_ISCOLLECTIONTOOLS, isCollectionTools);
// return new IntentFactory.Builder(context)
// .setArgs(intent.getExtras())
// .setActivity(WebActivity.class)
// .setFragment(WebFragment.class).build();
Bundle bundle = new Bundle();
bundle.putString(EntranceUtils.KEY_URL, toolBoxEntity.getUrl());
bundle.putBoolean(WebFragment.KEY_ISTOOLS, true);
bundle.putString(EntranceUtils.KEY_GAMENAME, toolBoxEntity.getName());
bundle.putParcelable(ToolBoxEntity.TAG, toolBoxEntity);
bundle.putBoolean(WebFragment.KEY_ISCOLLECTIONTOOLS, isCollectionTools);
return getIntent(context, WebFragment.class, bundle);
}
@NonNull
public static Intent getIntentByNews(Context context, ConcernEntity concernEntity, String entrance) {
Intent intent = new Intent(context, WebActivity.class);
intent.putExtra(EntranceUtils.KEY_URL, concernEntity.getLink());
intent.putExtra(EntranceUtils.KEY_GAMENAME, concernEntity.getGameName());
intent.putExtra(EntranceUtils.KEY_NEWSID, concernEntity.getId());
intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
return new IntentFactory.Builder(context)
.setArgs(intent.getExtras())
.setActivity(WebActivity.class)
.setFragment(WebFragment.class).build();
// Intent intent = new Intent(context, WebActivity.class);
// intent.putExtra(EntranceUtils.KEY_URL, concernEntity.getLink());
// intent.putExtra(EntranceUtils.KEY_GAMENAME, concernEntity.getGameName());
// intent.putExtra(EntranceUtils.KEY_NEWSID, concernEntity.getId());
// intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
// return new IntentFactory.Builder(context)
// .setArgs(intent.getExtras())
// .setActivity(WebActivity.class)
// .setFragment(WebFragment.class).build();
Bundle bundle = new Bundle();
bundle.putString(EntranceUtils.KEY_URL, concernEntity.getLink());
bundle.putString(EntranceUtils.KEY_GAMENAME, concernEntity.getGameName());
bundle.putString(EntranceUtils.KEY_NEWSID, concernEntity.getId());
bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
return getIntent(context, WebFragment.class, bundle);
}
@NonNull
public static Intent getIntentByNews(Context context, NewsEntity newsEntity, String entrance) {
Intent intent = new Intent(context, WebActivity.class);
intent.putExtra(EntranceUtils.KEY_URL, newsEntity.getLink());
intent.putExtra(EntranceUtils.KEY_GAMENAME, newsEntity.getGameName());
intent.putExtra(EntranceUtils.KEY_NEWSID, newsEntity.getId());
intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
return new IntentFactory.Builder(context)
.setArgs(intent.getExtras())
.setActivity(WebActivity.class)
.setFragment(WebFragment.class).build();
// Intent intent = new Intent(context, WebActivity.class);
// intent.putExtra(EntranceUtils.KEY_URL, newsEntity.getLink());
// intent.putExtra(EntranceUtils.KEY_GAMENAME, newsEntity.getGameName());
// intent.putExtra(EntranceUtils.KEY_NEWSID, newsEntity.getId());
// intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance);
// return new IntentFactory.Builder(context)
// .setArgs(intent.getExtras())
// .setActivity(WebActivity.class)
// .setFragment(WebFragment.class).build();
Bundle bundle = new Bundle();
bundle.putString(EntranceUtils.KEY_URL, newsEntity.getLink());
bundle.putString(EntranceUtils.KEY_GAMENAME, newsEntity.getGameName());
bundle.putString(EntranceUtils.KEY_NEWSID, newsEntity.getId());
bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
return getIntent(context, WebFragment.class, bundle);
}
@NonNull
public static Intent getIntentByUrl(Context context, String url) {
Intent intent = new Intent(context, WebActivity.class);
intent.putExtra(EntranceUtils.KEY_URL, url);
return new IntentFactory.Builder(context)
.setArgs(intent.getExtras())
.setActivity(WebActivity.class)
.setFragment(WebFragment.class).build();
// Intent intent = new Intent(context, WebActivity.class);
// intent.putExtra(EntranceUtils.KEY_URL, url);
// return new IntentFactory.Builder(context)
// .setArgs(intent.getExtras())
// .setActivity(WebActivity.class)
// .setFragment(WebFragment.class).build();
Bundle bundle = new Bundle();
bundle.putString(EntranceUtils.KEY_URL, url);
return getIntent(context, WebFragment.class, bundle);
}
}