From a735fde8a27c23de81bdf29ee53a33d536f12de1 Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Fri, 3 Apr 2020 19:21:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/erban/MainActivity.java | 16 +++++----- .../adapter/ContactsIndicatorAdapter.java | 8 ++--- .../home/fragment/ContactsListFragment.java | 4 ++- .../erban/home/fragment/GameHomeFragment.java | 1 - .../main/res/layout/fragment_game_home.xml | 8 ++--- app/src/main/res/layout/fragment_me.xml | 30 ++++++++++++------- app/src/main/res/values/colors.xml | 4 ++- gradle.properties | 4 +-- 8 files changed, 44 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index c437f5a96..f4071bb48 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -62,6 +62,7 @@ import com.yizhuan.erban.decoration.view.widgets.ShowCarGuideDialog; import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; import com.yizhuan.erban.guide.GuideActivity; import com.yizhuan.erban.home.dialog.RecommendRoomForNewerDialog; +import com.yizhuan.erban.home.fragment.ContactsListFragment; import com.yizhuan.erban.home.fragment.FindTabFragment; import com.yizhuan.erban.home.fragment.GameHomeFragment; import com.yizhuan.erban.home.fragment.MeFragment; @@ -962,7 +963,8 @@ public class MainActivity extends BaseMvpActivity FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); //Fragment mainFragment = fragmentManager.findFragmentByTag(MainFragment.TAG); Fragment attentionFragment = fragmentManager.findFragmentByTag(FindTabFragment.TAG); - Fragment msgFragment = fragmentManager.findFragmentByTag(MsgFragment.TAG); +// Fragment msgFragment = fragmentManager.findFragmentByTag(MsgFragment.TAG); + Fragment contactFragment = fragmentManager.findFragmentByTag(ContactsListFragment.TAG); Fragment meFragment = fragmentManager.findFragmentByTag(MeFragment.TAG); Fragment rankingFragment = fragmentManager.findFragmentByTag(RankingFragment.TAG); Fragment gameFragment = fragmentManager.findFragmentByTag(GameHomeFragment.TAG); @@ -973,8 +975,8 @@ public class MainActivity extends BaseMvpActivity if (attentionFragment != null && attentionFragment.isVisible()) { fragmentTransaction.hide(attentionFragment); } - if (msgFragment != null && msgFragment.isVisible()) { - fragmentTransaction.hide(msgFragment); + if (contactFragment != null && contactFragment.isVisible()) { + fragmentTransaction.hide(contactFragment); } if (meFragment != null && meFragment.isVisible()) { fragmentTransaction.hide(meFragment); @@ -1009,11 +1011,11 @@ public class MainActivity extends BaseMvpActivity } fragmentTransaction.show(attentionFragment); } else if (position == MainTabLayout.MAIN_TAB_POS_MSG) { - if (msgFragment == null) { - msgFragment = new MsgFragment(); - fragmentTransaction.add(R.id.main_fragment, msgFragment, MsgFragment.TAG); + if (contactFragment == null) { + contactFragment = new ContactsListFragment(); + fragmentTransaction.add(R.id.main_fragment, contactFragment, ContactsListFragment.TAG); } - fragmentTransaction.show(msgFragment); + fragmentTransaction.show(contactFragment); } else if (position == MainTabLayout.MAIN_TAB_POS_ME) { if (meFragment == null) { meFragment = new MeFragment(); diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java index cef191c7b..a82e6ca2d 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java @@ -56,10 +56,10 @@ public class ContactsIndicatorAdapter extends CommonNavigatorAdapter { public IPagerIndicator getIndicator(Context context) { LinePagerIndicator indicator = new LinePagerIndicator(context); indicator.setMode(LinePagerIndicator.MODE_EXACTLY); - indicator.setLineHeight(UIUtil.dip2px(mContext, 3)); - indicator.setRoundRadius(UIUtil.dip2px(mContext, 2)); - indicator.setLineWidth(UIUtil.dip2px(mContext, 12)); - indicator.setColors(context.getResources().getColor(R.color.color_34EBDE)); + indicator.setLineHeight(UIUtil.dip2px(mContext, 5)); + indicator.setRoundRadius(UIUtil.dip2px(mContext, 5)); + indicator.setLineWidth(UIUtil.dip2px(mContext, 9)); + indicator.setColors(context.getResources().getColor(R.color.color_7154EE)); FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); lp.bottomMargin = mBottomMargin; indicator.setLayoutParams(lp); diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.java index dfcb3fa26..fb704e87e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.java @@ -28,7 +28,7 @@ import java.util.List; * @Date 2018/11/1 */ public class ContactsListFragment extends BaseFragment implements ContactsIndicatorAdapter.OnItemSelectListener { - + public static final String TAG = "ContactsListFragment"; private MagicIndicator indicator; private ViewPager viewpager; @@ -52,11 +52,13 @@ public class ContactsListFragment extends BaseFragment implements ContactsIndica @Override public void initiate() { List tabInfoList = new ArrayList<>(); + tabInfoList.add(getString(R.string.message)); tabInfoList.add(getString(R.string.friend)); tabInfoList.add(getString(R.string.attention)); tabInfoList.add(getString(R.string.fan)); List mTabs = new ArrayList<>(); + mTabs.add(RecentListFragment.newInstance(false)); mTabs.add(new FriendListFragment()); mTabs.add(AttentionFragment.newInstance(AbstractSelectFriendAction.TYPE_NORMAL)); mTabs.add(FansListFragment.newInstance(Constants.FAN_MAIN_PAGE_TYPE)); diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java index 8909f14d0..6b843c3f4 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java @@ -805,7 +805,6 @@ public class GameHomeFragment extends BaseMvpFragment { diff --git a/app/src/main/res/layout/fragment_game_home.xml b/app/src/main/res/layout/fragment_game_home.xml index a14e46b03..af3bc7d37 100644 --- a/app/src/main/res/layout/fragment_game_home.xml +++ b/app/src/main/res/layout/fragment_game_home.xml @@ -29,7 +29,6 @@ @@ -47,7 +46,6 @@ android:scaleType="fitXY" app:layout_constraintTop_toTopOf="parent" /> - + app:constraint_referenced_ids="roll_view" /> @@ -135,13 +134,14 @@ - - - - @@ -342,10 +338,20 @@ - + + + + + + @@ -364,6 +370,7 @@ android:drawableTop="@mipmap/icon_my_room" android:textColor="@color/color_CEC0FF" android:drawablePadding="@dimen/dp_3" + android:textSize="@dimen/sp_11" /> @@ -383,6 +390,7 @@ android:text="@string/collect_room" android:drawablePadding="@dimen/dp_3" android:textColor="@color/color_CEC0FF" + android:textSize="@dimen/sp_11" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 14caca304..7a1e61fd6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -256,7 +256,7 @@ #E6000000 - #7154EE + #333333 #666666 #ffc160 @@ -487,6 +487,8 @@ #9af5ef + #7154EE + #34EBDE #39EBDF diff --git a/gradle.properties b/gradle.properties index c5ca83424..80780ea41 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,8 +20,8 @@ org.gradle.daemon=true android.enableD8=true android.injected.testOnly=false # CI jenkins 参数化构建传入参数 -version_name=1.3.5 -version_code=14 +version_name=1.0.0 +version_code=1 # jenkins打包参数 可选值 arm x86 arm_x86 ndk_abi_filters=arm # jenkins参数，debug下打渠道包用到，