整理Entrance type

This commit is contained in:
kehaoyuan
2017-10-16 16:49:22 +08:00
parent 52433ba347
commit d9bb60e66b
50 changed files with 255 additions and 208 deletions

View File

@ -80,15 +80,15 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{
@NonNull
public static Intent getWebIntent(Context context) {
Intent intent = new Intent(context, WebActivity.class);
intent.putExtra("gameName", "使用条款与免责声明");
intent.putExtra("url", "http://api.ghzs666.com/disclaimer");
intent.putExtra(EntranceUtils.KEY_GAMENAME, "使用条款与免责声明");
intent.putExtra(EntranceUtils.KEY_URL, "http://api.ghzs666.com/disclaimer");
return intent;
}
@NonNull
public static void startWebByCollectionTools(Context context, ToolBoxEntity toolBoxEntity, boolean isCollectionTools) {
Intent intent = new Intent(context, WebActivity.class);
intent.putExtra("url", toolBoxEntity.getUrl());
intent.putExtra(EntranceUtils.KEY_URL, toolBoxEntity.getUrl());
intent.putExtra("isTools", true);
// intent.putExtra("gameName", toolBoxEntity.getName());
intent.putExtra("ToolBoxEntity", toolBoxEntity);
@ -99,9 +99,9 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{
@NonNull
public static Intent getIntentByNews(Context context, ConcernEntity concernEntity, String entrance) {
Intent intent = new Intent(context, WebActivity.class);
intent.putExtra("url", concernEntity.getLink());
intent.putExtra("gameName", concernEntity.getGameName());
intent.putExtra("newsId", concernEntity.getId());
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 intent;
}
@ -109,9 +109,9 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{
@NonNull
public static Intent getIntentByNews(Context context, NewsEntity newsEntity, String entrance) {
Intent intent = new Intent(context, WebActivity.class);
intent.putExtra("url", newsEntity.getLink());
intent.putExtra("gameName", newsEntity.getGameName());
intent.putExtra("newsId", newsEntity.getId());
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 intent;
}
@ -119,7 +119,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{
@NonNull
public static Intent getIntentByUrl(Context context, String url) {
Intent intent = new Intent(context, WebActivity.class);
intent.putExtra("url", url);
intent.putExtra(EntranceUtils.KEY_URL, url);
return intent;
}
@ -147,14 +147,14 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{
String webTitle;
mIsTools = getIntent().getBooleanExtra("isTools", false);
if (getIntent().getBundleExtra("data") != null) {
Bundle data = getIntent().getBundleExtra("data");
webUrl = data.getString("url");
if (getIntent().getBundleExtra(EntranceUtils.KEY_DATA) != null) {
Bundle data = getIntent().getBundleExtra(EntranceUtils.KEY_DATA);
webUrl = data.getString(EntranceUtils.KEY_URL);
webTitle = "";
} else {
webUrl = getIntent().getStringExtra("url");
webTitle = getIntent().getStringExtra("gameName");
newsId = getIntent().getStringExtra("newsId");
webUrl = getIntent().getStringExtra(EntranceUtils.KEY_URL);
webTitle = getIntent().getStringExtra(EntranceUtils.KEY_GAMENAME);
newsId = getIntent().getStringExtra(EntranceUtils.KEY_NEWSID);
}
// 增加actionBar Button