From df78db56864490dd90f1c1083c93731e71fdfd1b Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Thu, 19 Apr 2018 16:42:08 +0800
Subject: [PATCH] =?UTF-8?q?UI=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/gamecenter/GameDetailActivity.java    |  13 +++++++++++++
 .../adapter/InstallFragmentAdapter.java          |   2 +-
 .../ask/viewmodel/AskQuestionsNewRepository.java |   4 ++--
 .../gamedetail/GameDetailFragment.java           |   4 ++++
 .../main/res/drawable-xhdpi/ask_tab_all_icon.png | Bin 1718 -> 0 bytes
 .../main/res/drawable-xhdpi/ask_tab_new_icon.png | Bin 0 -> 2392 bytes
 app/src/main/res/layout/fragment_setting.xml     |   1 -
 app/src/main/res/values/strings.xml              |   2 +-
 8 files changed, 21 insertions(+), 5 deletions(-)
 delete mode 100644 app/src/main/res/drawable-xhdpi/ask_tab_all_icon.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ask_tab_new_icon.png

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<ViewHolder> {
 
                     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<AskTagGroupsEntity> 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 9f51e524f3caf21abefd6e2b2ac1f8ba17042970..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1718
zcmaJ?Yfuwc6b@Ao5Ju?8!+^{Zkph+MZUQ751DGcS4Fdr*V2dot22w~iY!(w3u{43!
zC-{O|L8Z2|Rwxf;R306rb&67~jw4e<g${^l3%=_EVWu18(I3{GyL<0FbG~!G^PO{N
zw<pBMxH{9FX*8OvELN<b=2+Y7=s<l_#!tmi(=t+`B$IFrX+jB%CQ##<7$DQ3S(pMt
z)dhK%Fg}g8AV{06B$e`YJQc2EqBb9<S!bZoG#WqJY(P~x7zt!zSz3K0<6-+b2B1|(
zGB$+EA-O?>Wou&#2`s5FK3P?mqe9e-=qP}1=1~E37>NRAU9R59Ge<I}<MODr%?vVt
zX%{jllJSO=Ql0>aZ~_CunGvBXn9T(^2onxRxU8^M01JX6KnMZhuuur*K?o0mftiOv
zokplNJcU>~a~8FWWMq@1fd_&nlZk0!GjSpdgb@S*Ar{DDg;E}&#sWQwnnU%*6|)h<
zm{CP&4Wt&=1Gb20CZ115GAO2RQqURX^0~lz<BU+0WS|)}fG`sRbvj#K)80l>fz8u+
ztG6+^z<_}Y%!ua`Dyklu6|-PUyLTUCbEMet#JDP7hv`X~IFdnGm};$>$Cik~U;!kA
zg-AFIOSoJPA{Dc^LJkD6AvOZdVr6<GiRx9@ELJ;@6}%J66A>6n;zTlz=gw9yAsZ)g
zV>WI8L?T<YI6#mbRcZA$W3Wx&8NL{y-HfTF1g-<772;{%!Xiw_l1QW+L?mSisSG$=
zk$@!@upwat6duOrz>FEJ`YqYdU<Ln+1t~J1t-Sv!_pFKPA=`4Ud8y4@`(t{l=LxF0
zed=B`QFkUlCKe={`^Ty;uT4(${^H@~F{|@NWoTg7@!pa^p_`yC0!>ybT7&MjOWd(>
z4WhH`h;XQFxo;)je_iwOr-H=iooki`_PV+6m84d3r_%2}=olR^K0fk?(^ioG5qH$(
z>F?|=V_8Sc6wx{c_rO-?plz0*Y`RL5oE5mCzH2z3&!y6u8r(6u0dg!n@0xLH?e*f@
z8B4Mq@`LZd4g<wo4Gjmbl$E$Xk+*x_ssDA@PdW5xaogg}#e?puyH>lV0o3ndr!=+@
zUFk@OyNyjs)boX9%6+P+M&w^^Vy*VSUv-&I#>vVqL^WNzdPXWM6EEOu+GFvg^u=fB
z{j0xQy<~rlbmRiPE}-1wv}H2nhCHX@>A^0e+mani#ez4(#rYU8Kb&_)cNa{uTFOI4
zAKzGil|6FdNI<U1!+P4n{4j7ORv9H43<ujZm7AaSIk&y%7qT*c;V$oqC=0We|DdEO
z@oP)mt1+(M#`F1I>@2UdbasP}uS4|mE7gZz-r9fS_|{wYC)PFe(J$`%IgQ?1)|{aW
zE(V>_KPc@PuW{;$_b+#XTqgYQ)@t`e_xfnuUT(sN_xv)$HpM5Ry)TX5-^l_Gr@b;g
z3gZg5#64=OJ?UZfY$Sg8<b?mZc-Kq%9i<a_nF6;YFJJGQ%Zm`A0kLDI?yAW9zSB3R
z_2Tv^K)gH6$x_|_XTVSKsON9vCkMQdERQE<T7=+Q38m&5O3i`<{9cZurcB!MS^P~&
zVdD_*?0NQJz~AIc74}c7+;XUbvoq!M=bj_{L%H_a!LdVCO}A544I$eWN#>MvuupWG
zAEl+w&y~EgxlJ~CJX?=6qoUV)2){<1y~oo1Au%1B1gTeb8wFV%-Q&#NXC2d*P52c&
z_Nu?;{MC<M^$RPWq_+08*ljUXUzZ#BnjU|{CPBPU)QfM!gHA>qz2xCFly|-Ez|oQN
z$s9$jw7XqV_2tfE3o0A;R_TcLb$_i_?2G%RANH#+I<v-fuv#f_Ibx+c)we6!&ViN^
V(%igg*tOaACy`0w#SOv?%fIJsgZTge

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 0000000000000000000000000000000000000000..a13e1f5f3f9a2acb16cae5298129c9836b1edda5
GIT binary patch
literal 2392
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

literal 0
HcmV?d00001

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 @@
     <string name = "kaifu_today" >今天开服</string >
     <string name = "kaifu_tomorrow" >明天开服</string >
     <string name = "kaifu_future" >后续开服</string >
-    <string name = "article_gonglve_hint" >精品</string >
+    <string name = "article_gonglve_hint" >原创</string >
     <string name = "personal_default_username" >手机登录</string >
     <string name = "home_entrance_default_text" >插件</string >
     <string name = "login_hint" >请先登录</string >