diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index f4c1d76347..7d205b7d3f 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -42,6 +42,19 @@ public class GameDetailActivity extends NormalActivity { bundle.putString(EntranceUtils.KEY_GAMEID, gameId); bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); // context.startActivity(new IntentFactory.Builder(context).setActivity(GameDetailActivity.class) +// .setFragment(GameDetailFragment.class).setArgs(bundle).build()); + context.startActivity(getTargetIntent(context, GameDetailActivity.class, GameDetailFragment.class, bundle)); + } + + /** + * @param switchToFirstTag 是否跳转到动态 tab + */ + public static void startGameDetailActivity(Context context, String gameId, String entrance, boolean switchToFirstTag) { + Bundle bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_GAMEID, gameId); + bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + bundle.putBoolean(EntranceUtils.KEY_TARGET, switchToFirstTag); +// context.startActivity(new IntentFactory.Builder(context).setActivity(GameDetailActivity.class) // .setFragment(GameDetailFragment.class).setArgs(bundle).build()); context.startActivity(getTargetIntent(context, GameDetailActivity.class, GameDetailFragment.class, bundle)); } 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 13822d745c..ab31d536e5 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java @@ -428,7 +428,7 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadClick(mContext, "列表", "我的光环-我的游戏", gameEntity.getName()); - GameDetailActivity.startGameDetailActivity(mContext, gameEntity.getId(), "(我的光环:我的游戏)"); + GameDetailActivity.startGameDetailActivity(mContext, gameEntity.getId(), "(我的光环:我的游戏)", true); } } }); diff --git a/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AskQuestionsNewRepository.java b/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AskQuestionsNewRepository.java index 826012838c..3e1ac97d04 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AskQuestionsNewRepository.java +++ b/app/src/main/java/com/gh/gamecenter/ask/viewmodel/AskQuestionsNewRepository.java @@ -83,9 +83,9 @@ public class AskQuestionsNewRepository { public void onResponse(List response) { super.onResponse(response); AskTagGroupsEntity tagGroupsEntity = new AskTagGroupsEntity(); - tagGroupsEntity.setIcon("res:///" + R.drawable.ask_tab_all_icon); + tagGroupsEntity.setIcon("res:///" + R.drawable.ask_tab_new_icon); tagGroupsEntity.setOrder(0); - tagGroupsEntity.setName("全部"); + tagGroupsEntity.setName("最新"); response.add(0, tagGroupsEntity); if (userEntity != null) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java index 4e8cb4eb52..636d532040 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java @@ -115,6 +115,7 @@ public class GameDetailFragment extends NormalFragment { private boolean mIsTouchScreen = false; private boolean mIsShowKaifuHint; private boolean mIsScrollToKaiFu; + private boolean mSwitchToFirstTabInStartup; private int mCurVpPosition; private DataWatcher dataWatcher = new DataWatcher() { @@ -162,6 +163,7 @@ public class GameDetailFragment extends NormalFragment { mGameId = args.getString(EntranceUtils.KEY_GAMEID); mEntrance = args.getString(EntranceUtils.KEY_ENTRANCE); + mSwitchToFirstTabInStartup = args.getBoolean(EntranceUtils.KEY_TARGET); if (mGameId == null) { mGameEntity = args.getParcelable(GameEntity.TAG); @@ -415,6 +417,8 @@ public class GameDetailFragment extends NormalFragment { if (mGameDetailEntity.getUserData() == null || !mGameDetailEntity.getUserData().isGameConcerned()) { mTanBarXinXiTv.performClick(); } + + if (mSwitchToFirstTabInStartup) mViewPager.setCurrentItem(0); } }); } diff --git a/app/src/main/res/drawable-xhdpi/ask_tab_all_icon.png b/app/src/main/res/drawable-xhdpi/ask_tab_all_icon.png deleted file mode 100644 index 9f51e524f3..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ask_tab_all_icon.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ask_tab_new_icon.png b/app/src/main/res/drawable-xhdpi/ask_tab_new_icon.png new file mode 100644 index 0000000000..a13e1f5f3f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ask_tab_new_icon.png differ diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml index bd33832a25..072284d5f6 100644 --- a/app/src/main/res/layout/fragment_setting.xml +++ b/app/src/main/res/layout/fragment_setting.xml @@ -171,7 +171,6 @@ android:layout_centerVertical = "true" android:paddingBottom = "2dp" android:paddingLeft = "8dp" - android:paddingRight = "8dp" android:paddingTop = "2dp" android:textColor = "@color/hint" android:textSize = "12sp" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e15456bd67..24e31eca68 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -292,7 +292,7 @@ 今天开服 明天开服 后续开服 - 精品 + 原创 手机登录 插件 请先登录