From 65644508b9d7420cbefa1f4ac3f20b2013ce4631 Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Wed, 8 Apr 2020 10:39:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=9C=BA=E9=83=A8=E5=88=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/erban/MainActivity.java | 7 ++-- .../erban/home/fragment/GameHomeFragment.java | 5 +++ .../drawable/shape_white_ranking_round.xml | 11 +++++ .../main/res/layout/fragment_game_home.xml | 39 +++++++++++++----- .../main/res/mipmap-xhdpi/ic_home_ranking.png | Bin 0 -> 846 bytes app/src/main/res/values/strings.xml | 1 + .../community/square/SquareFragment.java | 23 +++++++++-- .../erban/quick_pass/QuickPassLoginAct.java | 5 --- 8 files changed, 70 insertions(+), 21 deletions(-) create mode 100644 app/src/main/res/drawable/shape_white_ranking_round.xml create mode 100644 app/src/main/res/mipmap-xhdpi/ic_home_ranking.png diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 169daf51f..4524dfe31 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -58,6 +58,7 @@ import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity; import com.yizhuan.erban.community.holder.DynamicSysHolder; import com.yizhuan.erban.community.im.WorldDynamicShareViewHolder; import com.yizhuan.erban.community.publish.view.PublishActivity; +import com.yizhuan.erban.community.square.SquareFragment; import com.yizhuan.erban.decoration.view.widgets.ShowCarGuideDialog; import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; import com.yizhuan.erban.guide.GuideActivity; @@ -968,7 +969,7 @@ public class MainActivity extends BaseMvpActivity FragmentManager fragmentManager = getSupportFragmentManager(); FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); //Fragment mainFragment = fragmentManager.findFragmentByTag(MainFragment.TAG); - Fragment attentionFragment = fragmentManager.findFragmentByTag(FindTabFragment.TAG); + Fragment attentionFragment = fragmentManager.findFragmentByTag(SquareFragment.TAG); // Fragment msgFragment = fragmentManager.findFragmentByTag(MsgFragment.TAG); Fragment contactFragment = fragmentManager.findFragmentByTag(ContactsListFragment.TAG); Fragment meFragment = fragmentManager.findFragmentByTag(MeFragment.TAG); @@ -1012,8 +1013,8 @@ public class MainActivity extends BaseMvpActivity // fragmentTransaction.show(mainFragment); } else if (position == MainTabLayout.MAIN_TAB_POS_ATTENTION) { if (attentionFragment == null) { - attentionFragment = new FindTabFragment(); - fragmentTransaction.add(R.id.main_fragment, attentionFragment, FindTabFragment.TAG); + attentionFragment = new SquareFragment(); + fragmentTransaction.add(R.id.main_fragment, attentionFragment, SquareFragment.TAG); } fragmentTransaction.show(attentionFragment); } else if (position == MainTabLayout.MAIN_TAB_POS_MSG) { 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 3a1ab5ff7..cd7119697 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 @@ -213,6 +213,11 @@ public class GameHomeFragment extends BaseMvpFragment + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_game_home.xml b/app/src/main/res/layout/fragment_game_home.xml index 3d376e692..4cd6cc234 100644 --- a/app/src/main/res/layout/fragment_game_home.xml +++ b/app/src/main/res/layout/fragment_game_home.xml @@ -141,20 +141,38 @@ + android:text="@string/search_hint" + android:textColor="@color/white" + android:textSize="@dimen/sp_13" /> + + @@ -175,7 +194,7 @@ android:onClick="@{click}" android:layout_marginEnd="@dimen/dp_10" android:scaleType="centerInside" - android:visibility="@{open_visible ? View.VISIBLE : View.GONE}" + android:visibility="gone" android:src="@mipmap/ic_open_room" /> diff --git a/app/src/main/res/mipmap-xhdpi/ic_home_ranking.png b/app/src/main/res/mipmap-xhdpi/ic_home_ranking.png new file mode 100644 index 0000000000000000000000000000000000000000..be4d42876be22f98a1e1d05c7028ca2288149831 GIT binary patch literal 846 zcmV-U1F`&xP)@BejO|Lgwd=I7@R@;|b6{cs*!w7(MAUTm?F@$TTaInwfP&ISPe81(3W+BMYSW- zJQKVROIJnZ_b6v~;<1H}hmDSvIKMW2jHqoNmWD~=#D1+B{b?FNJK-g4UYjq%J3Sz} zAA|RMYW4PEK1U7L>+1$N^Cm8z5zzjn-f%8MZquz`&Nw9r9j(1#sCrFL$`QFVUo z1;;%eD{K8C?NobX<&xWFMCQ(IO-7bp_N1h}J$P6?JQevmV$8XcB|# Y0ln4w<;$2A7XSbN07*qoM6N<$f^~nGTmS$7 literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 58372622f..83246de7d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -867,6 +867,7 @@ 我的房间 收藏房间 + 榜单 diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java index e463ea4ea..ba656637d 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java @@ -14,10 +14,14 @@ import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; import com.yizhuan.erban.base.BaseFragment; import com.yizhuan.erban.common.widget.DragLayout; import com.yizhuan.erban.community.publish.view.PublishActivity; +import com.yizhuan.erban.home.adapter.TopMagicIndicatorAdapter; import com.yizhuan.erban.home.fragment.FindTabFragment; +import com.yizhuan.erban.home.view.IFindTabFragmentView; import com.yizhuan.erban.ui.indicator_impl.IndicatorHelper; import com.yizhuan.erban.ui.widget.OnPageSelectedListener; import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; +import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; +import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import com.yizhuan.xchat_android_core.statistic.StatisticManager; import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; @@ -31,8 +35,8 @@ import butterknife.Unbinder; /** * create by lvzebiao @2020/1/7 */ -public class SquareFragment extends BaseFragment { - +public class SquareFragment extends BaseFragment implements TopMagicIndicatorAdapter.OnItemSelectListener{ + public static final String TAG = "SquareFragment"; /** * 推荐 */ @@ -81,8 +85,15 @@ public class SquareFragment extends BaseFragment { } }); + CommonNavigator commonNavigator = new CommonNavigator(getContext()); + TopMagicIndicatorAdapter magicIndicatorAdapter = new TopMagicIndicatorAdapter(getContext(), tagList); + magicIndicatorAdapter.setOnItemSelectListener(this); + + commonNavigator.setAdapter(magicIndicatorAdapter); + magicIndicator.setNavigator(commonNavigator); + //init indicator - IndicatorHelper.handle(getContext(), viewPager, magicIndicator, tagList); + ViewPagerHelper.bind(magicIndicator, viewPager); tvScrollTop.setOnClickListener(new View.OnClickListener() { @Override @@ -101,6 +112,11 @@ public class SquareFragment extends BaseFragment { } + @Override + public void onItemSelect(int position) { + viewPager.setCurrentItem(position); + } + @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { @@ -109,6 +125,7 @@ public class SquareFragment extends BaseFragment { return mView; } + @Override public void onDestroyView() { super.onDestroyView(); diff --git a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java index 5d1bd1ef3..65c612cf8 100644 --- a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java +++ b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java @@ -70,7 +70,6 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe private QuickLogin login;// BUSINESS_ID为从易盾官网申请的业务id private LinearLayout containerThirdPart; - private View vDivider; private ImageView phoneLogin; @@ -101,7 +100,6 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe setProtocol(); containerThirdPart = findViewById(R.id.container_third_part); - vDivider = findViewById(R.id.v_divider_third_part); wxLogin = findViewById(R.id.img_wx_login); qqLogin = findViewById(R.id.img_qq_login); tvLoginTip = findViewById(R.id.tv_login_tip); @@ -291,9 +289,6 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe containerThirdPart.setVisibility(isShowWechat || isShowQq ? View.VISIBLE : View.INVISIBLE); } - if (vDivider != null) { - vDivider.setVisibility(isShowWechat && isShowQq ? View.VISIBLE : View.GONE); - } super.showThirdPartLogin(isShowWechat, isShowQq); }