diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java index 8e0be2c8b7..c715ec3a1f 100755 --- a/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java +++ b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java @@ -34,6 +34,10 @@ public abstract class BaseFragment_ViewPager_Checkable extends BaseFragment_View @IdRes protected abstract int getCheckableGroupId(); + protected boolean getSmoothScroll() { + return false; + } + @Override public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); @@ -75,7 +79,7 @@ public abstract class BaseFragment_ViewPager_Checkable extends BaseFragment_View protected boolean handleOnClick(View view) { final int toCheck = mCheckableGroup.indexOfChild(view); if (toCheck != -1) { - mViewPager.setCurrentItem(toCheck, false); + mViewPager.setCurrentItem(toCheck, getSmoothScroll()); return true; } return super.handleOnClick(view); diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index 662e7af179..9e96d16cbf 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -63,8 +63,6 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList TextView downloadmanager_update_number; @BindView(R.id.downloadmanager_ll_download) LinearLayout downloadmanager_ll_download; - @BindView(R.id.downloadmanager_ll_send) - LinearLayout downloadmanager_ll_send; @BindView(R.id.downloadmanager_ll_update) LinearLayout downloadmanager_ll_update; @BindView(R.id.downloadmanager_slide_line) @@ -112,7 +110,7 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList downloadmanager_ll_download.setOnClickListener(this); downloadmanager_ll_update.setOnClickListener(this); - downloadmanager_ll_send.setOnClickListener(this); + downloadmanager_tv_send.setOnClickListener(this); int updateSize = PackageManager.getUpdateList().size(); if (updateSize != 0) { @@ -192,7 +190,7 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList @Override public void onClick(View view) { switch (view.getId()) { - case R.id.downloadmanager_ll_send: + case R.id.downloadmanager_tv_send: downloadmanager_viewPager.setCurrentItem(INDEX_SEND); break; case R.id.downloadmanager_ll_download: diff --git a/app/src/main/java/com/gh/gamecenter/fragment/NewsFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/NewsFragment.java index 636ff5a57d..7680eab5a0 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/NewsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/NewsFragment.java @@ -56,6 +56,11 @@ public class NewsFragment extends BaseFragment_ViewPager_Checkable { return R.id.lightgame_tab_viewpager; } + @Override + protected boolean getSmoothScroll() { + return true; + } + @Override protected void initFragmentList(List fragments) { fragments.add(new News1Fragment()); @@ -105,6 +110,7 @@ public class NewsFragment extends BaseFragment_ViewPager_Checkable { @Override protected void onPageChanged(int index) { super.onPageChanged(index); + EventBus.getDefault().post(new EBUISwitch(EB_NEWSFRAGMENT_TAG, index)); if (index == 0) { DataCollectionUtils.uploadPosition(getActivity(), "资讯", "1", "资讯"); } else if (index == 1) { diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java index 9c3e4f25ad..95bd0d65c4 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java @@ -6,6 +6,7 @@ import android.support.annotation.Nullable; import android.support.v4.app.Fragment; import android.util.DisplayMetrics; import android.view.View; +import android.widget.CheckedTextView; import android.widget.LinearLayout; import android.widget.TextView; @@ -53,6 +54,12 @@ public class MessageFragment extends BaseFragment_ViewPager_Checkable { @BindView(R.id.message_slide_line) View mMessageSlideLine; + @BindView(R.id.message_comment_tv) + CheckedTextView mMessageCommentTv; + + @BindView(R.id.message_kefu_tv) + CheckedTextView mMessageKefuTv; + private LinearLayout.LayoutParams mLayoutParams; private int mWidth; private int mKeFuUnreadCount; @@ -72,6 +79,11 @@ public class MessageFragment extends BaseFragment_ViewPager_Checkable { return R.id.lightgame_tab_viewpager; } + @Override + protected boolean getSmoothScroll() { + return true; + } + @Override protected void initFragmentList(List fragments) { fragments.add(new CommentFragment()); @@ -206,6 +218,14 @@ public class MessageFragment extends BaseFragment_ViewPager_Checkable { protected void onPageChanged(int index) { super.onPageChanged(index); EventBus.getDefault().post(new EBUISwitch(EB_MESSAGEFRAGMENT_TAG, index)); + + if (index == 0) { + mMessageCommentTv.setChecked(true); + mMessageKefuTv.setChecked(false); + } else { + mMessageCommentTv.setChecked(false); + mMessageKefuTv.setChecked(true); + } } } diff --git a/app/src/main/res/color/text_tabbar_style.xml b/app/src/main/res/color/text_tabbar_style.xml index 5f74c6086e..9d6a46db31 100644 --- a/app/src/main/res/color/text_tabbar_style.xml +++ b/app/src/main/res/color/text_tabbar_style.xml @@ -4,6 +4,7 @@ + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_downloadmanager.xml b/app/src/main/res/layout/activity_downloadmanager.xml index dd7ccfcb46..f2d8de1473 100644 --- a/app/src/main/res/layout/activity_downloadmanager.xml +++ b/app/src/main/res/layout/activity_downloadmanager.xml @@ -6,94 +6,82 @@ - + android:orientation = "horizontal" > - + + - - - - - - - - - - - - - - - - - - + android:textColor = "@android:color/white" + android:textSize = "10sp" /> - - + + + + + + + + + + + + - - - - - + android:background = "@android:color/white" + android:gravity = "center" + android:text = "@string/title_message_center" + android:textColor = "@color/title" + android:textSize = "17sp" /> + android:textSize = "15sp" + android:checked="true"/> + fresco:roundedCornerRadius = "10dp" + style="@style/frescoStyle"/>