From d9bb60e66bfacabbcf45d0f86eec375194b81c87 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Mon, 16 Oct 2017 16:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86Entrance=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/util/CollectionUtils.kt | 10 +---- .../java/com/gh/common/util/ConcernUtils.kt | 4 -- .../com/gh/common/util/EntranceUtils.java | 14 ++++++- .../com/gh/download/DownloadNotification.java | 3 +- .../gh/gamecenter/ChooseReceiverActivity.java | 10 +++-- .../gh/gamecenter/CommentDetailActivity.java | 5 ++- .../com/gh/gamecenter/CropImageActivity.java | 6 +-- .../gamecenter/DownloadManagerActivity.java | 11 ++--- .../com/gh/gamecenter/GameDetailActivity.java | 9 +++-- .../com/gh/gamecenter/GameNewsActivity.java | 8 ++-- .../java/com/gh/gamecenter/KaiFuActivity.java | 2 +- .../gh/gamecenter/KcSelectGameActivity.java | 5 ++- .../gh/gamecenter/LibaoDetailActivity.java | 4 +- .../java/com/gh/gamecenter/LoginActivity.java | 7 ++-- .../java/com/gh/gamecenter/MainActivity.java | 2 +- .../gh/gamecenter/MessageDetailActivity.java | 6 +-- .../com/gh/gamecenter/NewsDetailActivity.java | 18 +++++---- .../com/gh/gamecenter/NewsSearchActivity.java | 12 +++--- .../com/gh/gamecenter/SearchActivity.java | 24 ++++++----- .../gh/gamecenter/SelectUserIconActivity.java | 3 +- .../com/gh/gamecenter/ShareCardActivity.java | 16 ++++---- .../gh/gamecenter/ShareCardPicActivity.java | 27 ++++++++----- .../java/com/gh/gamecenter/SkipActivity.java | 5 ++- .../gh/gamecenter/SplashScreenActivity.java | 4 +- .../com/gh/gamecenter/SubjectActivity.java | 24 +++++------ .../com/gh/gamecenter/SuggestionActivity.java | 26 ++++++------ .../gh/gamecenter/UserInfoEditActivity.java | 9 +++-- .../com/gh/gamecenter/UserRegionActivity.java | 3 +- .../com/gh/gamecenter/ViewImageActivity.java | 12 +++--- .../java/com/gh/gamecenter/VoteActivity.java | 9 +++-- .../java/com/gh/gamecenter/WebActivity.java | 32 +++++++-------- .../com/gh/gamecenter/WeiBoShareActivity.java | 40 ++++++++++++------- .../adapter/MessageDetailAdapter.java | 2 +- .../download/GameDownloadFragment.java | 11 ++--- .../download/GameUpdateFragment.java | 6 +-- .../fragment/SearchToolbarFragment.java | 5 ++- .../gh/gamecenter/kaifu/KaiFuVpFragment.java | 3 +- .../kuaichuan/KuaichuanNotification.java | 3 +- .../gh/gamecenter/libao/LibaoNewAdapter.kt | 2 +- .../gh/gamecenter/libao/LibaoSearchAdapter.kt | 2 +- .../gamecenter/login/BaseLoginFragment.java | 3 +- .../message/CommentFragmentAdapter.java | 3 +- .../message/KeFuFragmentAdapter.java | 2 +- .../newsdetail/NewsDetailAdapter.java | 4 +- .../gamecenter/receiver/InstallReceiver.java | 6 +-- .../receiver/NotificationReceiver.java | 4 +- .../gamecenter/region/RegionProvFragment.java | 5 ++- .../com/gh/gamecenter/retrofit/Response.java | 2 +- .../gamecenter/subject/SubjectFragment.java | 12 +++--- .../subject/SubjectTileFragment.java | 18 +++++---- 50 files changed, 255 insertions(+), 208 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/CollectionUtils.kt b/app/src/main/java/com/gh/common/util/CollectionUtils.kt index 8bbf61d8fe..f087833ebb 100644 --- a/app/src/main/java/com/gh/common/util/CollectionUtils.kt +++ b/app/src/main/java/com/gh/common/util/CollectionUtils.kt @@ -91,15 +91,7 @@ object CollectionUtils { postCollection .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Response() { - override fun onResponse(response: ResponseBody?) { - super.onResponse(response) - } - - override fun onFailure(e: HttpException?) { - super.onFailure(e) - } - }) + .subscribe(object : Response() {}) } diff --git a/app/src/main/java/com/gh/common/util/ConcernUtils.kt b/app/src/main/java/com/gh/common/util/ConcernUtils.kt index bd01669773..9aad21a401 100644 --- a/app/src/main/java/com/gh/common/util/ConcernUtils.kt +++ b/app/src/main/java/com/gh/common/util/ConcernUtils.kt @@ -72,10 +72,6 @@ object ConcernUtils { super.onResponse(response) EventBus.getDefault().post(EBConcernChanged()) } - - override fun onFailure(e: HttpException) { - super.onFailure(e) - } }) } diff --git a/app/src/main/java/com/gh/common/util/EntranceUtils.java b/app/src/main/java/com/gh/common/util/EntranceUtils.java index c273a492c1..bef9a46cd0 100644 --- a/app/src/main/java/com/gh/common/util/EntranceUtils.java +++ b/app/src/main/java/com/gh/common/util/EntranceUtils.java @@ -21,6 +21,7 @@ public class EntranceUtils { public static final String KEY_GAMEID = "gameId"; public static final String KEY_ID = "id"; public static final String KEY_URL = "url"; + public static final String KEY_GAMENAME = "gameName"; public static final String HOST_ARTICLE = "article"; public static final String HOST_GAME = "game"; public static final String HOST_COLUMN = "column"; @@ -43,7 +44,18 @@ public class EntranceUtils { public static final String KEY_VERSION = "version"; public static final String KEY_CONTENT = "content"; public static final String KEY_PLUGIN = "plugin"; - public static final String KEY_CURRENT_ITEM = "currentItem"; + public static final String KEY_CURRENTITEM = "currentItem"; + public static final String KEY_COMMENTID = "commentId"; + public static final String KEY_PATH = "path"; + public static final String KEY_OLDERUSER = "isOldUser"; + public static final String KEY_SEARCHKEY = "searchKey"; + public static final String KEY_HINT = "hint"; + public static final String KEY_GAME_ICON_URL = "gameIconUrl"; + public static final String KEY_SHARECONTENT = "shareContent"; + public static final String KEY_SUGGESTTYPE = "suggestType"; + public static final String KEY_PROLIST = "provinceList"; + public static final String KEY_ORDER = "order"; + public static final String KEY_TAGTYPE = "tagType"; public static void jumpActivity(Context context, Bundle bundle) { diff --git a/app/src/main/java/com/gh/download/DownloadNotification.java b/app/src/main/java/com/gh/download/DownloadNotification.java index ff8984d954..ec45c5c13a 100644 --- a/app/src/main/java/com/gh/download/DownloadNotification.java +++ b/app/src/main/java/com/gh/download/DownloadNotification.java @@ -8,6 +8,7 @@ import android.content.Intent; import android.support.v4.app.NotificationCompat; import com.gh.common.util.AppDebugConfig; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.PlatformUtils; import com.gh.gamecenter.R; import com.lightgame.download.DownloadEntity; @@ -37,7 +38,7 @@ public class DownloadNotification { public static void showDownloadDoneNotification(Context context, DownloadEntity downloadEntity) { final NotificationManager manager = getNotificationManager(context); Intent intent = new Intent(); - intent.putExtra("path", downloadEntity.getPath()); + intent.putExtra(EntranceUtils.KEY_PATH, downloadEntity.getPath()); intent.setAction(ACTION_INSTALL); final int requestCode = downloadEntity.getPackageName().hashCode(); final PendingIntent pendingIntent = PendingIntent.getBroadcast(context, requestCode, intent, PendingIntent.FLAG_UPDATE_CURRENT); diff --git a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java index b276ad537d..033ff1cc1c 100644 --- a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java @@ -115,6 +115,8 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick TextView mTitleTv; + private static final String KET_SHOWCONNHINTDIALOG = "showConnHintDialog"; + private List mScanResultList; private DatagramSocket mDatagramSocket; @@ -136,7 +138,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick @NonNull public static Intent getIntent(Context context, boolean showConnHintDialog) { Intent intent = new Intent(context, ChooseReceiverActivity.class); - intent.putExtra("showConnHintDialog", showConnHintDialog); + intent.putExtra(KET_SHOWCONNHINTDIALOG, showConnHintDialog); return intent; } @@ -191,11 +193,11 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick } }); - boolean showConnHintDialog = sp.getBoolean("showConnHintDialog", true); + boolean showConnHintDialog = sp.getBoolean(KET_SHOWCONNHINTDIALOG, true); if (showConnHintDialog || (getIntent() != null && getIntent().getExtras() != null - && getIntent().getExtras().getBoolean("showConnHintDialog"))) { + && getIntent().getExtras().getBoolean(KET_SHOWCONNHINTDIALOG))) { if (showConnHintDialog) { - sp.edit().putBoolean("showConnHintDialog", false).apply(); + sp.edit().putBoolean(KET_SHOWCONNHINTDIALOG, false).apply(); } showConnHintDialog(); } diff --git a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java index ae9a5c039e..310a9336ae 100644 --- a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java @@ -7,6 +7,7 @@ import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import com.gh.base.BaseActivity; +import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.adapter.CommentDetailAdapter; import butterknife.BindView; @@ -24,7 +25,7 @@ public class CommentDetailActivity extends BaseActivity { public static Intent getCommentDetailIntent(Context context, String commentId) { Intent intent = new Intent(context, CommentDetailActivity.class); - intent.putExtra("commentId", commentId); + intent.putExtra(EntranceUtils.KEY_COMMENTID, commentId); return intent; } @@ -39,7 +40,7 @@ public class CommentDetailActivity extends BaseActivity { super.onCreate(savedInstanceState); initTitle(getString(R.string.title_comment_detail)); - String commentId = getIntent().getExtras().getString("commentId"); + String commentId = getIntent().getStringExtra(EntranceUtils.KEY_COMMENTID); mAdapter = new CommentDetailAdapter(this, commentId); mLayoutManager = new LinearLayoutManager(this); diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index b503a22d77..4e55621891 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -74,7 +74,7 @@ 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_PATH, picturePath); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); return intent; } @@ -184,7 +184,7 @@ public class CropImageActivity extends BaseActivity { sp.edit().putString("updateIconCount", jsonObject.toString()).apply(); Intent data = new Intent(); - data.putExtra("url", result.getString("icon")); + data.putExtra(EntranceUtils.KEY_URL, result.getString("icon")); setResult(RESULT_OK, data); finish(); @@ -226,7 +226,7 @@ public class CropImageActivity extends BaseActivity { super.onWindowFocusChanged(hasFocus); if (hasFocus && (reference == null || reference.get() == null)) { ImageView imageView = mCropimageCustom.getCropImageZoomView(); - Bitmap bitmap = BitmapUtils.getBitmapByFile(getIntent().getStringExtra("path"), + Bitmap bitmap = BitmapUtils.getBitmapByFile(getIntent().getStringExtra(EntranceUtils.KEY_PATH), imageView.getWidth(), imageView.getHeight()); if (bitmap != null) { reference = new SoftReference<>(bitmap); diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index 91f3b8329d..789b0837f9 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -25,14 +25,14 @@ public class DownloadManagerActivity extends BaseActivity { // TODO: 20/09/17 增加currentItem 入口 插件更新可能需要 public static Intent getDownloadMangerIntent(Context context, String url, String entrance) { Intent intent = new Intent(context, DownloadManagerActivity.class); - intent.putExtra("url", url); + intent.putExtra(EntranceUtils.KEY_URL, url); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); return intent; } public static void startDownloadManagerActivity(Context context, String url, String entrance) { Intent intent = new Intent(context, DownloadManagerActivity.class); - intent.putExtra("url", url); + intent.putExtra(EntranceUtils.KEY_URL, url); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(intent); @@ -49,9 +49,10 @@ public class DownloadManagerActivity extends BaseActivity { initTitle(getString(R.string.title_downloadmanager)); - int currentItem = getIntent().getIntExtra("currentItem", 0); - if (getIntent().getBundleExtra("data") != null) { - currentItem = getIntent().getBundleExtra("data").getInt("currentItem", 0); + 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( diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index a48060aae6..b6e66c30dd 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -162,7 +162,7 @@ public class GameDetailActivity extends BaseActivity { public static void startGameDetailActivity(Context context, String gameId, String entrance) { Intent intent = new Intent(context, GameDetailActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent.putExtra("gameId", gameId); + intent.putExtra(EntranceUtils.KEY_GAMEID, gameId); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); context.startActivity(intent); } @@ -202,10 +202,11 @@ public class GameDetailActivity extends BaseActivity { name = "游戏详情"; - mGameId = getIntent().getStringExtra("gameId"); + mGameId = getIntent().getStringExtra(EntranceUtils.KEY_GAMEID); mEntrance = getIntent().getStringExtra(EntranceUtils.KEY_ENTRANCE); - if (getIntent().getBundleExtra("data") != null) { - mGameId = getIntent().getBundleExtra("data").getString("gameId"); + Bundle data = getIntent().getBundleExtra(EntranceUtils.KEY_DATA); + if (data != null) { + mGameId = data.getString(EntranceUtils.KEY_GAMEID); } if (mGameId == null) { diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index dcc66388ca..ce65a11ad8 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -68,8 +68,8 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen @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_GAMENAME, gameName); + intent.putExtra(EntranceUtils.KEY_GAMEID, gameId); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); return intent; } @@ -97,7 +97,7 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen ivSearch.setOnClickListener(this); ivSearch.setVisibility(View.GONE); - String gameName = getIntent().getStringExtra("gameName"); + String gameName = getIntent().getStringExtra(EntranceUtils.KEY_GAMENAME); initTitle(gameName); mNoDataTv.setText("暂无内容"); @@ -106,7 +106,7 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen typeList = new ArrayList<>(); - gameId = getIntent().getStringExtra("gameId"); + gameId = getIntent().getStringExtra(EntranceUtils.KEY_GAMEID); mGameNewsRv.setHasFixedSize(true); layoutManager = new LinearLayoutManager(this); diff --git a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java index 3763d87ff7..4d140c5b1b 100644 --- a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java @@ -105,7 +105,7 @@ public class KaiFuActivity extends BaseActivity { mKaiFuFragment.onPause(); Bundle args = new Bundle(); - args.putString("gameId", reset.getGameId()); + args.putString(EntranceUtils.KEY_GAMEID, reset.getGameId()); args.putInt("curPage", mKaiFuFragment.getCurPage()); mGameKaiFuFragment = new KaiFuFragment(); diff --git a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java index ab850dd37a..bd994f6cc7 100644 --- a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java @@ -51,6 +51,7 @@ public class KcSelectGameActivity extends BaseActivity { private KcSelectGameAdapter mAdapter; + public final static String KEY_ISCONN = "isConn"; public final static int SEND_OVER_REQUEST = 16; // 快传 传输完成后直接退出选择游戏(当前)页面 private boolean mIsConn; @@ -60,7 +61,7 @@ public class KcSelectGameActivity extends BaseActivity { @NonNull public static Intent getIntent(Context context, boolean isConn) { Intent intent = new Intent(context, KcSelectGameActivity.class); - intent.putExtra("isConn", isConn); + intent.putExtra(KEY_ISCONN, isConn); return intent; } @@ -85,7 +86,7 @@ public class KcSelectGameActivity extends BaseActivity { initTitle(getString(R.string.title_select_game)); if (getIntent() != null && getIntent().getExtras() != null) { - mIsConn = getIntent().getExtras().getBoolean("isConn"); + mIsConn = getIntent().getExtras().getBoolean(KEY_ISCONN); } else { mIsConn = false; } diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index cafad30a71..f80794bdca 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -157,7 +157,7 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap public static Intent getIntentById(Context context, String id, String entrance) { Intent intent = new Intent(context, LibaoDetailActivity.class); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); - intent.putExtra("id", id); + intent.putExtra(EntranceUtils.KEY_ID, id); return intent; } @@ -208,7 +208,7 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap }); if (mLibaoEntity == null) { - String id = getIntent().getStringExtra("id"); + String id = getIntent().getStringExtra(EntranceUtils.KEY_ID); if (!TextUtils.isEmpty(id)) { getLibaoDigest(this, id); } diff --git a/app/src/main/java/com/gh/gamecenter/LoginActivity.java b/app/src/main/java/com/gh/gamecenter/LoginActivity.java index 44ea5997a0..8238118bd6 100644 --- a/app/src/main/java/com/gh/gamecenter/LoginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LoginActivity.java @@ -14,6 +14,7 @@ import android.widget.RelativeLayout; import com.gh.base.BaseActivity; import com.gh.common.util.DisplayUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.GetLoginDataUtils; import com.gh.gamecenter.login.LoginFragment; import com.gh.gamecenter.login.LoginOldUserFragment; @@ -35,7 +36,7 @@ public class LoginActivity extends BaseActivity { @NonNull public static Intent getIntent(Context context, boolean isOldUser) { Intent intent = new Intent(context, LoginActivity.class); - intent.putExtra("isOldUser", isOldUser); + intent.putExtra(EntranceUtils.KEY_OLDERUSER, isOldUser); return intent; } @@ -59,7 +60,7 @@ public class LoginActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (getIntent() != null) { - mIsOlderUser = getIntent().getBooleanExtra("isOldUser", false); + mIsOlderUser = getIntent().getBooleanExtra(EntranceUtils.KEY_OLDERUSER, false); } // 添加老用户入口 @@ -149,7 +150,7 @@ public class LoginActivity extends BaseActivity { } else { fragmentByTag = cls.newInstance(); Bundle args = new Bundle(); - args.putBoolean("isOldUser", mIsOlderUser); + args.putBoolean(EntranceUtils.KEY_OLDERUSER, mIsOlderUser); fragmentByTag.setArguments(args); transaction.add(R.id.layout_fragment_content, fragmentByTag, cls.getSimpleName()); } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 0badb6893e..450c5d7dde 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -123,7 +123,7 @@ public class MainActivity extends BaseActivity { } String packageName = bundle.getString("packageName"); if (packageName != null) { - bundle.putInt("currentItem", 1); + bundle.putInt(EntranceUtils.KEY_CURRENTITEM, 1); } skipIntent.putExtra(KEY_DATA, bundle); diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index cdd7abc751..0f17c934d0 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -138,7 +138,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall HaloApp.put("CommentEntity", entity); Intent intent = new Intent(context, MessageDetailActivity.class); intent.putExtra("commentNum", -1); - intent.putExtra("newsId", newsId); + intent.putExtra(EntranceUtils.KEY_NEWSID, newsId); intent.putExtra("openSoftInput", true); return intent; } @@ -152,7 +152,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall public static Intent getIntentById(Context context, String newsId, Integer commentNum, Boolean openSoftInput, String entrance) { Intent intent = new Intent(context, MessageDetailActivity.class); - intent.putExtra("newsId", newsId); + intent.putExtra(EntranceUtils.KEY_NEWSID, newsId); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); intent.putExtra("commentNum", commentNum); intent.putExtra("openSoftInput", openSoftInput); @@ -180,7 +180,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall mCommentEntity = (CommentEntity) HaloApp.get("CommentEntity", true); // 来自新闻详情-评论回复 Intent intent = getIntent(); - newsId = intent.getExtras().getString("newsId"); + newsId = intent.getExtras().getString(EntranceUtils.KEY_NEWSID); commentNum = intent.getExtras().getInt("commentNum", -1); //复用问题 mConcernEntity对应的文章有可能和跳转之前的文章不一致 diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index cf173cd588..c919d430f2 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -98,6 +98,8 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, private NewsDetailAdapter adapter; + private static final String KEY_COLLECTIONNEWS = "isCollectionNews"; + private boolean isSentReport = false; private boolean isSecondDown = false; private boolean mIsCollectionNews; @@ -190,7 +192,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); intent.putExtra(NewsEntity.class.getSimpleName(), newsEntity); - intent.putExtra("isCollectionNews", true); + intent.putExtra(KEY_COLLECTIONNEWS, true); context.startActivity(intent); } @@ -200,8 +202,8 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, public static Intent getIntentById(Context context, String newsId, boolean isCollectionNews, String entrance) { Intent intent = new Intent(context, NewsDetailActivity.class); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); - intent.putExtra("isCollectionNews", isCollectionNews); - intent.putExtra("newsId", newsId); + intent.putExtra(KEY_COLLECTIONNEWS, isCollectionNews); + intent.putExtra(EntranceUtils.KEY_NEWSID, newsId); return intent; } @@ -209,7 +211,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, public static Intent getIntentById(Context context, String newsId, String entrance) { Intent intent = new Intent(context, NewsDetailActivity.class); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); - intent.putExtra("newsId", newsId); + intent.putExtra(EntranceUtils.KEY_NEWSID, newsId); return intent; } @@ -268,10 +270,10 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, adapter = new NewsDetailAdapter(this, this, mEntrance); mDetailRv.setAdapter(adapter); - newsId = getIntent().getStringExtra("newsId"); - mIsCollectionNews = getIntent().getBooleanExtra("isCollectionNews", false); - if (getIntent().getBundleExtra("data") != null) { - newsId = getIntent().getBundleExtra("data").getString("newsId"); + newsId = getIntent().getStringExtra(EntranceUtils.KEY_NEWSID); + mIsCollectionNews = getIntent().getBooleanExtra(KEY_COLLECTIONNEWS, false); + if (getIntent().getBundleExtra(EntranceUtils.KEY_DATA) != null) { + newsId = getIntent().getBundleExtra(EntranceUtils.KEY_DATA).getString(EntranceUtils.KEY_NEWSID); } if (newsId == null) { mNewsEntity = getIntent().getParcelableExtra(NewsEntity.class.getSimpleName()); diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index 17a0216d39..43c7115f13 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -78,9 +78,9 @@ public class NewsSearchActivity extends BaseActivity { @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_GAMENAME, gameName); + intent.putExtra(EntranceUtils.KEY_SEARCHKEY, searchKey); + intent.putExtra(EntranceUtils.KEY_GAMEID, gameId); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); return intent; } @@ -96,9 +96,9 @@ public class NewsSearchActivity extends BaseActivity { super.onCreate(savedInstanceState); Intent intent = getIntent(); - String gameName = intent.getExtras().getString("gameName"); - searchKey = intent.getExtras().getString("searchKey"); - gameId = intent.getExtras().getString("gameId"); + String gameName = intent.getExtras().getString(EntranceUtils.KEY_GAMENAME); + searchKey = intent.getExtras().getString(EntranceUtils.KEY_SEARCHKEY); + gameId = intent.getExtras().getString(EntranceUtils.KEY_GAMEID); initTitle(gameName); diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.java b/app/src/main/java/com/gh/gamecenter/SearchActivity.java index c9be7ba30b..863531c052 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.java @@ -42,6 +42,10 @@ public class SearchActivity extends BaseActivity { private SearchHistoryDao dao; + private static final String KEY_CURRENTTAG = "currentTab"; + private static final String KEY_SEARCHTYPE = "searchType"; + private static final String KEY_CLICKED = "clicked"; + private String searchKey; private String searchType; @@ -61,8 +65,8 @@ 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(KEY_CLICKED, clicked); + intent.putExtra(EntranceUtils.KEY_HINT, hint); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); return intent; } @@ -70,9 +74,9 @@ public class SearchActivity extends BaseActivity { @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putInt("currentTab", currentTab); - outState.putString("searchKey", searchKey); - outState.putString("searchType", searchType); + outState.putInt(KEY_CURRENTTAG, currentTab); + outState.putString(EntranceUtils.KEY_SEARCHKEY, searchKey); + outState.putString(KEY_SEARCHTYPE, searchType); } @Override @@ -86,16 +90,16 @@ public class SearchActivity extends BaseActivity { dao = new SearchHistoryDao(this); - boolean isFromHome = getIntent().getBooleanExtra("clicked", false); - String hint = getIntent().getStringExtra("hint"); + boolean isFromHome = getIntent().getBooleanExtra(KEY_CLICKED, false); + String hint = getIntent().getStringExtra(EntranceUtils.KEY_HINT); setActionBarLayout(); currentTab = 0; if (savedInstanceState != null) { - currentTab = savedInstanceState.getInt("currentTab", 0); - searchKey = savedInstanceState.getString("searchKey", null); - searchType = savedInstanceState.getString("searchType", null); + currentTab = savedInstanceState.getInt(KEY_CURRENTTAG, 0); + searchKey = savedInstanceState.getString(EntranceUtils.KEY_SEARCHKEY, null); + searchType = savedInstanceState.getString(KEY_SEARCHTYPE, null); if (currentTab != 0 && !TextUtils.isEmpty(searchKey)) { search(searchType, searchKey); } diff --git a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java index 4bf531a999..8ae53d5c71 100644 --- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java @@ -14,6 +14,7 @@ import android.view.View; import android.widget.TextView; import com.gh.base.BaseActivity; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.LoginUtils; import com.gh.common.util.RandomUtils; import com.gh.common.util.UserIconUtils; @@ -79,7 +80,7 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o Intent intent = CropImageActivity.getIntent(this, picturePath, "我的光环(选择头像)"); startActivityForResult(intent, CROP_ICON_REQUEST); } else if (data != null && requestCode == CROP_ICON_REQUEST) { - String url = data.getExtras().getString("url"); + String url = data.getExtras().getString(EntranceUtils.KEY_URL); // Intent intent = new Intent(); // intent.putExtra("url", url); // setResult(0x125, intent); diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java index aa82c1b0a9..08c5c30ac7 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java @@ -58,11 +58,11 @@ public class ShareCardActivity extends BaseActivity { 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); + bundle.putString(EntranceUtils.KEY_GAMENAME, concernEntity.getGameName()); + bundle.putString(EntranceUtils.KEY_GAME_ICON_URL, concernEntity.getGameIcon()); + bundle.putString(EntranceUtils.KEY_SHARECONTENT, shareContent); if (concernEntity.getLink() == null) { - bundle.putString("newsId", concernEntity.getId()); + bundle.putString(EntranceUtils.KEY_NEWSID, concernEntity.getId()); } intent.putExtras(bundle); intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(资讯:关注[2-4])"); @@ -89,10 +89,10 @@ public class ShareCardActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Bundle extras = getIntent().getExtras(); - gameName = extras.getString("gameName"); - gameIconUrl = extras.getString("gameIconUrl"); - shareContent = extras.getString("shareContent"); - newsId = extras.getString("newsId"); + gameName = extras.getString(EntranceUtils.KEY_GAMENAME); + gameIconUrl = extras.getString(EntranceUtils.KEY_GAME_ICON_URL); + shareContent = extras.getString(EntranceUtils.KEY_SHARECONTENT); + newsId = extras.getString(EntranceUtils.KEY_NEWSID); picName = "shareImg.jpg"; diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index 9c23dd8fdd..19f1680bab 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -72,11 +72,16 @@ public class ShareCardPicActivity extends BaseActivity { ImageView mShareChangImageIcon; @BindView(R.id.sharecard_chang_img_tv) TextView mShareChangImageTv; - int currentImgPosition; + + public static final String KEY_SHARE_ARRIMG = "shareArrImg"; + private String gameName; private String gameIconUrl; private String shareContent; private String picName; + + private int currentImgPosition; + private List shareArrImg; private Bitmap shareBm; @@ -96,14 +101,14 @@ public class ShareCardPicActivity extends BaseActivity { Intent intent = new Intent(context, ShareCardPicActivity.class); Bundle bundle = new Bundle(); - bundle.putString("gameName", concernEntity.getGameName()); - bundle.putString("gameIconUrl", concernEntity.getGameIcon()); - bundle.putString("shareContent", shareContent); + bundle.putString(EntranceUtils.KEY_GAMENAME, concernEntity.getGameName()); + bundle.putString(EntranceUtils.KEY_GAME_ICON_URL, concernEntity.getGameIcon()); + bundle.putString(EntranceUtils.KEY_SHARECONTENT, shareContent); if (concernEntity.getLink() == null) { - bundle.putString("newsId", concernEntity.getId()); + bundle.putString(EntranceUtils.KEY_NEWSID, concernEntity.getId()); } if (concernEntity.getImg() != null && concernEntity.getImg().size() > 0) { - bundle.putStringArrayList("shareArrImg", (ArrayList) concernEntity.getImg()); + bundle.putStringArrayList(KEY_SHARE_ARRIMG, (ArrayList) concernEntity.getImg()); } intent.putExtras(bundle); intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(entrance, "+(消息详情[", concernEntity.getGameName(), "])")); @@ -130,11 +135,11 @@ public class ShareCardPicActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Bundle extras = getIntent().getExtras(); - gameName = extras.getString("gameName"); - gameIconUrl = extras.getString("gameIconUrl"); - shareContent = extras.getString("shareContent"); - newsId = extras.getString("newsId"); - List arrImg = extras.getStringArrayList("shareArrImg"); + gameName = extras.getString(EntranceUtils.KEY_GAMENAME); + gameIconUrl = extras.getString(EntranceUtils.KEY_GAME_ICON_URL); + shareContent = extras.getString(EntranceUtils.KEY_SHARECONTENT); + newsId = extras.getString(EntranceUtils.KEY_NEWSID); + List arrImg = extras.getStringArrayList(KEY_SHARE_ARRIMG); picName = "shareImgPic.jpg"; currentImgPosition = 0; diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java index 4d1524fdad..718dc842c6 100644 --- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java @@ -6,6 +6,7 @@ import android.os.Bundle; import android.text.TextUtils; import com.gh.base.BaseActivity; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.RunningUtils; @@ -82,7 +83,7 @@ public class SkipActivity extends BaseActivity { uri.getQueryParameter(KEY_VERSION)); intent.putExtra(KEY_CONTENT, content); intent.putExtra(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN); - intent.putExtra("suggestType", 4); + intent.putExtra(EntranceUtils.KEY_SUGGESTTYPE, 4); intent.setClass(this, SuggestionActivity.class); break; case HOST_DOWNLOAD: @@ -122,7 +123,7 @@ public class SkipActivity extends BaseActivity { uri.getQueryParameter(KEY_VERSION)); intent.putExtra(KEY_CONTENT, content); intent.putExtra(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN); - intent.putExtra("suggestType", 4); + intent.putExtra(EntranceUtils.KEY_SUGGESTTYPE, 4); intent.putExtra(KEY_TO, "SuggestionActivity"); break; case HOST_DOWNLOAD: diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 36e75447ac..ad63e4567f 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -114,8 +114,8 @@ public class SplashScreenActivity extends BaseActivity { intent.setAction(Intent.ACTION_MAIN); intent.addCategory(Intent.CATEGORY_LAUNCHER); intent.putExtra(KEY_TO, DownloadManagerActivity.TAG); - intent.putExtra("currentItem", 0); - intent.putExtra("path", path); + intent.putExtra(EntranceUtils.KEY_CURRENTITEM, 0); + intent.putExtra(EntranceUtils.KEY_PATH, path); intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(安装跳转)"); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); return intent; diff --git a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java index bb2a874f6f..22c884ab51 100644 --- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java @@ -64,9 +64,9 @@ public class SubjectActivity extends BaseActivity { */ public static void startSubjectActivity(Context context, String id, String name, boolean isOrder, String entrance) { Intent intent = new Intent(context, SubjectActivity.class); - intent.putExtra("id", id); - intent.putExtra("name", name); - intent.putExtra("order", isOrder); + intent.putExtra(EntranceUtils.KEY_ID, id); + intent.putExtra(EntranceUtils.KEY_NAME, name); + intent.putExtra(EntranceUtils.KEY_ORDER, isOrder); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); context.startActivity(intent); } @@ -80,12 +80,12 @@ public class SubjectActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mBundle = getIntent().getExtras(); - if (getIntent().getBundleExtra("data") != null) { - mBundle = getIntent().getBundleExtra("data"); + if (getIntent().getBundleExtra(EntranceUtils.KEY_DATA) != null) { + mBundle = getIntent().getBundleExtra(EntranceUtils.KEY_DATA); } - mId = mBundle.getString("id"); - mName = mBundle.getString("name"); + mId = mBundle.getString(EntranceUtils.KEY_ID); + mName = mBundle.getString(EntranceUtils.KEY_NAME); initTitle(mName); @@ -126,7 +126,7 @@ public class SubjectActivity extends BaseActivity { TextView actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title); actionbar_tv_title.setText(name); - mBundle.putString("name", name); + mBundle.putString(EntranceUtils.KEY_NAME, name); loadSubjectType(); } catch (JSONException e) { e.printStackTrace(); @@ -138,7 +138,7 @@ public class SubjectActivity extends BaseActivity { super.onFailure(e); TextView actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title); actionbar_tv_title.setText("专题"); - mBundle.putString("name", "专题"); + mBundle.putString(EntranceUtils.KEY_NAME, "专题"); loadSubjectType(); } }); @@ -171,7 +171,7 @@ public class SubjectActivity extends BaseActivity { if ("tile".equals(headEntity.getTypeEntity().getLayout())) { FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); Bundle clone = (Bundle) mBundle.clone(); - clone.putString("tagType", headEntity.getTag()); + clone.putString(EntranceUtils.KEY_TAGTYPE, headEntity.getTag()); clone.putStringArrayList("contentTitle", new ArrayList<>(headEntity.getTypeEntity().getContent())); mTileFragment = new SubjectTileFragment(); mTileFragment.setArguments(clone); @@ -186,8 +186,8 @@ public class SubjectActivity extends BaseActivity { for (String s : tag) { mTabLayout.addTab(mTabLayout.newTab().setText(s)); Bundle clone = (Bundle) mBundle.clone(); - clone.putString("type", s); - clone.putString("tagType", headEntity.getTag()); + clone.putString(EntranceUtils.KEY_TYPE, s); + clone.putString(EntranceUtils.KEY_TAGTYPE, headEntity.getTag()); fragments.add(SubjectFragment.newInstance(clone)); } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 19669a3d5b..3a0f6c74d1 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -33,6 +33,7 @@ import com.gh.common.util.BitmapUtils; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.LoginUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.PatternUtils; @@ -128,15 +129,15 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt @NonNull public static Intent getIntent(Context context, int suggestType) { Intent intent = new Intent(context, SuggestionActivity.class); - intent.putExtra("suggestType", suggestType); + intent.putExtra(EntranceUtils.KEY_SUGGESTTYPE, suggestType); return intent; } public static void startSuggestionActivity(Context context, int suggestType, String suggestHintType, String content) { Intent intent = new Intent(context, SuggestionActivity.class); - intent.putExtra("suggestType", suggestType); - intent.putExtra("suggestHintType", suggestHintType); - intent.putExtra("content", content); + intent.putExtra(EntranceUtils.KEY_SUGGESTTYPE, suggestType); + intent.putExtra(EntranceUtils.KEY_SUGGEST_HINT_TYPE, suggestHintType); + intent.putExtra(EntranceUtils.KEY_CONTENT, content); context.startActivity(intent); } @@ -183,15 +184,16 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt initTitle(getString(R.string.title_suggestion)); arrType = getResources().getStringArray(R.array.suggestion_type); - curType = getIntent().getExtras().getInt("suggestType"); - String suggestContent = getIntent().getExtras().getString("content"); - String suggestHintType = getIntent().getExtras().getString("suggestHintType"); + Bundle extras = getIntent().getExtras(); + curType = extras.getInt(EntranceUtils.KEY_SUGGESTTYPE); + String suggestContent = extras.getString(EntranceUtils.KEY_CONTENT); + String suggestHintType = extras.getString(EntranceUtils.KEY_SUGGEST_HINT_TYPE); - if (getIntent().getBundleExtra("data") != null) { - Bundle data = getIntent().getBundleExtra("data"); - suggestContent = data.getString("content"); - suggestHintType = data.getString("suggestHintType"); - curType = data.getInt("suggestType"); + Bundle data = getIntent().getBundleExtra(EntranceUtils.KEY_DATA); + if (data != null) { + suggestContent = data.getString(EntranceUtils.KEY_CONTENT); + suggestHintType = data.getString(EntranceUtils.KEY_SUGGEST_HINT_TYPE); + curType = data.getInt(EntranceUtils.KEY_SUGGESTTYPE); } sp = PreferenceManager.getDefaultSharedPreferences(this); diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java index 0f164c6177..975000a4e0 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java @@ -56,13 +56,16 @@ public class UserInfoEditActivity extends BaseActivity implements LoginUtils.onC TextView mSaveTv; - private String mEditType; + private static final String KEY_EDITTYPE = "editType"; + private UserInfoEntity mUserInfoEntity; + private String mEditType; + @NonNull public static Intent getIntent(Context context, String editType) { Intent intent = new Intent(context, UserInfoEditActivity.class); - intent.putExtra("editType", editType); + intent.putExtra(KEY_EDITTYPE, editType); return intent; } @@ -74,7 +77,7 @@ public class UserInfoEditActivity extends BaseActivity implements LoginUtils.onC @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mEditType = getIntent().getStringExtra("editType"); + mEditType = getIntent().getStringExtra(KEY_EDITTYPE); mUserInfoEntity = LoginUtils.getUserInfo(this); // 添加分享图标 diff --git a/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java b/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java index 067079de9b..1930cf6def 100644 --- a/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserRegionActivity.java @@ -9,6 +9,7 @@ import android.text.TextUtils; import android.view.View; import com.gh.base.BaseActivity; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.LoginUtils; import com.gh.gamecenter.region.RegionCounFragment; import com.gh.gamecenter.region.RegionProvFragment; @@ -58,7 +59,7 @@ public class UserRegionActivity extends BaseActivity implements LoginUtils.onCha } else { mProvFragment = alterFragment(transaction, RegionProvFragment.class); Bundle args = new Bundle(); - args.putStringArrayList("provinceList", new ArrayList<>(provinceList)); + args.putStringArrayList(EntranceUtils.KEY_PROLIST, new ArrayList<>(provinceList)); mProvFragment.setArguments(args); initTitle(provinceName); } diff --git a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java index 7c9bf66f30..63d97f6a8d 100644 --- a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java @@ -139,14 +139,14 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener urls = getIntent().getStringArrayListExtra("urls"); int current = getIntent().getIntExtra("current", 0); scaleType = getIntent().getStringExtra("ScaleType"); - if (getIntent().getBundleExtra("data") != null) { - urls = getIntent().getBundleExtra("data").getStringArrayList("urls"); - current = getIntent().getBundleExtra("data").getInt("current", 0); - scaleType = getIntent().getBundleExtra("data").getString("ScaleType"); + if (getIntent().getBundleExtra(EntranceUtils.KEY_DATA) != null) { + urls = getIntent().getBundleExtra(EntranceUtils.KEY_DATA).getStringArrayList("urls"); + current = getIntent().getBundleExtra(EntranceUtils.KEY_DATA).getInt("current", 0); + scaleType = getIntent().getBundleExtra(EntranceUtils.KEY_DATA).getString("ScaleType"); } if (savedInstanceState != null) { - current = savedInstanceState.getInt("currentItem", 0); + current = savedInstanceState.getInt(EntranceUtils.KEY_CURRENTITEM, 0); isOrientation = savedInstanceState.getBoolean("isOrientation"); } @@ -184,7 +184,7 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putInt("currentItem", mViewimageVp.getCurrentItem()); + outState.putInt(EntranceUtils.KEY_CURRENTITEM, mViewimageVp.getCurrentItem()); outState.putBoolean("isOrientation", isOrientation); } diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index 158d4e5c4f..64632215c7 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -24,6 +24,7 @@ import com.gh.base.BaseActivity; import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DialogUtils; +import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.adapter.VoteAdapter; import com.gh.gamecenter.entity.UserDataEntity; import com.gh.gamecenter.entity.VersionVoteEntity; @@ -78,8 +79,8 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR @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); + intent.putExtra(EntranceUtils.KEY_GAMENAME, gameName); + intent.putExtra(EntranceUtils.KEY_GAMEID, gameId); return intent; } @@ -92,8 +93,8 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - String gameName = getIntent().getExtras().getString("gameName"); - mGameId = getIntent().getExtras().getString("gameId"); + String gameName = getIntent().getExtras().getString(EntranceUtils.KEY_GAMENAME); + mGameId = getIntent().getExtras().getString(EntranceUtils.KEY_GAMEID); initTitle(getString(R.string.title_vote_formatable, gameName)); diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java index a4226541ca..4a2c775d78 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java @@ -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 diff --git a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java index a04e4ecb14..ad9cfe4481 100644 --- a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java @@ -29,6 +29,15 @@ import com.sina.weibo.sdk.utils.Utility; */ public class WeiBoShareActivity extends Activity implements WbShareCallback { + + private static final String KET_SHARENEWSTITLE = "shareNewsTitle"; + private static final String KET_SHAREICON = "shareIcon"; + private static final String KET_SHAREGAMENAME = "shareGameName"; + private static final String KET_SHAREURL = "shareUrl"; + private static final String KET_ISPLUGIN = "isPlugin"; + private static final String KET_ISPOPUPWINDOW = "ispopupWindow"; + private static final String KET_ISTOOLSBOX = "isToolsBox"; + private String shareUrl; private String shareGameName; private String shareIcon; @@ -46,13 +55,13 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { Boolean ispopupWindow, boolean isToolsBox) { Intent intent = new Intent(context, WeiBoShareActivity.class); Bundle bundle = new Bundle(); - bundle.putString("shareNewsTitle", shareNewsTitle); - bundle.putString("shareIcon", shareIcon); - bundle.putString("shareGameName", shareGameName); - bundle.putString("shareUrl", shareUrl); - bundle.putBoolean("isPlugin", isPlugin); - bundle.putBoolean("ispopupWindow", ispopupWindow); - bundle.putBoolean("isToolsBox", isToolsBox); + bundle.putString(KET_SHARENEWSTITLE, shareNewsTitle); + bundle.putString(KET_SHAREICON, shareIcon); + bundle.putString(KET_SHAREGAMENAME, shareGameName); + bundle.putString(KET_SHAREURL, shareUrl); + bundle.putBoolean(KET_ISPLUGIN, isPlugin); + bundle.putBoolean(KET_ISPOPUPWINDOW, ispopupWindow); + bundle.putBoolean(KET_ISTOOLSBOX, isToolsBox); intent.putExtras(bundle); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); return intent; @@ -62,13 +71,13 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); Bundle extras = getIntent().getExtras(); - shareUrl = extras.getString("shareUrl"); - shareGameName = extras.getString("shareGameName"); - shareIcon = extras.getString("shareIcon"); - shareNewsTitle = extras.getString("shareNewsTitle"); - isPlugin = extras.getBoolean("isPlugin"); - ispopupWindow = extras.getBoolean("ispopupWindow"); - isToolsBox = extras.getBoolean("isToolsBox"); + shareNewsTitle = extras.getString(KET_SHARENEWSTITLE); + shareIcon = extras.getString(KET_SHAREICON); + shareGameName = extras.getString(KET_SHAREGAMENAME); + shareUrl = extras.getString(KET_SHAREURL); + isPlugin = extras.getBoolean(KET_ISPLUGIN); + ispopupWindow = extras.getBoolean(KET_ISPOPUPWINDOW); + isToolsBox = extras.getBoolean(KET_ISTOOLSBOX); Utils.toast(this, getString(R.string.share_skip)); @@ -95,7 +104,8 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { TextObject textObject = new TextObject(); if (isToolsBox) { textObject.text = shareNewsTitle + "@光环助手"; - } if (ispopupWindow) { + } + if (ispopupWindow) { if (shareNewsTitle != null) { textObject.text = shareNewsTitle + "@光环助手"; } else { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index 142e15dae9..a8f3be2770 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -307,7 +307,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { ,StringUtils.buildString(mEntrance, "+(消息详情)"))); } else { Intent intent = new Intent(mContext, NewsDetailActivity.class); - intent.putExtra("newsId", mConcernEntity.getId()); + intent.putExtra(EntranceUtils.KEY_NEWSID, mConcernEntity.getId()); intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(mEntrance, "+(消息详情)")); mContext.startActivity(intent); } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java index 6a0d16d3f1..ebc7c625b3 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java @@ -16,6 +16,7 @@ import android.widget.TextView; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DialogUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.NetworkUtils; import com.gh.common.util.PackageUtils; import com.gh.common.view.RecyclerViewExtended; @@ -183,11 +184,11 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi @Override protected void initView(View view) { super.initView(view); - String path = getActivity().getIntent().getStringExtra("path"); - url = getActivity().getIntent().getStringExtra("url"); - if (getActivity().getIntent().getBundleExtra("data") != null) { - path = getActivity().getIntent().getBundleExtra("data").getString("path"); - url = getActivity().getIntent().getBundleExtra("data").getString("url"); + String path = getActivity().getIntent().getStringExtra(EntranceUtils.KEY_PATH); + url = getActivity().getIntent().getStringExtra(EntranceUtils.KEY_URL); + if (getActivity().getIntent().getBundleExtra(EntranceUtils.KEY_DATA) != null) { + path = getActivity().getIntent().getBundleExtra(EntranceUtils.KEY_DATA).getString(EntranceUtils.KEY_PATH); + url = getActivity().getIntent().getBundleExtra(EntranceUtils.KEY_DATA).getString(EntranceUtils.KEY_URL); } isScroll = false; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java index 2a3539f587..2f265fc3be 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java @@ -48,9 +48,9 @@ public class GameUpdateFragment extends BaseFragment { Intent intent = getActivity().getIntent(); String packageName = intent.getStringExtra("packageName"); boolean isUpdate = intent.getBooleanExtra("isPushIntent", false); - if (intent.getBundleExtra("data") != null) { - packageName = intent.getBundleExtra("data").getString("packageName"); - isUpdate = intent.getBundleExtra("data").getBoolean("isPushIntent", false); + if (intent.getBundleExtra(EntranceUtils.KEY_DATA) != null) { + packageName = intent.getBundleExtra(EntranceUtils.KEY_DATA).getString("packageName"); + isUpdate = intent.getBundleExtra(EntranceUtils.KEY_DATA).getBoolean("isPushIntent", false); } String entrance = intent.getStringExtra(EntranceUtils.KEY_ENTRANCE); 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 c3e69d4b60..aeaec1abc8 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -17,6 +17,7 @@ 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; @@ -150,7 +151,7 @@ public class SearchToolbarFragment extends BaseFragment implements View.OnClickL super.onCreate(savedInstanceState); if (savedInstanceState != null) { - mHintList = savedInstanceState.getStringArrayList("hint"); + mHintList = savedInstanceState.getStringArrayList(EntranceUtils.KEY_HINT); } mHintIndex = 0; @@ -161,7 +162,7 @@ public class SearchToolbarFragment extends BaseFragment implements View.OnClickL public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); if (mHintList != null && !mHintList.isEmpty()) { - outState.putStringArrayList("hint", mHintList); + outState.putStringArrayList(EntranceUtils.KEY_HINT, mHintList); } } diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java index 2c8c713ba4..478ddaa5c8 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java @@ -16,6 +16,7 @@ import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; +import com.gh.common.util.EntranceUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.GameEntity; @@ -96,7 +97,7 @@ public class KaiFuVpFragment extends BaseFragment { Bundle arguments = getArguments(); if (arguments != null) { mDay = arguments.getString("day"); - mGameId = arguments.getString("gameId", ""); + mGameId = arguments.getString(EntranceUtils.KEY_GAMEID, ""); } else { mGameId = ""; } diff --git a/app/src/main/java/com/gh/gamecenter/kuaichuan/KuaichuanNotification.java b/app/src/main/java/com/gh/gamecenter/kuaichuan/KuaichuanNotification.java index 64951f769f..9ca233cd5b 100644 --- a/app/src/main/java/com/gh/gamecenter/kuaichuan/KuaichuanNotification.java +++ b/app/src/main/java/com/gh/gamecenter/kuaichuan/KuaichuanNotification.java @@ -7,6 +7,7 @@ import android.content.Context; import android.content.Intent; import android.support.v4.app.NotificationCompat; +import com.gh.common.util.EntranceUtils; import com.gh.download.DownloadNotification; import com.gh.gamecenter.R; @@ -21,7 +22,7 @@ public class KuaichuanNotification { public static void showKuaiChuanDoneNotification(Context context, String apkPath, String apkName, String packName) { NotificationManager manager = getNotificationManager(context); Intent intent = new Intent(); - intent.putExtra("path", apkPath); + intent.putExtra(EntranceUtils.KEY_PATH, apkPath); intent.setAction(DownloadNotification.ACTION_INSTALL); PendingIntent pendingIntent = PendingIntent.getBroadcast(context, NOTIFY_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT); diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt index 04a8a5bd2a..ca1e1bf0cd 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt @@ -77,7 +77,7 @@ class LibaoNewAdapter(context: Context, callBackListener: OnRequestCallBackListe } } - override fun onFailure(e: HttpException) { + override fun onFailure(e: HttpException?) { mCallBackListener.loadError() isNetworkError = true isLoading = false diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt index 98a89298b0..581888dcd4 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt @@ -89,7 +89,7 @@ class LibaoSearchAdapter(fragment: LibaoSearchFragment, } } - override fun onFailure(e: HttpException) { + override fun onFailure(e: HttpException?) { mCallBackListener.loadError() isNetworkError = true isLoading = false diff --git a/app/src/main/java/com/gh/gamecenter/login/BaseLoginFragment.java b/app/src/main/java/com/gh/gamecenter/login/BaseLoginFragment.java index ba4c817abd..b7c0f05971 100644 --- a/app/src/main/java/com/gh/gamecenter/login/BaseLoginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/login/BaseLoginFragment.java @@ -17,6 +17,7 @@ import android.widget.TextView; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DialogUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.GetLoginDataUtils; import com.gh.common.util.LoginUtils; import com.gh.common.util.PatternUtils; @@ -93,7 +94,7 @@ public abstract class BaseLoginFragment extends BaseFragment implements LoginUti public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (getArguments() != null) { - mIsOldUserPage = getArguments().getBoolean("isOldUser", false); + mIsOldUserPage = getArguments().getBoolean(EntranceUtils.KEY_OLDERUSER, false); } mLoginPassEt.addTextChangedListener(new LoginTextWatcher(mLoginPassEt)); diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java index b2683e5e3d..52f42b7f5e 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java @@ -8,6 +8,7 @@ import android.view.ViewGroup; import com.gh.base.OnRequestCallBackListener; import com.gh.common.util.CommentUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.gamecenter.CommentDetailActivity; import com.gh.gamecenter.MessageDetailActivity; @@ -197,7 +198,7 @@ public class CommentFragmentAdapter extends BaseRecyclerAdapter { @Override public void onClick(View v) { Intent intent = new Intent(mContext, CommentDetailActivity.class); - intent.putExtra("commentId", commentEntity.getId()); + intent.putExtra(EntranceUtils.KEY_COMMENTID, commentEntity.getId()); mContext.startActivity(intent); EventBus.getDefault().post(new EBUISwitch("commentMarkRead", 0)); } diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java index 1af044f882..56fc345a01 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -297,7 +297,7 @@ public class KeFuFragmentAdapter extends BaseRecyclerAdapter { if (!TextUtils.isEmpty(keFuEntity.getLink().getId())) { Intent intent2 = new Intent(mContext, NewsDetailActivity.class); intent2.putExtra(EntranceUtils.KEY_ENTRANCE, "(消息-公告)"); - intent2.putExtra("newsId", keFuEntity.getLink().getId()); + intent2.putExtra(EntranceUtils.KEY_NEWSID, keFuEntity.getLink().getId()); mContext.startActivity(intent2); } break; diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index 79a01acc44..238b74eaa4 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -264,7 +264,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { break; case "inurl": intent = new Intent(mContext, WebActivity.class); - intent.putExtra("url", uri.getQueryParameter("url")); + intent.putExtra(EntranceUtils.KEY_URL, uri.getQueryParameter("url")); mContext.startActivity(intent); break; case "outurl": @@ -724,7 +724,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { StringUtils.buildString(mEntrance, "+(新闻详情[", mNewsDetailEntity.getTitle(), "])")); } else if ("news".equals(type)) { Intent intent = new Intent(context, NewsDetailActivity.class); - intent.putExtra("newsId", id); + intent.putExtra(EntranceUtils.KEY_NEWSID, id); intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(mEntrance, "+(新闻详情[", mNewsDetailEntity.getTitle(), "])")); context.startActivity(intent); diff --git a/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java index 33c8584df2..bf710f1a00 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java @@ -23,7 +23,7 @@ public class InstallReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - String path = intent.getStringExtra("path"); + String path = intent.getStringExtra(EntranceUtils.KEY_PATH); if (PackageUtils.isCanLaunchSetup(context, path)) { context.startActivity(PackageUtils.getInstallIntent(context, path)); } else { @@ -42,8 +42,8 @@ public class InstallReceiver extends BroadcastReceiver { EventBus.getDefault().post(new EBMiPush("plugin_install", path)); } else { Intent intent2 = new Intent(context, DownloadManagerActivity.class); - intent2.putExtra("currentItem", 0); - intent2.putExtra("path", path); + intent2.putExtra(EntranceUtils.KEY_CURRENTITEM, 0); + intent2.putExtra(EntranceUtils.KEY_PATH, path); intent2.putExtra(EntranceUtils.KEY_ENTRANCE, "(安装跳转)"); intent2.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(intent2); diff --git a/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java b/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java index 2374b33b8b..922f5486e5 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java +++ b/app/src/main/java/com/gh/gamecenter/receiver/NotificationReceiver.java @@ -100,7 +100,7 @@ public class NotificationReceiver extends BroadcastReceiver { EventBus.getDefault().post(new EBMiPush("mipush_plugin", list)); } else { Intent intent2 = new Intent(context, DownloadManagerActivity.class); - intent2.putExtra("currentItem", 1); + intent2.putExtra(EntranceUtils.KEY_CURRENTITEM, 1); intent2.putExtra("isPushIntent", true); intent2.putExtra(EntranceUtils.KEY_ENTRANCE, "(小米推送)"); intent2.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -112,7 +112,7 @@ public class NotificationReceiver extends BroadcastReceiver { intent2.setAction(Intent.ACTION_MAIN); intent2.addCategory(Intent.CATEGORY_LAUNCHER); intent2.putExtra(KEY_TO, DownloadManagerActivity.TAG); - intent2.putExtra("currentItem", 1); + intent2.putExtra(EntranceUtils.KEY_CURRENTITEM, 1); intent2.putExtra("isPushIntent", true); intent2.putExtra(EntranceUtils.KEY_ENTRANCE, "(小米推送)"); intent2.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); diff --git a/app/src/main/java/com/gh/gamecenter/region/RegionProvFragment.java b/app/src/main/java/com/gh/gamecenter/region/RegionProvFragment.java index 1bbc09ced8..6990dac63a 100644 --- a/app/src/main/java/com/gh/gamecenter/region/RegionProvFragment.java +++ b/app/src/main/java/com/gh/gamecenter/region/RegionProvFragment.java @@ -7,6 +7,7 @@ import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import com.gh.base.fragment.BaseFragment; +import com.gh.common.util.EntranceUtils; import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.R; import com.gh.gamecenter.UserRegionActivity; @@ -36,8 +37,8 @@ public class RegionProvFragment extends BaseFragment implements OnRegionSelectLi mRecyclerView.addItemDecoration(new VerticalItemDecoration(getContext(), 1, false)); Bundle arguments = getArguments(); - if (arguments != null && arguments.getStringArrayList("provinceList") != null) { - mRecyclerView.setAdapter(new RegionProvAdapter(getContext(), arguments.getStringArrayList("provinceList"), this)); + if (arguments != null && arguments.getStringArrayList(EntranceUtils.KEY_PROLIST) != null) { + mRecyclerView.setAdapter(new RegionProvAdapter(getContext(), arguments.getStringArrayList(EntranceUtils.KEY_PROLIST), this)); } } diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/Response.java b/app/src/main/java/com/gh/gamecenter/retrofit/Response.java index d4aeec70e4..961906811f 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/Response.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/Response.java @@ -30,7 +30,7 @@ public class Response extends Subscriber { if (e instanceof HttpException) { onFailure((HttpException) e); } else { - onFailure(null); + onFailure(null); // 注意kotlin的no-null限制 } } diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java index d74ccea431..082a82a3a6 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java @@ -104,12 +104,12 @@ public class SubjectFragment extends BaseFragment { public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); Bundle arguments = getArguments(); - mId = arguments.getString("id"); - mName = arguments.getString("name"); - mIsOrder = arguments.getBoolean("order"); - mType = arguments.getString("type"); - mListOrder = arguments.getString("listOrder"); - mTagType = arguments.getString("tagType"); + mId = arguments.getString(EntranceUtils.KEY_ID); + mName = arguments.getString(EntranceUtils.KEY_NAME); + mIsOrder = arguments.getBoolean(EntranceUtils.KEY_ORDER); + mType = arguments.getString(EntranceUtils.KEY_TYPE); + mListOrder = arguments.getString(SubjectTileFragment.KEY_LISTORDER); + mTagType = arguments.getString(EntranceUtils.KEY_TAGTYPE); mEntrance = arguments.getString(EntranceUtils.KEY_ENTRANCE); reuse_no_connection.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java index f18abc5eb5..19a38d0874 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectTileFragment.java @@ -19,6 +19,7 @@ import android.widget.TextView; import com.gh.base.fragment.BaseFragment; import com.gh.common.util.DisplayUtils; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.StringUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.SubjectTypeAdapter; @@ -53,6 +54,9 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap TextView mActionBarTitle; + public final static String OPEN_APPBAR = "openAppBar"; + public final static String KEY_LISTORDER = "listOrder"; + private String mName; private String mType; private String mListOrder; @@ -60,8 +64,6 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap private boolean mIsTouchScreen = false; - public final static String OPEN_APPBAR = "openAppBar"; - public void loadData() { FragmentTransaction transaction = getChildFragmentManager().beginTransaction(); hideFragments(transaction); @@ -88,9 +90,9 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap fragmentByTag = new SubjectFragment(); Bundle mBundle = getActivity().getIntent().getExtras(); Bundle clone = (Bundle) mBundle.clone(); - clone.putString("tagType",mTagType); - clone.putString("listOrder", mListOrder); - clone.putString("type", mType); + clone.putString(EntranceUtils.KEY_TAGTYPE,mTagType); + clone.putString(KEY_LISTORDER, mListOrder); + clone.putString(EntranceUtils.KEY_TYPE, mType); fragmentByTag.setArguments(clone); transaction.add(R.id.subject_content_rl, fragmentByTag, fmTag); } @@ -111,9 +113,9 @@ public class SubjectTileFragment extends BaseFragment implements SubjectTypeAdap mActionBarTitle = (TextView) getActivity().findViewById(R.id.actionbar_tv_title); - mName = arguments.getString("name"); - mEntrance = arguments.getString("entrance"); - mTagType = arguments.getString("tagType"); + mName = arguments.getString(EntranceUtils.KEY_NAME); + mEntrance = arguments.getString(EntranceUtils.KEY_ENTRANCE); + mTagType = arguments.getString(EntranceUtils.KEY_TAGTYPE); ArrayList contentTitle = arguments.getStringArrayList("contentTitle");