diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index 24e7ab5d53..9b7a596064 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -1,9 +1,11 @@ package com.gh.gamecenter; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.support.annotation.NonNull; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; @@ -30,6 +32,12 @@ public class AboutActivity extends BaseActivity { private Handler handler = new MyHandler(this); + @NonNull + public static Intent getIntent(Context context) { + Intent intent = new Intent(context, AboutActivity.class); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_about; @@ -64,7 +72,7 @@ public class AboutActivity extends BaseActivity { } } - static class MyHandler extends Handler { + private static class MyHandler extends Handler { private WeakReference mWeakReference; diff --git a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java index b40fc36006..48f1e7dbff 100644 --- a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java @@ -10,6 +10,7 @@ import android.net.wifi.ScanResult; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; import android.text.Html; import android.view.Gravity; @@ -132,6 +133,13 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick private Handler handler = new MyHandler(this); + @NonNull + public static Intent getIntent(Context context, boolean showConnHintDialog) { + Intent intent = new Intent(context, ChooseReceiverActivity.class); + intent.putExtra("showConnHintDialog", showConnHintDialog); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_choosereceiver; @@ -322,7 +330,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick // TODO 关闭扫描?? - startActivity(new Intent(this, ShareGhActivity.class)); + startActivity(ShareGhActivity.getIntent(this)); } //1.连接网络 private void connReceiverWifi(int connPosition) { @@ -586,7 +594,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick @Override public void onAnimationEnd(Animation animation) { mRoketAnimRl.setVisibility(View.GONE); - startActivity(new Intent(ChooseReceiverActivity.this, FileSenderActivity.class)); + startActivity(FileSenderActivity.getIntent(ChooseReceiverActivity.this)); closeSocket(); Intent resultIntent = new Intent(); resultIntent.putExtra("isFinish", true); diff --git a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java index dabbf5270c..9647ca41e0 100644 --- a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java @@ -1,7 +1,9 @@ package com.gh.gamecenter; +import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.util.ArrayMap; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -60,6 +62,12 @@ public class CleanApkActivity extends BaseActivity implements CleanApkAdapter.On private CleanApkAdapter mAdapter; + @NonNull + public static Intent getIntent(Context context) { + Intent intent = new Intent(context, CleanApkActivity.class); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_clean_apk; diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index a2c0e35f7c..94be3c1b93 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -1,6 +1,9 @@ package com.gh.gamecenter; +import android.content.Context; +import android.content.Intent; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.View; @@ -10,6 +13,7 @@ import android.widget.RelativeLayout; import com.gh.base.BaseActivity; import com.gh.common.util.ConcernUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.Utils; import com.gh.common.view.Concern_LinearLayout; import com.gh.gamecenter.adapter.ConcernAdapter; @@ -43,6 +47,13 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { private ConcernManager concernManager; private boolean isPause = false; + @NonNull + public static Intent getIntent(Context context, String entrance) { + Intent intent = new Intent(context, ConcernActivity.class); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_concern; diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index 10c2c4e984..2a87228a14 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -8,6 +8,7 @@ import android.graphics.Bitmap; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.util.TypedValue; @@ -22,6 +23,7 @@ import com.gh.common.constant.Config; import com.gh.common.util.BitmapUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.FileUtils; import com.gh.common.util.TokenUtils; import com.gh.common.view.CropImageCustom; @@ -64,6 +66,14 @@ public class CropImageActivity extends BaseActivity { } }; + @NonNull + public static Intent getIntent(Context context, String picturePath, String entrance) { + Intent intent = new Intent(context, CropImageActivity.class); + intent.putExtra("path", picturePath); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_cropimage; diff --git a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java index 48c2d1bccf..603e2fecca 100644 --- a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java @@ -1,11 +1,13 @@ package com.gh.gamecenter; import android.Manifest; +import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.support.annotation.NonNull; import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; import android.support.v7.widget.LinearLayoutManager; @@ -103,6 +105,12 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte } }; + @NonNull + public static Intent getIntent(Context context) { + Intent intent = new Intent(context, FileSenderActivity.class); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_file_sender; @@ -469,9 +477,7 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte backHint(); break; case R.id.sender_keep_send: - Intent intent = new Intent(this, KcSelectGameActivity.class); - intent.putExtra("isConn", true); - startActivityForResult(intent, 0x178); + startActivityForResult(KcSelectGameActivity.getIntent(this, true), 0x178); break; default: break; diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index a8f2545060..09f533bd3e 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -1,6 +1,9 @@ package com.gh.gamecenter; +import android.content.Context; +import android.content.Intent; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.util.ArrayMap; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.LinearLayoutManager; @@ -16,6 +19,7 @@ import android.widget.TextView; import com.gh.base.BaseActivity; import com.gh.common.util.DisplayUtils; +import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.adapter.GameNewsAdapter; import com.gh.gamecenter.adapter.GameNewsTypeListAdapter; import com.gh.gamecenter.eventbus.EBTypeChange; @@ -61,6 +65,15 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen private float startY = 0; + @NonNull + public static Intent getIntent(Context context, String gameName, String gameId, String entrance) { + Intent intent = new Intent(context, GameNewsActivity.class); + intent.putExtra("gameName", gameName); + intent.putExtra("gameId", gameId); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_game_news; diff --git a/app/src/main/java/com/gh/gamecenter/InstallActivity.java b/app/src/main/java/com/gh/gamecenter/InstallActivity.java index b2e18fdf74..6b9f76c5c0 100644 --- a/app/src/main/java/com/gh/gamecenter/InstallActivity.java +++ b/app/src/main/java/com/gh/gamecenter/InstallActivity.java @@ -1,8 +1,10 @@ package com.gh.gamecenter; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; +import android.support.annotation.NonNull; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.View; @@ -48,6 +50,8 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap private InstallFragmentAdapter mAdapter; + private boolean isEverpause = false; + private DataWatcher dataWatcher = new DataWatcher() { @Override public void onDataChanged(DownloadEntity downloadEntity) { @@ -65,6 +69,12 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap } }; + @NonNull + public static Intent getIntent(Context context) { + Intent intent = new Intent(context, InstallActivity.class); + return intent; + } + @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { @@ -103,12 +113,13 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap @Override public void onResume() { -// if (isEverpause) { -// for (GameEntity entity : mAdapter.getGameList()) { -// entity.setEntryMap(DownloadManager.getInstance(this).getEntryMap(entity.getName())); -// } -// mAdapter.notifyDataSetChanged(); -// } + if (isEverpause) { + for (GameEntity entity : mAdapter.getGameList()) { + entity.setEntryMap(DownloadManager.getInstance(this).getEntryMap(entity.getName())); + } + mAdapter.notifyDataSetChanged(); + } + isEverpause = false; super.onResume(); DownloadManager.getInstance(this).addObserver(dataWatcher); } @@ -116,6 +127,7 @@ public class InstallActivity extends BaseActivity implements InstallFragmentAdap @Override public void onPause() { super.onPause(); + isEverpause = true; DownloadManager.getInstance(this).removeObserver(dataWatcher); } diff --git a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java index 0dca49b2fc..d53af1dd3f 100644 --- a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java @@ -1,7 +1,10 @@ package com.gh.gamecenter; import android.animation.Animator; +import android.content.Context; +import android.content.Intent; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; @@ -17,6 +20,7 @@ import android.widget.TextView; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.BaseActivity; import com.gh.common.util.DownloadItemUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.view.VerticalItemDecoration; import com.gh.download.DataWatcher; import com.gh.download.DownloadEntity; @@ -101,6 +105,13 @@ public class KaiFuActivity extends BaseActivity implements KaiFuDialogAdapter.On } }; + @NonNull + public static Intent getIntent(Context context, String entrance) { + Intent intent = new Intent(context, KaiFuActivity.class); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_kaifu; diff --git a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java index 6910e59311..feb762321e 100644 --- a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java @@ -1,7 +1,9 @@ package com.gh.gamecenter; +import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.View; @@ -51,6 +53,13 @@ public class KcSelectGameActivity extends BaseActivity { private LinearLayoutManager layoutManager; private RelativeLayout.LayoutParams rparams; + @NonNull + public static Intent getIntent(Context context, boolean isConn) { + Intent intent = new Intent(context, KcSelectGameActivity.class); + intent.putExtra("isConn", isConn); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_kc_select_game; @@ -109,8 +118,7 @@ public class KcSelectGameActivity extends BaseActivity { finish(); } else { AppController.put("FileInfo", selectData); - Intent intent = new Intent(KcSelectGameActivity.this, ChooseReceiverActivity.class); - startActivityForResult(intent, 0x123); + startActivityForResult(ChooseReceiverActivity.getIntent(KcSelectGameActivity.this, false), 0x123); } } diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index d62e3dc6c7..e11ed99e6c 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -1,6 +1,9 @@ package com.gh.gamecenter; +import android.content.Context; +import android.content.Intent; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; import android.support.v4.view.ViewPager; @@ -10,14 +13,15 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.gh.base.BaseActivity; -import com.gh.common.util.DisplayUtils; -import com.lightgame.view.NoScrollableViewPager; import com.gh.base.adapter.FragmentAdapter; +import com.gh.common.util.DisplayUtils; +import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.libao.Libao1Fragment; import com.gh.gamecenter.libao.Libao2Fragment; import com.gh.gamecenter.libao.Libao3Fragment; +import com.lightgame.view.NoScrollableViewPager; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -56,6 +60,13 @@ public class LibaoActivity extends BaseActivity implements View.OnClickListener, private int width; private LinearLayout.LayoutParams lparams; + @NonNull + public static Intent getIntent(Context context, String entrance) { + Intent intent = new Intent(context, LibaoActivity.class); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_libao; diff --git a/app/src/main/java/com/gh/gamecenter/LoginActivity.java b/app/src/main/java/com/gh/gamecenter/LoginActivity.java index a19afb512f..a9688723c3 100644 --- a/app/src/main/java/com/gh/gamecenter/LoginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LoginActivity.java @@ -1,9 +1,12 @@ package com.gh.gamecenter; +import android.content.Context; +import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; import android.text.Editable; import android.text.TextWatcher; @@ -59,6 +62,12 @@ public class LoginActivity extends BaseActivity { } }; + @NonNull + public static Intent getIntent(Context context) { + Intent intent = new Intent(context, LoginActivity.class); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_login; diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index da10a1a96b..947305cfba 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; +import android.support.annotation.NonNull; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.Html; @@ -20,6 +21,7 @@ import android.widget.Toast; import com.gh.base.BaseActivity; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.NewsUtils; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; @@ -73,6 +75,16 @@ public class NewsSearchActivity extends BaseActivity { private int page = 1; + @NonNull + public static Intent getIntent(Context context, String gameName, String searchKey, String gameId, String entrance) { + Intent intent = new Intent(context, NewsSearchActivity.class); + intent.putExtra("gameName", gameName); + intent.putExtra("searchKey", searchKey); + intent.putExtra("gameId", gameId); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + return intent; + } + @Override protected int getLayoutId() { diff --git a/app/src/main/java/com/gh/gamecenter/PluginActivity.java b/app/src/main/java/com/gh/gamecenter/PluginActivity.java index ec582e4b7e..262020d7d5 100644 --- a/app/src/main/java/com/gh/gamecenter/PluginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/PluginActivity.java @@ -1,6 +1,9 @@ package com.gh.gamecenter; +import android.content.Context; +import android.content.Intent; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.View; @@ -9,6 +12,7 @@ import android.widget.LinearLayout; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.BaseActivity; import com.gh.common.util.DownloadItemUtils; +import com.gh.common.util.EntranceUtils; import com.gh.download.DataWatcher; import com.gh.download.DownloadEntity; import com.gh.download.DownloadManager; @@ -63,6 +67,13 @@ public class PluginActivity extends BaseActivity { } }; + @NonNull + public static Intent getIntent(Context context, String entrance) { + Intent intent = new Intent(context, PluginActivity.class); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_plugin; diff --git a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java b/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java index 0f809433b0..db98c9c5a5 100644 --- a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java @@ -9,6 +9,7 @@ import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; import android.text.Html; import android.text.TextUtils; @@ -97,6 +98,11 @@ public class ReceiverWaitingActivity extends BaseActivity { private Runnable mUdpServerRunnable; private Handler mHandler = new MyHandler(this); + @NonNull + public static Intent getIntent(Context context) { + Intent intent = new Intent(context, ReceiverWaitingActivity.class); + return intent; + } @Override protected int getLayoutId() { diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.java b/app/src/main/java/com/gh/gamecenter/SearchActivity.java index 7cb98f5930..10b47accde 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.java @@ -2,9 +2,11 @@ package com.gh.gamecenter; import android.app.ActionBar.LayoutParams; import android.content.Context; +import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.support.annotation.NonNull; import android.support.v4.app.FragmentTransaction; import android.text.Editable; import android.text.TextUtils; @@ -24,6 +26,7 @@ import com.gh.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DisplayUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.Utils; import com.gh.gamecenter.db.SearchHistoryDao; import com.gh.gamecenter.eventbus.EBSearch; @@ -59,6 +62,15 @@ public class SearchActivity extends BaseActivity { } }; + @NonNull + public static Intent getIntent(Context context,boolean clicked, String hint, String entrance) { + Intent intent = new Intent(context, SearchActivity.class); + intent.putExtra("clicked", clicked); + intent.putExtra("hint", hint); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + return intent; + } + @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); diff --git a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java index e1c4cb78be..9a39aa39eb 100644 --- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java @@ -7,13 +7,13 @@ import android.database.Cursor; import android.net.Uri; import android.os.Bundle; import android.provider.MediaStore; +import android.support.annotation.NonNull; import android.text.TextUtils; import android.view.View; import android.widget.TextView; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; -import com.gh.common.util.EntranceUtils; import com.gh.common.util.RandomUtils; import com.gh.common.util.UserIconUtils; import com.gh.common.util.Utils; @@ -37,6 +37,12 @@ public class SelectUserIconActivity extends BaseActivity { private SharedPreferences sp; + @NonNull + public static Intent getIntent(Context context) { + Intent intent = new Intent(context, SelectUserIconActivity.class); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_select_user_icon; @@ -64,9 +70,7 @@ public class SelectUserIconActivity extends BaseActivity { Utils.log("picturePath = " + picturePath); // 上传头像 - Intent intent = new Intent(this, CropImageActivity.class); - intent.putExtra("path", picturePath); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(我的光环)"); + Intent intent = CropImageActivity.getIntent(this, picturePath, "我的光环(选择头像)"); startActivityForResult(intent, 0x124); } else if (data != null && requestCode == 0x124) { String url = data.getExtras().getString("url"); diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index 9b24c26396..0fd71534b8 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -2,10 +2,12 @@ package com.gh.gamecenter; import android.app.Activity; import android.app.Dialog; +import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.os.Bundle; +import android.support.annotation.NonNull; import android.view.View; import android.view.View.OnClickListener; import android.view.Window; @@ -17,6 +19,7 @@ import android.widget.Toast; import com.gh.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.util.DialogUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.FileUtils; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBSkip; @@ -65,6 +68,13 @@ public class SettingActivity extends BaseActivity implements OnClickListener { private int checkSizeIndex; + @NonNull + public static Intent getIntent(Context context, String entrance) { + Intent intent = new Intent(context, SettingActivity.class); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + return intent; + } + @Override public void finish() { saveCurrentSetting(); @@ -211,8 +221,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { fontSize(); break; case setting_rl_about: - Intent intentAbout = new Intent(this, AboutActivity.class); - startActivity(intentAbout); + startActivity(AboutActivity.getIntent(this)); break; case R.id.setting_rl_concerngame: setting_sb_concerngame.performClick(); diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java index cd0063db77..298854c835 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java @@ -1,9 +1,11 @@ package com.gh.gamecenter; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; import android.os.Handler; +import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; import android.text.Html; import android.text.TextUtils; @@ -14,9 +16,11 @@ import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.BaseActivity; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.MessageShareUtils; import com.gh.common.util.QRCodeUtils; +import com.gh.gamecenter.entity.ConcernEntity; import com.readystatesoftware.systembartint.SystemBarTintManager; import com.tencent.tauth.Tencent; @@ -51,6 +55,21 @@ public class ShareCardActivity extends BaseActivity { String newsId; private Handler handler = new Handler(); + @NonNull + public static Intent getIntent(Context context, ConcernEntity concernEntity, String shareContent) { + Intent intent = new Intent(context, ShareCardActivity.class); + Bundle bundle = new Bundle(); + bundle.putString("gameName", concernEntity.getGameName()); + bundle.putString("gameIconUrl", concernEntity.getGameIcon()); + bundle.putString("shareContent", shareContent); + if (concernEntity.getLink() == null) { + bundle.putString("newsId", concernEntity.getId()); + } + intent.putExtras(bundle); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(资讯:关注[2-4])"); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_sharecard; diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java index 7f4605d819..5935ca20ee 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java @@ -4,6 +4,7 @@ import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.support.annotation.NonNull; import android.text.Html; import android.widget.Button; import android.widget.ImageView; @@ -38,6 +39,12 @@ public class ShareGhActivity extends BaseActivity { @BindView(R.id.share_rl) RelativeLayout mShareRl; + @NonNull + public static Intent getIntent(Context context) { + Intent intent = new Intent(context, ShareGhActivity.class); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_share_gh; @@ -66,8 +73,7 @@ public class ShareGhActivity extends BaseActivity { @OnClick(R.id.wifi_share_btn) public void skipWifiShare() { - Intent intent = new Intent(this, ShareGhWfifActivity.class); - startActivity(intent); + startActivity(ShareGhWfifActivity.getIntent(this)); } @OnClick(R.id.gh_address_tv) diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java index 395f4bac36..09ca39a3bf 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java @@ -1,10 +1,12 @@ package com.gh.gamecenter; import android.content.Context; +import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.graphics.Color; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; import android.text.Html; import android.text.TextUtils; @@ -79,6 +81,12 @@ public class ShareGhWfifActivity extends BaseActivity { private String mySsid; + @NonNull + public static Intent getIntent(Context context) { + Intent intent = new Intent(context, ShareGhWfifActivity.class); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_share_gh_wifi; diff --git a/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java index 72461b69a7..bb2cd875f7 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java @@ -1,7 +1,9 @@ package com.gh.gamecenter; +import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.support.annotation.NonNull; import android.view.View; import com.gh.base.BaseActivity; @@ -14,6 +16,12 @@ import butterknife.OnClick; */ public class SuggestSelectActivity extends BaseActivity { + @NonNull + public static Intent getIntent(Context context) { + Intent intent = new Intent(context, SuggestionActivity.class); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_suggest_select; diff --git a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java index f80fac7dec..5263b3ef1e 100644 --- a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java @@ -1,6 +1,9 @@ package com.gh.gamecenter; +import android.content.Context; +import android.content.Intent; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -51,6 +54,12 @@ public class ToolBoxActivity extends BaseActivity implements SwipeRefreshLayout. } }; + @NonNull + public static Intent getIntent(Context context) { + Intent intent = new Intent(context, ToolBoxActivity.class); + return intent; + } + @Override protected int getLayoutId() { diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index 96083d778f..6996c51bd4 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -3,7 +3,9 @@ package com.gh.gamecenter; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; +import android.content.Intent; import android.os.Bundle; +import android.support.annotation.NonNull; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -76,6 +78,14 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR private LinearLayoutManager layoutManager; + @NonNull + public static Intent getIntent(Context context, String gameName, String gameId) { + Intent intent = new Intent(context, VoteActivity.class); + intent.putExtra("gameName", gameName); + intent.putExtra("gameId", gameId); + return intent; + } + @Override protected int getLayoutId() { return R.layout.activity_vote; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java index 019f751dfa..fcb6b61578 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java @@ -16,7 +16,6 @@ import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.StringUtils; import com.gh.gamecenter.NewsDetailActivity; @@ -233,11 +232,8 @@ public class GameNewsAdapter extends BaseRecyclerAdapter { public void onClick(View v) { String searchKey = ((GameNewsSearchViewHolder) holder).game_news_et_search.getText().toString().trim(); if (searchKey.length() >= 1) { - Intent intent = new Intent(mContext, NewsSearchActivity.class); - intent.putExtra("gameName", "搜索结果"); - intent.putExtra("searchKey", searchKey); - intent.putExtra("gameId", mGameId); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(mEntrance, "+(游戏新闻列表:", mNewsType, ")")); + Intent intent = NewsSearchActivity.getIntent(mContext, "搜索结果", searchKey, mGameId, + StringUtils.buildString(mEntrance, "+(游戏新闻列表:", mNewsType, ")")); mContext.startActivity(intent); } else { Toast.makeText(mContext, "请输入关键字", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java index ce9bc511bc..513a6728af 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java @@ -1,7 +1,6 @@ package com.gh.gamecenter.adapter; import android.content.Context; -import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -556,9 +555,7 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { fileInfos.add(fileInfo); AppController.put(AppController.KEY_FILE_INFO, fileInfos); - Intent intent = new Intent(mContext, ChooseReceiverActivity.class); - intent.putExtra("showConnHintDialog", true); - mActivity.startActivityForResult(intent, 0x170); + mActivity.startActivityForResult(ChooseReceiverActivity.getIntent(mContext, true), 0x170); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java index f2a742de87..5a63c6a442 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java @@ -117,9 +117,7 @@ public class PlatformAdapter extends BaseRecyclerAdapter { viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(mContext, VoteActivity.class); - intent.putExtra("gameName", mGameEntity.getName()); - intent.putExtra("gameId", mGameEntity.getId()); + Intent intent = VoteActivity.getIntent(mContext, mGameEntity.getName(), mGameEntity.getId()); mContext.startActivity(intent); } }); diff --git a/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java b/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java index a5724f9943..f0339211fe 100644 --- a/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/FileSendFragment.java @@ -41,16 +41,14 @@ public class FileSendFragment extends BaseFragment { view.findViewById(R.id.file_send_btn).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(getActivity(), KcSelectGameActivity.class); - startActivityForResult(intent, 0x170); + startActivityForResult(KcSelectGameActivity.getIntent(getContext(), false), 0x170); } }); view.findViewById(R.id.file_receiver_btn).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(getActivity(), ReceiverWaitingActivity.class); - startActivityForResult(intent, 0x180); + startActivityForResult(ReceiverWaitingActivity.getIntent(getContext()), 0x180); } }); @@ -59,8 +57,7 @@ public class FileSendFragment extends BaseFragment { shareGh.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(getActivity(), ShareGhActivity.class); - getActivity().startActivity(intent); + getActivity().startActivity(ShareGhActivity.getIntent(getContext())); } }); @@ -70,8 +67,7 @@ public class FileSendFragment extends BaseFragment { cleanApk.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(getActivity(), CleanApkActivity.class); - getActivity().startActivity(intent); + getActivity().startActivity(CleanApkActivity.getIntent(getContext())); } }); } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java index b27fe10d93..1c7c97ea88 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -14,7 +14,6 @@ import com.gh.base.fragment.BaseFragment; import com.gh.common.constant.Config; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; -import com.gh.common.util.EntranceUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.DownloadManagerActivity; @@ -189,26 +188,19 @@ public class SearchToolbarFragment extends BaseFragment implements View.OnClickL DataUtils.onEvent(getActivity(), "主页", "搜索图标"); DataCollectionUtils.uploadClick(getActivity(), "搜索图标", "主页"); - Intent intent = new Intent(getActivity(), SearchActivity.class); - intent.putExtra("clicked", true); - intent.putExtra("hint", mSearchHintTv.getHint().toString()); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(工具栏)"); + Intent intent = SearchActivity.getIntent(getContext(), true, mSearchHintTv.getHint().toString(), "(工具栏)"); startActivity(intent); } else if (id == R.id.actionbar_search_input || id == R.id.actionbar_search_rl) { DataUtils.onEvent(getActivity(), "主页", "搜索框"); DataCollectionUtils.uploadClick(getActivity(), "搜索框", "主页"); - Intent intent = new Intent(getActivity(), SearchActivity.class); - intent.putExtra("clicked", false); - intent.putExtra("hint", mSearchHintTv.getHint().toString()); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(工具栏)"); + Intent intent = SearchActivity.getIntent(getContext(), false, mSearchHintTv.getHint().toString(), "(工具栏)"); startActivity(intent); } else if (id == R.id.actionbar_notification) { DataUtils.onEvent(getActivity(), "主页", "关注图标"); DataCollectionUtils.uploadClick(getActivity(), "关注图标", "主页"); - Intent intent = new Intent(getActivity(), ConcernActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(工具栏)"); + Intent intent = ConcernActivity.getIntent(getContext(), "(工具栏)"); startActivity(intent); } } diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index a01fa78a0c..3e1f486b88 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -677,12 +677,9 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadPosition(mContext, "游戏", String.valueOf(finalI + 1), mSubjectDigestList.get(finalI).getName()); } else if (finalI == 3) { - Intent intent = new Intent(mContext, ToolBoxActivity.class); - mContext.startActivity(intent); - + mContext.startActivity(ToolBoxActivity.getIntent(mContext)); } else if (finalI == 4) { - Intent intent = new Intent(mContext, KaiFuActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(游戏-专题:开服表[1-6])"); + Intent intent = KaiFuActivity.getIntent(mContext, "(游戏-专题:开服表[1-6])"); mContext.startActivity(intent); DataCollectionUtils.uploadPosition(mContext, "游戏", "6", "开服表"); @@ -891,8 +888,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { holder.more.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(mContext, PluginActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(游戏-专题:插件化-全部)"); + Intent intent = PluginActivity.getIntent(mContext, "(游戏-专题:插件化-全部)"); mContext.startActivity(intent); } }); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java index e932c5a780..766d5be493 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java @@ -21,7 +21,6 @@ import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; import com.gh.common.util.LibaoUtils; import com.gh.common.util.NewsUtils; import com.gh.common.util.QQUtils; @@ -477,11 +476,8 @@ public class FuLiAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadClick(mContext, "资讯攻略-全部", "游戏详情", mGameEntity.getName()); - Intent intent = new Intent(mContext, GameNewsActivity.class); - intent.putExtra("articleTypes", mGameDetailEntity.getArticleTypes()); - intent.putExtra("gameName", mGameEntity.getName()); - intent.putExtra("gameId", mGameEntity.getId()); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance + "+(游戏详情[" + mGameEntity.getName() + "]:资讯攻略-全部)"); + Intent intent = GameNewsActivity.getIntent(mContext, mGameEntity.getName(), mGameEntity.getId(), + entrance + "+(游戏详情[" + mGameEntity.getName() + "]:资讯攻略-全部)"); mContext.startActivity(intent); } } diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index 6fa966ac3e..8ce6eb91b1 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -14,7 +14,6 @@ import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.constant.ItemViewType; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.LibaoUtils; import com.gh.common.util.MD5Utils; @@ -380,8 +379,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(mContext, ConcernActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, mEntrance + "+(礼包中心-关注)"); + Intent intent = ConcernActivity.getIntent(mContext, mEntrance + "+(礼包中心-关注)"); mLibao2Fragment.startActivityForResult(intent, 0x223); } }); diff --git a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java index 916bee2924..17f761a6e3 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java @@ -659,16 +659,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(资讯:关注[2-4])"); mContext.startActivity(intent); } else { - Intent intent = new Intent(mContext, ShareCardActivity.class); - Bundle bundle = new Bundle(); - bundle.putString("gameName", concernEntity.getGameName()); - bundle.putString("gameIconUrl", concernEntity.getGameIcon()); - bundle.putString("shareContent", shareContent); - if (concernEntity.getLink() == null) { - bundle.putString("newsId", concernEntity.getId()); - } - intent.putExtras(bundle); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(资讯:关注[2-4])"); + Intent intent = ShareCardActivity.getIntent(mContext, concernEntity, shareContent); mContext.startActivity(intent); } } diff --git a/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java index fe33d9f7b4..6746002172 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java @@ -15,7 +15,6 @@ import android.widget.TextView; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.GameNewsActivity; import com.gh.gamecenter.R; @@ -112,8 +111,7 @@ public class News3Fragment extends BaseFragment implements SwipeRefreshLayout.On && !concernGame.get(0).getId().equals("5618b86e8ab49e17088b4575"))) { OnSelectGameClickListener(); } else { - Intent intent = new Intent(getContext(), ConcernActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "资讯(攻略-我关注的游戏)"); + Intent intent = ConcernActivity.getIntent(getContext(), "资讯(攻略-我关注的游戏)"); getContext().startActivity(intent); } } @@ -141,8 +139,7 @@ public class News3Fragment extends BaseFragment implements SwipeRefreshLayout.On @Override public void onClick(View v) { isShowPopupBg(false); - Intent intent = new Intent(getContext(), ConcernActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "资讯(攻略-我关注的游戏)"); + Intent intent = ConcernActivity.getIntent(getContext(), "资讯(攻略-我关注的游戏)"); getContext().startActivity(intent); } }); @@ -211,9 +208,7 @@ public class News3Fragment extends BaseFragment implements SwipeRefreshLayout.On @Override public void selectPosition(int position, ConcernInfo concernInfo) { isShowPopupBg(false); - Intent intent = new Intent(getContext(), GameNewsActivity.class); - intent.putExtra("gameName", concernInfo.getGameName()); - intent.putExtra("gameId", concernInfo.getId()); + Intent intent = GameNewsActivity.getIntent(getContext(), concernInfo.getGameName(), concernInfo.getId(), "资讯-攻略(我关注的游戏)"); getContext().startActivity(intent); } diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java index c63412218a..f96b284ec4 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java @@ -1,7 +1,6 @@ package com.gh.gamecenter.personal; import android.content.Context; -import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -16,6 +15,7 @@ import android.view.ViewGroup; import android.widget.TextView; import com.gh.base.AppController; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.constant.Config; import com.gh.common.constant.ItemViewType; import com.gh.common.util.ApkActiveUtils; @@ -34,7 +34,6 @@ import com.gh.download.DownloadManager; import com.gh.gamecenter.ChooseReceiverActivity; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameNormalSwipeViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; @@ -556,9 +555,7 @@ class InstallFragmentAdapter extends BaseRecyclerAdapter { fileInfos.add(fileInfo); AppController.put(AppController.KEY_FILE_INFO, fileInfos); - Intent intent = new Intent(mContext, ChooseReceiverActivity.class); - intent.putExtra("showConnHintDialog", true); - fragment.startActivityForResult(intent, 0x170); + fragment.startActivityForResult(ChooseReceiverActivity.getIntent(mContext, true), 0x170); } diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index 619b5fedef..b0fa618c57 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -13,7 +13,6 @@ import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; -import com.gh.common.util.EntranceUtils; import com.gh.common.util.LoginUtils; import com.gh.gamecenter.InstallActivity; import com.gh.gamecenter.LibaoActivity; @@ -106,38 +105,32 @@ public class PersonalFragment extends BaseFragment { LoginUtils.getInstance(getActivity()).WeiBoLogin(); break; case R.id.personal_user_icon: - Intent loginIntent = new Intent(getActivity(), LoginActivity.class); - getContext().startActivity(loginIntent); + getContext().startActivity(LoginActivity.getIntent(getContext())); break; case R.id.personal_user_name: break; case R.id.personal_game: - Intent intent0 = new Intent(getContext(), InstallActivity.class); - getContext().startActivity(intent0); + getContext().startActivity(InstallActivity.getIntent(getContext())); break; case R.id.personal_libao: DataUtils.onEvent(getActivity(), "主页", "礼包图标"); DataCollectionUtils.uploadClick(getActivity(), "礼包图标", "我的光环"); - Intent intent = new Intent(getActivity(), LibaoActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(我的光环:礼包[4-1])"); + Intent intent = LibaoActivity.getIntent(getContext(), "(我的光环:礼包[4-1])"); startActivity(intent); DataCollectionUtils.uploadPosition(getActivity(), "我的光环", "1", "礼包"); break; case R.id.personal_share: - Intent intent2 = new Intent(getActivity(), ShareGhActivity.class); - getActivity().startActivity(intent2); + getActivity().startActivity(ShareGhActivity.getIntent(getContext())); break; case R.id.personal_suggestion: - Intent intent1 = new Intent(getActivity(), SuggestSelectActivity.class); - getActivity().startActivity(intent1); + getActivity().startActivity(SuggestSelectActivity.getIntent(getActivity())); break; case R.id.personal_setting: DataUtils.onEvent(getActivity(), "我的光环", "设置图标"); DataCollectionUtils.uploadClick(getActivity(), "设置图标", "我的光环"); - Intent intent3 = new Intent(getActivity(), SettingActivity.class); - intent3.putExtra(EntranceUtils.KEY_ENTRANCE, "(我的光环)"); + Intent intent3 = SettingActivity.getIntent(getContext(), "(我的光环)"); startActivity(intent3); break; }