From dc1436008ea43ee1746325dd6d7f5cd436f529e7 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Tue, 6 Jun 2023 16:08:58 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]viewpager=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/dialog/ChooseWorldsDialog.java | 40 ++------ .../view/DecorationStoreActivity.kt | 12 ++- .../decoration/view/MyDecorationActivity.java | 45 ++++++--- .../home/activity/AssociationActivity.kt | 24 ++--- .../adapter/ContactsIndicatorAdapter.java | 2 - .../adapter/FragmentViewPagerAdapter.java | 34 ------- .../home/fragment/ContactsListFragment.kt | 16 +++- .../erban/home/fragment/PartyFragment.kt | 8 +- .../other/dialog/PrivacyAgreementDialog.java | 1 - .../pay/activity/GiveGoldDetailActivity.kt | 23 +++-- .../relation/cp/activity/CpTaskActivity.kt | 3 + .../fragment/ForestPrizesFragment.kt | 10 +- .../ui/indicator_impl/IndicatorHelper.java | 38 -------- .../erban/ui/search/SearchHallActivity.java | 58 +++++------ .../ui/user/activity/UserGiftActivity.kt | 12 +-- .../ui/user/activity/UserInfoActivity.java | 15 +-- .../user/fragment/UserInfoGiftWallFragment.kt | 8 +- .../magicindicator/ViewPagerHelper.java | 1 + .../main/res/layout/activity_association.xml | 3 +- .../res/layout/activity_decoration_store.xml | 2 +- .../res/layout/activity_my_decoration.xml | 2 +- .../main/res/layout/activity_search_hall.xml | 4 +- .../main/res/layout/activity_user_gift.xml | 2 +- .../main/res/layout/activity_user_info.xml | 2 +- app/src/main/res/layout/fragment_party.xml | 2 +- .../layout/fragment_userinfo_gift_wall.xml | 2 +- .../main/res/layout/layout_choose_worlds.xml | 2 +- .../treasure_fairy_fragment_forest_prizes.xml | 2 +- app/src/main/res/values-ar/strings.xml | 4 +- app/src/main/res/values-in/strings.xml | 2 +- .../res/layout/activity_give_gold_detail.xml | 2 +- .../hall/activity/ClanIncomeActivity.java | 34 +++---- .../activity/IncomeStatisticsActivity.java | 37 +++----- .../activity/SingleRoomIncomeActivity.java | 36 +++---- .../res/layout/activity_clan_income.xml | 29 +++--- .../res/layout/activity_income_statistics.xml | 95 +++++++++---------- .../layout/activity_single_room_income.xml | 5 +- .../miniworld/activity/AllTopicActivity.java | 22 ++--- .../miniworld/activity/MiniWorldActivity.java | 9 +- .../activity/MiniWorldGuestPageActivity.java | 31 ++---- .../miniworld/activity/TopicMainActivity.java | 31 ++---- .../res/layout/activity_all_topic.xml | 3 +- .../res/layout/activity_mini_world.xml | 2 +- .../layout/activity_mini_world_guest_page.xml | 2 +- .../res/layout/activity_topic_main.xml | 2 +- 45 files changed, 300 insertions(+), 419 deletions(-) delete mode 100644 app/src/main/java/com/yizhuan/erban/home/adapter/FragmentViewPagerAdapter.java delete mode 100644 app/src/main/java/com/yizhuan/erban/ui/indicator_impl/IndicatorHelper.java diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java index 5e47a7510..97e78f0b2 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java @@ -16,12 +16,12 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatDialogFragment; import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import androidx.viewpager2.widget.ViewPager2; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.yizhuan.erban.R; +import com.yizhuan.erban.avroom.adapter.CommonVPAdapter; import com.yizhuan.erban.community.publish.view.WorldsChooseFrg; -import com.yizhuan.erban.home.adapter.FragmentViewPagerAdapter; 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; @@ -42,7 +42,7 @@ public class ChooseWorldsDialog extends AppCompatDialogFragment private FrameLayout flTopButton; private FrameLayout flDialogWorld; private MagicIndicator indicator; - private ViewPager viewPager; + private ViewPager2 viewPager; public static ChooseWorldsDialog newInstance(byte type) { ChooseWorldsDialog chooseWorldsDialog = new ChooseWorldsDialog(); @@ -70,13 +70,9 @@ public class ChooseWorldsDialog extends AppCompatDialogFragment viewPager = mRootView.findViewById(R.id.viewpager); List mTabInfoList = new ArrayList<>(); -// mTabInfoList.add(new TabInfo(1, ResUtil.getString(R.string.widget_dialog_chooseworldsdialog_01))); -// mTabInfoList.add(new TabInfo(2, ResUtil.getString(R.string.widget_dialog_chooseworldsdialog_02))); mTabInfoList.add(new TabInfo(3, ResUtil.getString(R.string.widget_dialog_chooseworldsdialog_03))); List mTabs = new ArrayList<>(); -// mTabs.add(WorldsChooseFrg.newInstance(Constants.TYPE_JOINED).setmChooseWorldCallback(this)); -// mTabs.add(WorldsChooseFrg.newInstance(Constants.TYPE_RECOMMEND).setmChooseWorldCallback(this)); mTabs.add(WorldsChooseFrg.newInstance(Constants.TYPE_ALL).setmChooseWorldCallback(this)); ChooseWorldsIndicatorAdapter topMagicIndicatorAdapter = new ChooseWorldsIndicatorAdapter(context, mTabInfoList, 0); @@ -86,30 +82,9 @@ public class ChooseWorldsDialog extends AppCompatDialogFragment commonNavigator.setAdapter(topMagicIndicatorAdapter); indicator.setNavigator(commonNavigator); - viewPager.setAdapter(new FragmentViewPagerAdapter(getChildFragmentManager(), mTabs)); + viewPager.setAdapter(new CommonVPAdapter(getChildFragmentManager(), getLifecycle(), mTabs)); ViewPagerHelper.bind(indicator, viewPager); - - Bundle bundle = getArguments(); - byte type; - if (bundle != null) { - type = bundle.getByte("type", Constants.TYPE_JOINED); - } else { - type = Constants.TYPE_JOINED; - } - -// switch (type) { -// case Constants.TYPE_ALL: - viewPager.setCurrentItem(2); -// break; -// -// case Constants.TYPE_JOINED: -// viewPager.setCurrentItem(0); -// break; -// -// case Constants.TYPE_RECOMMEND: -// viewPager.setCurrentItem(1); -// break; -// } + viewPager.setCurrentItem(2); return mRootView; } @@ -148,6 +123,7 @@ public class ChooseWorldsDialog extends AppCompatDialogFragment } private WorldsChooseFrg.ChooseWorldCallback mChooseWorldCallback; + @Override public void callback(MiniWorldChooseInfo miniWorldChooseInfo) { if (mChooseWorldCallback != null) { @@ -165,8 +141,6 @@ public class ChooseWorldsDialog extends AppCompatDialogFragment public void dismissDialog() { //注释这个判断，因为不保留活动情况下，((Activity)mContext).isDestroyed() 为true 导致不执行dismiss一个dialog //而mDialog.getWindow()不为null，还是可以dismiss一个dialog的。 -// if(!checkActivityValid()) -// return; //加上一个try，强行吞异常 try { Context context = getContext(); @@ -178,7 +152,7 @@ public class ChooseWorldsDialog extends AppCompatDialogFragment } else dismiss(); } - } catch (Exception e){ + } catch (Exception e) { } } diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt b/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt index bb97ad923..20c4467f6 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt @@ -6,7 +6,7 @@ import android.graphics.Color import android.view.View import androidx.activity.viewModels import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentPagerAdapter +import androidx.viewpager2.adapter.FragmentStateAdapter import com.netease.nim.uikit.StatusBarUtil import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseViewBindingActivity @@ -104,16 +104,18 @@ class DecorationStoreActivity : BaseViewBindingActivity( * 公會 */ private fun initDetail() { - val viewPager: ViewPager = binding.viewPagerDetail + val viewPager = binding.viewPagerDetail val magicIndicator: MagicIndicator = binding.magicIndicator val fragmentList: MutableList = ArrayList() - val pagerAdapter = CommonPagerAdapter(supportFragmentManager, fragmentList) val tagList: MutableList = ArrayList() tagList.add(getString(R.string.me_association)) tagList.add(getString(R.string.me_room)) @@ -59,21 +58,24 @@ class AssociationActivity : BaseViewBindingActivity( commonNavigator.adapter = magicIndicatorAdapter magicIndicator.navigator = commonNavigator commonNavigator.titleContainer.showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE - viewPager.adapter = pagerAdapter - ViewPagerHelper.bind(magicIndicator, viewPager) - viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + viewPager.adapter = CommonVPAdapter(supportFragmentManager, lifecycle, fragmentList) + viewPager.registerOnPageChangeCallback(object : OnPageChangeCallback() { override fun onPageScrolled( position: Int, positionOffset: Float, positionOffsetPixels: Int ) { + magicIndicator.onPageScrolled(position, positionOffset, positionOffsetPixels) } override fun onPageSelected(position: Int) { + magicIndicator.onPageSelected(position) viewPager.requestLayout() } - override fun onPageScrollStateChanged(state: Int) {} + override fun onPageScrollStateChanged(state: Int) { + magicIndicator.onPageScrollStateChanged(state) + } }) } 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 3f2853ea8..eff70e4d3 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 @@ -92,13 +92,11 @@ public class ContactsIndicatorAdapter extends CommonNavigatorAdapter { @Override public void onSelected(int index, int totalCount) { -// setBackgroundResource(R.drawable.shape_bg_contact_indicator_item); setTextColor(getResources().getColor(R.color.color_333333)); } @Override public void onDeselected(int index, int totalCount) { -// setBackgroundDrawable(null); setTextColor(getResources().getColor(R.color.color_666666)); } diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/FragmentViewPagerAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/FragmentViewPagerAdapter.java deleted file mode 100644 index e12ad3245..000000000 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/FragmentViewPagerAdapter.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yizhuan.erban.home.adapter; - -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; - -import java.util.List; - -/** - * - */ -public class FragmentViewPagerAdapter extends FragmentPagerAdapter { - private List mFragmentList; - - - public FragmentViewPagerAdapter(FragmentManager fm, List fragmentList) { - super(fm); - this.mFragmentList = fragmentList; - } - - @Override - public Fragment getItem(int position) { - return mFragmentList.get(position); - } - - @Override - public int getCount() { - return mFragmentList == null ? 0 : mFragmentList.size(); - } - - public void setmFragmentList(List mFragmentList) { - this.mFragmentList = mFragmentList; - } -} diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.kt index d408deb30..e23c38969 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.kt @@ -16,7 +16,6 @@ import com.yizhuan.erban.ui.im.friend.FriendListFragment import com.yizhuan.erban.ui.im.recent.RecentListFragment import com.yizhuan.erban.ui.relation.FansListFragment import com.yizhuan.erban.ui.user.adapter.UserInfoIndicatorAdapter -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator import com.yizhuan.xchat_android_core.Constants import com.yizhuan.xchat_android_library.utils.ResUtil @@ -80,11 +79,24 @@ class ContactsListFragment : BaseViewBindingFragment commonNavigator.titleContainer.showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE binding.viewPager.offscreenPageLimit = 4 binding.viewPager.adapter = CommonVPAdapter(childFragmentManager, lifecycle, fragmentList) - ViewPagerHelper.bind(binding.magicIndicator, binding.viewPager) binding.viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { + + override fun onPageScrolled( + position: Int, + positionOffset: Float, + positionOffsetPixels: Int + ) { + binding.magicIndicator.onPageScrolled(position, positionOffset, positionOffsetPixels) + } + override fun onPageSelected(position: Int) { + binding.magicIndicator.onPageSelected(position) binding.viewPager.requestLayout() } + + override fun onPageScrollStateChanged(state: Int) { + binding.magicIndicator.onPageScrollStateChanged(state) + } }) } diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt index 7f881f67b..dc07c57d5 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt @@ -9,6 +9,7 @@ import androidx.fragment.app.activityViewModels import com.coorchice.library.utils.LogUtils import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.yizhuan.erban.R +import com.yizhuan.erban.avroom.adapter.CommonVPAdapter import com.yizhuan.erban.avroom.adapter.RoomVPAdapter import com.yizhuan.erban.base.BaseFragment import com.yizhuan.erban.databinding.FragmentPartyBinding @@ -121,10 +122,9 @@ class PartyFragment : BaseFragment(), PartyMagicIndicatorAdapter.OnItemSelectLis commonNavigator.adapter = magicIndicatorAdapter mBinding.magicIndicator.navigator = commonNavigator mBinding.viewPager.offscreenPageLimit = 2 - mBinding.viewPager.adapter = RoomVPAdapter( - childFragmentManager, - mFragments - ) + + //init viewpager + mBinding.viewPager.adapter = CommonVPAdapter(childFragmentManager, lifecycle, mFragments) ViewPagerHelper.bind(mBinding.magicIndicator, mBinding.viewPager) onItemSelect(currentIndex, null) } diff --git a/app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java b/app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java index 21259e0fa..3bab86184 100644 --- a/app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java +++ b/app/src/main/java/com/yizhuan/erban/other/dialog/PrivacyAgreementDialog.java @@ -18,7 +18,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.yizhuan.erban.MainActivity; import com.yizhuan.erban.R; import com.yizhuan.erban.application.IReportConstants; import com.yizhuan.erban.application.ReportManager; diff --git a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldDetailActivity.kt b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldDetailActivity.kt index 21316db13..138ae634c 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldDetailActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldDetailActivity.kt @@ -6,17 +6,16 @@ import android.view.View import android.widget.LinearLayout import android.widget.TextView import androidx.fragment.app.Fragment -import androidx.viewpager.widget.ViewPager +import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback import com.netease.nim.uikit.StatusBarUtil import com.yizhuan.erban.R +import com.yizhuan.erban.avroom.adapter.CommonVPAdapter import com.yizhuan.erban.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityGiveGoldDetailBinding import com.yizhuan.erban.pay.fragment.GiveDiamondFragment import com.yizhuan.erban.pay.fragment.GiveGiftFragment import com.yizhuan.erban.ui.user.adapter.CommonWrapIndicatorAdapter -import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter 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.initial.InitialModel import com.yizhuan.xchat_android_core.user.UserModel @@ -52,10 +51,9 @@ class GiveGoldDetailActivity : BaseViewBindingActivity = ArrayList() - val pagerAdapter = UserInfoPagerAdapter(supportFragmentManager, fragmentList) val tagList: MutableList = ArrayList() if (diamondList?.contains(userInfo?.erbanNo) == true || levelSep >= (initInfo?.giveDiamondExperLevel ?: 0) @@ -71,7 +69,7 @@ class GiveGoldDetailActivity : BaseViewBindingActivity(), val list = ArrayList(2) list.add(ResUtil.getString(R.string.cp_activity_cptaskactivity_02)) list.add(ResUtil.getString(R.string.cp_activity_cptaskactivity_03)) + val fragments = ArrayList(2) + fragments.add(CpTaskFragment.newInstance(CpTaskFragment.TYPE_DAILY)) + fragments.add(CpTaskFragment.newInstance(CpTaskFragment.TYPE_TOTAL)) val commonNavigator = CommonNavigator(this) commonNavigator.isAdjustMode = true diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesFragment.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesFragment.kt index 60b087367..bf99b8bfb 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/fragment/ForestPrizesFragment.kt @@ -5,8 +5,8 @@ import android.os.Bundle import android.widget.LinearLayout import android.widget.TextView import androidx.fragment.app.Fragment -import androidx.viewpager.widget.ViewPager import com.yizhuan.erban.R +import com.yizhuan.erban.avroom.adapter.CommonVPAdapter import com.yizhuan.erban.base.BaseViewBindingFragment import com.yizhuan.erban.databinding.TreasureFairyFragmentForestPrizesBinding import com.yizhuan.erban.treasurefairy.adapter.ForestIndicatorAdapter @@ -29,13 +29,12 @@ class ForestPrizesFragment : BaseViewBindingFragment = ArrayList() fragmentList.add(ForestPrizesChildFragment.newInstance(1)) fragmentList.add(ForestPrizesChildFragment.newInstance(2)) fragmentList.add(ForestPrizesChildFragment.newInstance(3)) - val pagerAdapter = UserInfoPagerAdapter(childFragmentManager, fragmentList) val tagList: MutableList = ArrayList() tagList.add(getString(R.string.fairy_primary_common_forest)) tagList.add(getString(R.string.fairy_epic_common_forest)) @@ -49,8 +48,9 @@ class ForestPrizesFragment : BaseViewBindingFragment list, OnItemSelectListener listener) { - CommonNavigator commonNavigator = new CommonNavigator(context); - JustColorIndicatorAdapter magicIndicatorAdapter = new JustColorIndicatorAdapter(context, list); - if (listener == null) { - listener = (position, view) -> viewPager.setCurrentItem(position); - } - magicIndicatorAdapter.setOnItemSelectListener(listener); - commonNavigator.setAdapter(magicIndicatorAdapter); - magicIndicator.setNavigator(commonNavigator); - commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - ViewPagerHelper.bind(magicIndicator, viewPager); - } - - public static void handle(Context context, ViewPager viewPager, MagicIndicator magicIndicator, - List list) { - handle(context, viewPager, magicIndicator, list, null); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchHallActivity.java b/app/src/main/java/com/yizhuan/erban/ui/search/SearchHallActivity.java index 91acb45d4..551b7dddf 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchHallActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/search/SearchHallActivity.java @@ -15,12 +15,12 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import androidx.viewpager2.widget.ViewPager2; import com.netease.nim.uikit.StatusBarUtil; import com.yizhuan.erban.R; +import com.yizhuan.erban.avroom.adapter.CommonVPAdapter; import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.common.ViewPagerAdapter; import com.yizhuan.erban.friend.action.AbstractSelectFriendAction; import com.yizhuan.erban.friend.view.SelectFriendActivity; import com.yizhuan.erban.home.adapter.ContactsIndicatorAdapter; @@ -51,19 +51,18 @@ import java.util.List; public class SearchHallActivity extends BaseMvpActivity implements ISearchView, View.OnClickListener, ContactsIndicatorAdapter.OnItemSelectListener { private static final String SHOW_HISTORY = "show_history"; - public static final int CODE_REQUEST_TO_SEARCH = 200; protected EditText searchEdit; private ImageView ivBack; private TextView tvSearch; private ImageView ivClearText; private MagicIndicator indicator; - private ViewPager viewPager; + private ViewPager2 viewPager; private LinearLayout llSearchDetail; protected int type = AbstractSelectFriendAction.TYPE_NORMAL; private long hallId; private int secondOperator = -1; - private SearchDetailFragment userFrg ; + private SearchDetailFragment userFrg; public static void start(Context context) { Intent intent = new Intent(context, SearchActivity.class); @@ -81,21 +80,18 @@ public class SearchHallActivity extends BaseMvpActivity { + if (actionId == EditorInfo.IME_ACTION_SEARCH || (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) { + toSearch(); + return true; } + return false; + }); @@ -115,16 +111,15 @@ public class SearchHallActivity extends BaseMvpActivity mTabInfoList = new ArrayList<>(); mTabInfoList.add(getString(R.string.search_room_tab)); mTabInfoList.add(getString(R.string.search_user_tab)); List mTabs = new ArrayList<>(); - userFrg = SearchDetailFragment.newInstance(hallId,SearchDetailFragment.TYPE_SEARCH_USER,AbstractSelectFriendAction.TYPE_MODULE_HALL); + userFrg = SearchDetailFragment.newInstance(hallId, SearchDetailFragment.TYPE_SEARCH_USER, AbstractSelectFriendAction.TYPE_MODULE_HALL); mTabs.add(userFrg); - ContactsIndicatorAdapter topMagicIndicatorAdapter = new ContactsIndicatorAdapter(this, mTabInfoList,0); + ContactsIndicatorAdapter topMagicIndicatorAdapter = new ContactsIndicatorAdapter(this, mTabInfoList, 0); topMagicIndicatorAdapter.setOnItemSelectListener(this); CommonNavigator commonNavigator = new CommonNavigator(this); commonNavigator.setAdjustMode(true); @@ -134,12 +129,10 @@ public class SearchHallActivity extends BaseMvpActivity() { override fun init() { initWhiteTitleBar(ResUtil.getString(R.string.ui_user_usergiftactivity_01)) - val viewPager: ViewPager = binding.viewPager + val viewPager = binding.viewPager val magicIndicator: MagicIndicator = binding.magicIndicator val fragmentList: MutableList = ArrayList(2) //礼物类型 1:普通礼物;2:辛运礼物 fragmentList.add(UserInfoGiftFragment.newInstance(1, true)) fragmentList.add(UserInfoGiftFragment.newInstance(2, true)) - val pagerAdapter = UserInfoPagerAdapter(supportFragmentManager, fragmentList) val tagList: MutableList = ArrayList(2) tagList.add(getString(R.string.me_ordinary_gift)) tagList.add(getString(R.string.me_lucky_gift)) @@ -41,7 +39,9 @@ class UserGiftActivity : BaseViewBindingActivity() { magicIndicator.navigator = commonNavigator commonNavigator.titleContainer.showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE viewPager.offscreenPageLimit = 2 - viewPager.adapter = pagerAdapter + + //init viewpager + viewPager.adapter = CommonVPAdapter(supportFragmentManager, lifecycle, fragmentList) ViewPagerHelper.bind(magicIndicator, viewPager) } diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java index 452f89a3b..117ea43eb 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java @@ -19,7 +19,7 @@ import androidx.core.content.ContextCompat; import androidx.core.widget.NestedScrollView; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; -import androidx.viewpager.widget.ViewPager; +import androidx.viewpager2.widget.ViewPager2; import com.google.android.flexbox.AlignItems; import com.google.android.flexbox.FlexDirection; @@ -37,6 +37,7 @@ import com.yizhuan.erban.audio.helper.AudioPlayerHelper; import com.yizhuan.erban.audio.helper.OnPlayListener; import com.yizhuan.erban.avroom.ButtonItemFactory; import com.yizhuan.erban.avroom.activity.AVRoomActivity; +import com.yizhuan.erban.avroom.adapter.CommonVPAdapter; import com.yizhuan.erban.base.BaseBindingActivity; import com.yizhuan.erban.common.widget.dialog.CommonPopupDialog; import com.yizhuan.erban.common.widget.dialog.DialogManager; @@ -46,7 +47,6 @@ import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; import com.yizhuan.erban.ui.user.adapter.SelfPhotoAdapter; import com.yizhuan.erban.ui.user.adapter.UserInfoIndicatorAdapter; import com.yizhuan.erban.ui.user.adapter.UserInfoLabelAdapter; -import com.yizhuan.erban.ui.user.adapter.UserInfoPagerAdapter; import com.yizhuan.erban.ui.user.adapter.UserInfoPhotoAdapter; import com.yizhuan.erban.ui.user.adapter.UserPhotoAdapter; import com.yizhuan.erban.ui.user.dialog.UserLabelDialog; @@ -236,7 +236,6 @@ public class UserInfoActivity extends BaseBindingActivity fragmentList = new ArrayList<>(2); fragmentList.add(new UserInfoInfoFragment()); fragmentList.add(new UserInfoGiftWallFragment()); - UserInfoPagerAdapter pagerAdapter = new UserInfoPagerAdapter(getSupportFragmentManager(), fragmentList); final List tagList = new ArrayList<>(2); tagList.add(getString(R.string.me_data)); tagList.add(getString(R.string.me_gift_wall)); @@ -250,21 +249,25 @@ public class UserInfoActivity extends BaseBindingActivity = ArrayList(2) //礼物类型 1:普通礼物;2:辛运礼物 @@ -51,7 +51,9 @@ class UserInfoGiftWallFragment : BaseViewBindingFragment @@ -20,7 +19,7 @@ android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/dp_10" /> - diff --git a/app/src/main/res/layout/activity_decoration_store.xml b/app/src/main/res/layout/activity_decoration_store.xml index 912d254f5..87ceb5752 100644 --- a/app/src/main/res/layout/activity_decoration_store.xml +++ b/app/src/main/res/layout/activity_decoration_store.xml @@ -38,7 +38,7 @@ android:layout_height="30dp" android:layout_marginTop="@dimen/dp_10" /> - - @@ -93,7 +95,7 @@ android:paddingEnd="5dp" android:visibility="gone" /> - diff --git a/app/src/main/res/layout/activity_user_gift.xml b/app/src/main/res/layout/activity_user_gift.xml index 8f67485ec..f2ca696a0 100644 --- a/app/src/main/res/layout/activity_user_gift.xml +++ b/app/src/main/res/layout/activity_user_gift.xml @@ -21,7 +21,7 @@ android:paddingStart="13dp" android:paddingEnd="10dp" /> - diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 3a2f8271b..57e7aacbe 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -532,7 +532,7 @@ - - diff --git a/app/src/main/res/layout/fragment_userinfo_gift_wall.xml b/app/src/main/res/layout/fragment_userinfo_gift_wall.xml index 1c9f477fa..eaf9b9869 100644 --- a/app/src/main/res/layout/fragment_userinfo_gift_wall.xml +++ b/app/src/main/res/layout/fragment_userinfo_gift_wall.xml @@ -25,7 +25,7 @@ android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/dp_14" /> - diff --git a/app/src/main/res/layout/layout_choose_worlds.xml b/app/src/main/res/layout/layout_choose_worlds.xml index dfadb0789..eb2433ac9 100644 --- a/app/src/main/res/layout/layout_choose_worlds.xml +++ b/app/src/main/res/layout/layout_choose_worlds.xml @@ -34,7 +34,7 @@ android:visibility="gone" android:layout_marginBottom="8dp"/> - - diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 2d5a883a1..d58227ee2 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -629,8 +629,8 @@ نصيحة: الإصدار الحالي لا يدعم عرض هذه الرسالة ، يرجى تحديث البرنامج %d :المعرف - %1$s شهر%2 $s يوم - سنة + %1$s شهر%2$s يوم + %s سنة %s شهر إعلان الغرفة diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index af504ce18..4693101f0 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -638,7 +638,7 @@ Tanda ID: %d %1$s bulan %2$s hari - Bertahun-tahun + %s Bertahun-tahun %s bulan Pengumuman ruangan diff --git a/app/src/module_community/res/layout/activity_give_gold_detail.xml b/app/src/module_community/res/layout/activity_give_gold_detail.xml index 30653b153..8f4b1f6a9 100644 --- a/app/src/module_community/res/layout/activity_give_gold_detail.xml +++ b/app/src/module_community/res/layout/activity_give_gold_detail.xml @@ -22,7 +22,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/title_bar"/> - list = new ArrayList<>(); - private ViewPager viewPager; + private ViewPager2 viewPager; private MagicIndicator indicator; private TextView tvMonthDayStart; private TextView tvMonthDayEnd; @@ -59,17 +58,6 @@ public class ClanIncomeActivity extends BaseMvpActivity implements IIncomeStatisticsView, TimePickerDialog.TimePickerListener, DayIncomeFragment.DayIncomeFragmentListener, GoldRecordFragment.DayIncomeFragmentListener, - View.OnClickListener{ + View.OnClickListener { private static final int TYPE_DAY = 0; private static final int TYPE_WEEK = 1; @@ -50,7 +49,7 @@ public class IncomeStatisticsActivity extends BaseMvpActivity list = new ArrayList<>(); - private ViewPager viewPager; + private ViewPager2 viewPager; private MagicIndicator indicator; private TextView tvMonthDayStart; private TextView tvMonthDayEnd; @@ -103,8 +102,7 @@ public class IncomeStatisticsActivity extends BaseMvpActivity list = new ArrayList<>(); - private ViewPager viewPager; + private ViewPager2 viewPager; private MagicIndicator indicator; private TextView tvMonthDayStart; private TextView tvMonthDayEnd; @@ -58,18 +56,6 @@ public class SingleRoomIncomeActivity extends BaseMvpActivity + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_30" /> + tools:text="@string/layout_activity_clan_income_02" /> + tools:text="@string/layout_activity_clan_income_03" /> + app:layout_constraintTop_toTopOf="@+id/tv_month_day_start" /> @@ -108,20 +108,19 @@ android:id="@+id/tv_total" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_below="@+id/tvAllIncome" android:layout_marginStart="@dimen/dp_20" android:layout_marginTop="@dimen/dp_2" android:layout_toEndOf="@id/view_line" - android:layout_below="@+id/tvAllIncome" - tools:text="1,000,000,000" android:textColor="@color/white" - android:textSize="@dimen/sp_16" /> + android:textSize="@dimen/sp_16" + tools:text="1,000,000,000" /> - + android:layout_height="match_parent" /> - \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/activity_income_statistics.xml b/app/src/module_labour_union/res/layout/activity_income_statistics.xml index ab5e45992..f1ed8ea72 100644 --- a/app/src/module_labour_union/res/layout/activity_income_statistics.xml +++ b/app/src/module_labour_union/res/layout/activity_income_statistics.xml @@ -8,23 +8,23 @@ + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_30" /> + android:layout_height="@dimen/dp_45" + android:layout_marginStart="@dimen/dp_30" + android:layout_marginEnd="@dimen/dp_30" /> + android:textSize="@dimen/sp_12" /> @@ -114,18 +114,18 @@ android:layout_width="match_parent" android:layout_height="48dp" android:layout_marginTop="20dp" - android:orientation="horizontal" + android:background="@color/color_F0F5F6" android:gravity="center_vertical" + android:orientation="horizontal" android:paddingStart="@dimen/dp_15" - android:paddingEnd="@dimen/dp_40" - android:background="@color/color_F0F5F6"> + android:paddingEnd="@dimen/dp_40"> + android:textSize="@dimen/sp_12" /> + android:textSize="@dimen/sp_12" /> + android:textSize="@dimen/sp_12" /> + android:textSize="@dimen/sp_12" /> + android:paddingEnd="@dimen/dp_15" + android:visibility="gone"> + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_3" + android:orientation="vertical"> + android:layout_height="wrap_content" + android:src="@mipmap/ic_arrow_gray_top" /> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_2" + android:src="@mipmap/ic_arrow_black_bottom" /> @@ -258,32 +258,31 @@ + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_3" + android:orientation="vertical"> + android:layout_height="wrap_content" + android:src="@mipmap/ic_arrow_gray_top" /> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_2" + android:src="@mipmap/ic_arrow_black_bottom" /> - + android:layout_height="match_parent" /> - \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/activity_single_room_income.xml b/app/src/module_labour_union/res/layout/activity_single_room_income.xml index cf50a4ab8..3a7c6d567 100644 --- a/app/src/module_labour_union/res/layout/activity_single_room_income.xml +++ b/app/src/module_labour_union/res/layout/activity_single_room_income.xml @@ -178,10 +178,9 @@ - + android:layout_height="match_parent"/> - \ No newline at end of file diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java index cc9d5a8d5..2a3e8da72 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java @@ -4,15 +4,14 @@ import android.content.Context; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; -import android.view.View; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; +import androidx.viewpager2.widget.ViewPager2; import com.netease.nim.uikit.StatusBarUtil; import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; +import com.yizhuan.erban.avroom.adapter.CommonVPAdapter; import com.yizhuan.erban.base.BaseMvpActivity; import com.yizhuan.erban.miniworld.fragment.MiniWorldCategoryFragment; import com.yizhuan.erban.miniworld.presenter.MiniWorldPresenter; @@ -43,7 +42,7 @@ public class AllTopicActivity extends BaseMvpActivity mMiniWorldCategoryInfos; @@ -72,8 +71,8 @@ public class AllTopicActivity extends BaseMvpActivity fragments = new ArrayList<>(); - fragments.add(MiniWorldCategoryFragment.newInstance(String.valueOf("0"))); - mViewPager.setAdapter(new RoomContributeListAdapter(getSupportFragmentManager(), fragments)); + fragments.add(MiniWorldCategoryFragment.newInstance("0")); + mViewPager.setAdapter(new CommonVPAdapter(getSupportFragmentManager(), getLifecycle(), fragments)); ViewPagerHelper.bind(mMagicIndicator, mViewPager); mViewPager.setOffscreenPageLimit(5); } @@ -133,12 +132,7 @@ public class AllTopicActivity extends BaseMvpActivity mViewPager.setCurrentItem(index)); return simplePagerTitleView; } @@ -149,14 +143,12 @@ public class AllTopicActivity extends BaseMvpActivity mMiniWorldCategoryInfos; @@ -90,7 +92,6 @@ public class MiniWorldActivity extends BaseMvpActivity - + diff --git a/app/src/module_mini_world/res/layout/activity_mini_world.xml b/app/src/module_mini_world/res/layout/activity_mini_world.xml index b764c1ac2..e5e9d44fe 100644 --- a/app/src/module_mini_world/res/layout/activity_mini_world.xml +++ b/app/src/module_mini_world/res/layout/activity_mini_world.xml @@ -23,7 +23,7 @@ android:layout_height="48dp" android:background="@color/white" /> - - diff --git a/app/src/module_mini_world/res/layout/activity_topic_main.xml b/app/src/module_mini_world/res/layout/activity_topic_main.xml index 9e988755e..73661b4a2 100644 --- a/app/src/module_mini_world/res/layout/activity_topic_main.xml +++ b/app/src/module_mini_world/res/layout/activity_topic_main.xml @@ -91,7 +91,7 @@ -