diff --git a/app/accompany/debug/app-accompany-debug.apk b/app/accompany/debug/app-accompany-debug.apk new file mode 100644 index 000000000..7a8a4bea4 Binary files /dev/null and b/app/accompany/debug/app-accompany-debug.apk differ diff --git a/app/accompany/debug/output.json b/app/accompany/debug/output.json new file mode 100644 index 000000000..83f8a099b --- /dev/null +++ b/app/accompany/debug/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"app-accompany-debug.apk","fullName":"accompanyDebug","baseName":"accompany-debug"},"path":"app-accompany-debug.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 19b474ade..82333dec2 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -18,6 +18,7 @@ import android.util.LongSparseArray; import android.view.KeyEvent; import android.view.View; import android.view.animation.LinearInterpolator; +import android.widget.TextView; import com.mcxiaoke.packer.helper.PackerNg; import com.microquation.linkedme.android.LinkedME; @@ -213,6 +214,8 @@ public class MainActivity extends BaseMvpActivity public static final String MSG_TAB = "msgTab"; private DragLayout avatarLayout; + private TextView tvName;//最小化窗口名称 + private TextView tvId;//最小化窗口ID private CircleImageView avatarImage; private LivingIconView userLivingView; private View viewClose; @@ -505,6 +508,9 @@ public class MainActivity extends BaseMvpActivity private void initView() { mMainTabLayout = findViewById(R.id.main_tab_layout); avatarLayout = findViewById(R.id.avatar_image_layout); + tvName = findViewById(R.id.tv_name); + tvId = findViewById(R.id.tv_id); + avatarImage = findViewById(R.id.avatar_image); userLivingView = findViewById(R.id.liv_user); viewClose = findViewById(R.id.view_close); @@ -528,6 +534,7 @@ public class MainActivity extends BaseMvpActivity @Override protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); setIntent(intent); //这里退出登录，实际上mainActivity是没有销毁的，当从linkme 调起来时候这里需要检查一下登录状态。 if (TextUtils.isEmpty(AuthModel.get().getTicket())) { @@ -855,7 +862,7 @@ public class MainActivity extends BaseMvpActivity @Override public void accept(UserInfo userInfo) throws Exception { if (userInfo != null) { - displayAvatarLayout(userInfo.getAvatar()); + displayAvatarLayout(userInfo.getAvatar(),userInfo.getNick(),userInfo.getErbanNo()); } else { NimUserInfo nimUserInfo = NimUserInfoCache.getInstance().getUserInfo(roomInfo.getUid() + ""); if (nimUserInfo == null) { @@ -863,12 +870,12 @@ public class MainActivity extends BaseMvpActivity @Override public void onResult(int i, NimUserInfo nimUserInfo, Throwable throwable) { if (nimUserInfo != null) { - displayAvatarLayout(nimUserInfo.getAvatar()); + displayAvatarLayout(nimUserInfo.getAvatar(),userInfo.getNick(),userInfo.getUid()); } } }); } else { - displayAvatarLayout(nimUserInfo.getAvatar()); + displayAvatarLayout(nimUserInfo.getAvatar(),userInfo.getNick(),userInfo.getUid()); } } } @@ -892,9 +899,12 @@ public class MainActivity extends BaseMvpActivity } } - private void displayAvatarLayout(String avatar) { + @SuppressLint("SetTextI18n") + private void displayAvatarLayout(String avatar, String nickName, long uid) { avatarLayout.clearAnimation(); avatarLayout.setVisibility(View.VISIBLE); + tvName.setText(nickName); + tvId.setText("ID:"+uid); userLivingView.start(); stopRoomMinAnim(); startRoomMinAnim(); diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java index 077df6087..c29182055 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseMvpActivity.java @@ -177,6 +177,27 @@ public abstract class BaseMvpActivity implements IHomeMoreRoomView,MainMagicIndicatorAdapter.OnItemSelectListener { @BindView(R.id.magic_indicator) MagicIndicator magicIndicator; @BindView(R.id.view_pager) ViewPager viewPager; - + @BindView(R.id.rv_follow_room) + RecyclerView rvFollowRoom; + private HomeConcernsAdapter mFollowRoomsAdapter; private List mFragments; @@ -48,6 +63,7 @@ public class HomeMoreRoomActivity extends BaseActivity implements MainMagicIndi ButterKnife.bind(this); initTitleBar("房间",true); initRoomTitleTab(); + initRoomConcern(); } public static void start(Context context) { @@ -57,54 +73,36 @@ public class HomeMoreRoomActivity extends BaseActivity implements MainMagicIndi private void initRoomTitleTab() { - List mTabInfoList = new ArrayList<>(); - if (!ListUtils.isListEmpty(mFragments)) { - mFragments.clear(); - } - mFragments = new ArrayList<>(); - HomeModel.get().getHomeTag().subscribe((serviceResult, throwable) -> { - if (throwable != null) { - } else { - List info = serviceResult; - for (int i = 0; i < info.size(); i++) { - //过滤对象是空和没有标签名同时也没有子标签的情况 - CharSequence title; - int tabId; - Fragment fragment; - String name = info.get(i).getName(); - if (name != null) { - name = name.trim(); - } - title = name; - tabId = info.get(i).getId(); - fragment = HomeTabMapFragment.newInstance(tabId); - mFragments.add(fragment); - mTabInfoList.add(title); - } + getMvpPresenter().getHomeTag(); - CommonNavigator commonNavigator = new CommonNavigator(HomeMoreRoomActivity.this); - MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(HomeMoreRoomActivity.this, mTabInfoList); - magicIndicatorAdapter.setOnItemSelectListener(this); - - commonNavigator.setAdapter(magicIndicatorAdapter); - magicIndicator.setNavigator(commonNavigator); - - commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - - viewPager.setOffscreenPageLimit(5); - viewPager.setAdapter(new RoomContributeListAdapter(getSupportFragmentManager(),mFragments)); - viewPager.addOnPageChangeListener(new OnPageSelectedListener() { - @Override - public void onPageSelected(int position) { - - } - }); - ViewPagerHelper.bind(magicIndicator, viewPager); - } - }); } + private void initRoomConcern() { + mFollowRoomsAdapter = new HomeConcernsAdapter(null,context); + rvFollowRoom.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)); + rvFollowRoom.addItemDecoration(new VerticalDecoration(SizeUtils.dp2px(this, 10), false, true)); + mFollowRoomsAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() { + @Override + public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) { + StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_SEARCH_RECENT_ENTER_ROOM, "最近进房记录"); + + List list = adapter.getData(); + if (position >= 0 && position < list.size()) { +//// ImeUtil.hideIME(HomeMoreRoomActivity.this, tvSearch); + HomeConcernsInfo record = list.get(position); +// if (record.isValid()) { +// list.remove(position); +// list.add(0, record); +// mFollowRoomsAdapter.setNewData(list); +// } + AVRoomActivity.start(HomeMoreRoomActivity.this, record.getRoomUid()); + } + } + }); + rvFollowRoom.setAdapter(mFollowRoomsAdapter); + getMvpPresenter().getHomeConcerns(); + } // @Override // protected boolean needSteepStateBar() { @@ -134,4 +132,68 @@ public class HomeMoreRoomActivity extends BaseActivity implements MainMagicIndi viewPager.setCurrentItem(position); } + + + @Override + public void getFollowRoomsSuccess(List list) { + if (list != null && list.size() > 0) { + rvFollowRoom.setVisibility(View.VISIBLE); + mFollowRoomsAdapter.setNewData(list); + } else { + rvFollowRoom.setVisibility(View.GONE); + } + } + + @Override + public void getFollowRoomFail() { + + } + + @Override + public void getHomeTagSuccess(List info) { + List mTabInfoList = new ArrayList<>(); + if (!ListUtils.isListEmpty(mFragments)) { + mFragments.clear(); + } + mFragments = new ArrayList<>(); + for (int i = 0; i < info.size(); i++) { + //过滤对象是空和没有标签名同时也没有子标签的情况 + CharSequence title; + int tabId; + Fragment fragment; + String name = info.get(i).getName(); + if (name != null) { + name = name.trim(); + } + title = name; + tabId = info.get(i).getId(); + fragment = HomeTabMapFragment.newInstance(tabId); + mFragments.add(fragment); + mTabInfoList.add(title); + } + + CommonNavigator commonNavigator = new CommonNavigator(HomeMoreRoomActivity.this); + MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(HomeMoreRoomActivity.this, mTabInfoList); + magicIndicatorAdapter.setOnItemSelectListener(this); + + commonNavigator.setAdapter(magicIndicatorAdapter); + magicIndicator.setNavigator(commonNavigator); + + commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + + viewPager.setOffscreenPageLimit(5); + viewPager.setAdapter(new RoomContributeListAdapter(getSupportFragmentManager(),mFragments)); + viewPager.addOnPageChangeListener(new OnPageSelectedListener() { + @Override + public void onPageSelected(int position) { + + } + }); + ViewPagerHelper.bind(magicIndicator, viewPager); + } + + @Override + public void getHomeTagFail() { + + } } diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java new file mode 100644 index 000000000..81a68cae4 --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java @@ -0,0 +1,52 @@ +package com.yizhuan.erban.home.adapter; + +import android.content.Context; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.BaseViewHolder; +import com.yizhuan.erban.R; +import com.yizhuan.erban.common.widget.CircleImageView; +import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; +import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; +import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; +import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo; + +import java.util.List; + +public class HomeConcernsAdapter extends BaseQuickAdapter { + private Context mContext; + + public HomeConcernsAdapter(@Nullable List data, Context context) { + super(R.layout.item_home_concerns, data); + mContext = context; + } + + @Override + protected void convert(BaseViewHolder helper, HomeConcernsInfo item) { + if (item == null) { + return; + } + +// helper.setVisible(R.id.tv_room_name,true); + + CircleImageView circleImageView = helper.getView(R.id.civ_room_avatar); + ImageLoadUtilsV2.loadImage(circleImageView, item.getAvatar()); + circleImageView.setBorderWidth(UIUtil.dip2px(mContext,1)); + circleImageView.setBorderColor(mContext.getResources().getColor(R.color.appColor)); + + TextView tvName = helper.getView(R.id.tv_room_name); + if (item.getFollowType() == 1){ + tvName.setText(""); + }else { + tvName.setText(item.getName()); + } +// helper.setText(R.id.iv_living,item.getFollowType() == 1?item.getName():"直播中"); + helper.addOnClickListener(R.id.container_item_room_history); + + + + } +} 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 b04b97072..c63de5d73 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 @@ -3,20 +3,12 @@ package com.yizhuan.erban.home.fragment; import android.Manifest; import android.annotation.SuppressLint; import android.app.Activity; -import androidx.databinding.DataBindingUtil; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.appbar.AppBarLayout; -import androidx.fragment.app.Fragment; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; @@ -36,7 +28,14 @@ import android.widget.LinearLayout; import android.widget.ListView; import android.widget.PopupWindow; import android.widget.TextView; -import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.databinding.DataBindingUtil; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.amap.api.location.AMapLocation; import com.amap.api.location.AMapLocationClient; @@ -45,6 +44,7 @@ import com.amap.api.location.AMapLocationListener; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapTransformation; import com.bumptech.glide.request.RequestOptions; +import com.google.android.material.appbar.AppBarLayout; import com.jude.rollviewpager.Util; import com.jude.rollviewpager.hintview.ColorPointHintView; import com.netease.nim.uikit.common.util.log.LogUtil; @@ -177,6 +177,11 @@ public class GameHomeFragment extends BaseMvpFragment mTabInfoList = new ArrayList<>(); - if (!ListUtils.isListEmpty(mFragments)) { - mFragments.clear(); - } - mFragments = new ArrayList<>(); - - HomeModel.get().getHomeTag().subscribe((serviceResult, throwable) -> { - if (throwable != null) { - } else { - List info = serviceResult; - for (int i = 0; i < info.size(); i++) { - //过滤对象是空和没有标签名同时也没有子标签的情况 - CharSequence title; - int tabId; - Fragment fragment; - String name = info.get(i).getName(); - if (name != null) { - name = name.trim(); - } - title = name; - tabId = info.get(i).getId(); - fragment = HomeTabHomeFragment.newInstance(tabId); - mFragments.add(fragment); - mTabInfoList.add(title); - } - - CommonNavigator commonNavigator = new CommonNavigator(getContext()); - MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(getContext(), mTabInfoList); - magicIndicatorAdapter.setOnItemSelectListener(this); - - commonNavigator.setAdapter(magicIndicatorAdapter); - mBinding.magicIndicator.setNavigator(commonNavigator); - - commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - - mBinding.viewPager.setOffscreenPageLimit(5); - mBinding.viewPager.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), mFragments)); - mBinding.viewPager.addOnPageChangeListener(new OnPageSelectedListener() { - @Override - public void onPageSelected(int position) { - - } - }); - ViewPagerHelper.bind(mBinding.magicIndicator, mBinding.viewPager); - } - }); + getMvpPresenter().getHomeTag(); } /** @@ -746,134 +702,54 @@ public class GameHomeFragment extends BaseMvpFragment bannerInfos) { + setBanner(bannerInfos); } - /** - * 初始化顶部banner位 - * - * @param bannerInfos - */ - private void initHomeBanner(List bannerInfos) { - if (ListUtils.isListEmpty(bannerInfos)) { - mView.findViewById(R.id.home_banner_group).setVisibility(View.GONE); - return; + @Override + public void onGetHomeTagSuccess(List info) { + List mTabInfoList = new ArrayList<>(); + if (!ListUtils.isListEmpty(mFragments)) { + mFragments.clear(); } - mView.findViewById(R.id.home_banner_group).setVisibility(View.VISIBLE); - // 遍历去掉 小世界 这个 item - if (MarketVerifyModel.get().isMarketChecking()) { - Iterator iterator = bannerInfos.iterator(); - while (iterator.hasNext()) { - BannerInfo next = iterator.next(); - if (Objects.equals(next.getBannerName(), "66星球-小世界")) { - iterator.remove(); - break; - } + mFragments = new ArrayList<>(); + for (int i = 0; i < info.size(); i++) { + //过滤对象是空和没有标签名同时也没有子标签的情况 + CharSequence title; + int tabId; + Fragment fragment; + String name = info.get(i).getName(); + if (name != null) { + name = name.trim(); } + title = name; + tabId = info.get(i).getId(); + fragment = HomeTabHomeFragment.newInstance(tabId); + mFragments.add(fragment); + mTabInfoList.add(title); } - mBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false) { + + CommonNavigator commonNavigator = new CommonNavigator(getContext()); + MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(getContext(), mTabInfoList); + magicIndicatorAdapter.setOnItemSelectListener(this); + + commonNavigator.setAdapter(magicIndicatorAdapter); + mBinding.magicIndicator.setNavigator(commonNavigator); + + commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + + mBinding.viewPager.setOffscreenPageLimit(5); + mBinding.viewPager.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), mFragments)); + mBinding.viewPager.addOnPageChangeListener(new OnPageSelectedListener() { @Override - public boolean canScrollVertically() { - return false; + public void onPageSelected(int position) { + } }); - - CommonAdapter - baseQuickAdapter = new CommonAdapter(R.layout.item_image_banner, bannerInfos) { - - @Override - protected void convert(BaseViewHolder holder, BannerInfo item) { - - } - - @Override - protected void convert(BaseViewHolder helper, BannerInfo item, int position) { - super.convert(helper, item, position); - if (null == item) { - return; - } - ImageView imageView = helper.getView(R.id.iv_icon); - ImageLoadUtils.loadImage(imageView.getContext(), item.getBannerPic(), imageView); - helper.getAdapterPosition(); - RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) helper.itemView.getLayoutParams(); - if (position == 0) { - params.leftMargin = 0; - } else { - params.leftMargin = -UIUtil.dip2px(mContext, 28); - } - helper.itemView.setLayoutParams(params); - } - }; - - baseQuickAdapter.setOnItemClickListener((ada, view, position) -> { - BannerInfo item = baseQuickAdapter.getItem(position); - if (null == item) { - return; - } - switch (item.getSkipType()) { - case SKIP_TYP_APP: - int routerType = JavaUtil.str2int(item.getSkipUri()); - if (routerType == 0) { - return; - } - switch (routerType) { - case RouterType.VOICE_BOTTLE_PAGE: - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_SOUND_MATCHING, "首页-声音匹配"); - break; - case RouterType.GAME_MATCHING: - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_SMALL_GAME, "首页-小游戏"); - break; - case RouterType.CHAT_PARTY: - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_VOICE_PARTY, "首页-语音派对"); - break; - case RouterType.MINI_WORLD: - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_MINI_WORLD, "首页-小世界"); - break; - default: - break; - } - break; - case SKIP_TYP_H5: - if (item.getBannerName().equals("测一测")) { - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_TEST, "首页-测一测"); - } - break; - - case SKIP_TYPE_ROUTER: - int routerRouterType = JavaUtil.str2int(item.getRouterType()); - switch (routerRouterType) { - case RouterType.MINI_WORLD_TEST: - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_TEST, "首页-测一测"); - break; - } - break; - default: - break; - } - CommonJumpHelper.bannerJump(mContext, item); - }); - mBinding.recyclerView.setAdapter(baseQuickAdapter); - + ViewPagerHelper.bind(mBinding.magicIndicator, mBinding.viewPager); } - /** * 用户信息更新 * @@ -892,6 +768,12 @@ public class GameHomeFragment extends BaseMvpFragment getHomeBanner(int num) { @@ -1010,20 +892,6 @@ public class GameHomeFragment extends BaseMvpFragment { - if (throwable != null) { - } else { - List info = serviceResult; - setBanner(info); - } - }); - - - } private void setBanner(List bannerList){ diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabMapFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabMapFragment.java index 2583844ff..5f7766d86 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabMapFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabMapFragment.java @@ -1,53 +1,40 @@ package com.yizhuan.erban.home.fragment; -import android.annotation.SuppressLint; import android.os.Bundle; +import android.view.View; + import androidx.annotation.Nullable; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; -import android.view.ViewGroup; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.trello.rxlifecycle2.android.FragmentEvent; +import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.NoDataFragment; +import com.yizhuan.erban.base.BaseMvpFragment; +import com.yizhuan.erban.community.publish.presenter.WorldChoosePresenter; import com.yizhuan.erban.home.adapter.HomeRoomFragmentAdapter; -import com.yizhuan.erban.home.model.HomeModel; -import com.yizhuan.xchat_android_core.home.bean.HomeItem; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.yizhuan.erban.home.bean.HomeTabMapInfo; +import com.yizhuan.erban.home.presenter.HomeTabMapPresenter; +import com.yizhuan.erban.home.presenter.IHomeTabMapView; +import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.log.MLog; -import java.util.ArrayList; import java.util.List; -import java.util.concurrent.CancellationException; /** * */ -public class HomeTabMapFragment extends BaseFragment { +@CreatePresenter(HomeTabMapPresenter.class) +public class HomeTabMapFragment extends BaseMvpFragment implements IHomeTabMapView, BaseQuickAdapter.RequestLoadMoreListener { public static final int ROWS = 2; private static final String PARAM_TAB_ID = "tabId"; private RecyclerView recyclerView; + private SwipeRefreshLayout swipeRefresh; private String tabId; private HomeRoomFragmentAdapter mHomeRoomAdapter; - private final Object lock = new Object(); - private static final int PAGE = 1; - private static final int PAGE_SIZE = 20; - /** - * 是否包含了banner - */ - private boolean isContainsBanner = false; - - /** - * 用于显示的数据 - */ - private List totalHomeItemList = new ArrayList<>(); public static HomeTabMapFragment newInstance(int tabId) { - Bundle args = new Bundle(); args.putString(PARAM_TAB_ID, String.valueOf(tabId)); HomeTabMapFragment fragment = new HomeTabMapFragment(); @@ -55,10 +42,6 @@ public class HomeTabMapFragment extends BaseFragment { return fragment; } - public HomeTabMapFragment() { - // Required empty public constructor - } - @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -67,7 +50,6 @@ public class HomeTabMapFragment extends BaseFragment { } } - @Override public int getRootLayoutId() { return R.layout.fragment_home_tab_map; @@ -75,90 +57,108 @@ public class HomeTabMapFragment extends BaseFragment { @Override public void onFindViews() { - super.onFindViews(); recyclerView = mView.findViewById(R.id.recycler_view); + swipeRefresh = mView.findViewById(R.id.swipe_refresh); + } + + @Override + public void onSetListener() { + swipeRefresh.setOnRefreshListener(() -> { + mHomeRoomAdapter.setEnableLoadMore(true); + loadData(true); + }); + } + + @Override + public void initiate() { initRecyclerView(); + loadData(true); } /** * 刷新数据 */ - private void refreshData() { - getData(); + private void loadData(boolean isRefresh) { + getMvpPresenter().loadData(isRefresh,tabId); } - /** - * 请求数据 - */ - @SuppressLint("CheckResult") - private void getData() { - HomeModel.get() - .getHomeTabMap(tabId,PAGE,PAGE_SIZE) - .compose(RxHelper.handleSchedulers()) - .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) - .subscribe((serviceResult, throwable) -> { - if (throwable == null) { - if (ListUtils.isListEmpty(serviceResult)) { - showNoData(); - mHomeRoomAdapter.notifyDataSetChanged(); - } - mHomeRoomAdapter.setNewData(serviceResult); - mHomeRoomAdapter.notifyDataSetChanged(); - - } else { - if (!(throwable instanceof CancellationException)) { - toast("请求失败，请稍后再试！！" + throwable.getMessage()); - } - } - }); + @Override + public View.OnClickListener getLoadMoreListener() { + return super.getLoadMoreListener(); } private void initRecyclerView() { recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); recyclerView.setItemAnimator(null); mHomeRoomAdapter = new HomeRoomFragmentAdapter(getContext()); - mHomeRoomAdapter.setEnableLoadMore(false); + mHomeRoomAdapter.setOnLoadMoreListener(this, recyclerView); GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), ROWS); - mHomeRoomAdapter.setEnableLoadMore(false); recyclerView.setLayoutManager(gridLayoutManager); recyclerView.setAdapter(mHomeRoomAdapter); - View emptyView = getLayoutInflater().inflate(R.layout.layout_home_empty_no_header, null); - ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); - emptyView.setLayoutParams(lp); - mHomeRoomAdapter.setEmptyView(emptyView); } - @Override - public void initiate() { - refreshData(); - } - @Override public void setUserVisibleHint(boolean isVisibleToUser) { super.setUserVisibleHint(isVisibleToUser); } - @SuppressLint("ResourceType") @Override - public void showNoData(View view, int drawable, CharSequence charSequence) { - if (!checkActivityValid()) { - return; - } + public void homeTabMapSuccess(List list) { + hideStatus(); + if (mHomeRoomAdapter != null) { + int page = getMvpPresenter().getPage(); + if (page <= 1) { + swipeRefresh.setRefreshing(false); - if (view == null) { - MLog.error(this, "xuwakao, showNoData view is NULL"); + if (list == null || list.size() == 0) { + showNoData(); + } else { + mHomeRoomAdapter.setNewData(list); + } + } + } + } + + @Override + public void homeTabMapFails(String error) { + hideStatus(); + + int page = getMvpPresenter().getPage(); + if (page <= 1) { + showNoData(); + } + } + + @Override + public void homeTabMapLoadMoreSuccess(List list) { + if (ListUtils.isListEmpty(list)){ + mHomeRoomAdapter.loadMoreEnd(true); return; } - View status = view.findViewById(R.id.status_layout); - if (status == null || status.getId() <= 0) { - MLog.error(this, "xuwakao, had not set layout id "); - return; + mHomeRoomAdapter.addData(list); + mHomeRoomAdapter.loadMoreComplete(); + } + + @Override + public void homeTabMapLoadMoreFails(String error) { + hideStatus(); + int page = getMvpPresenter().getPage(); + if (page <= 1) { + showNoData(); } - NoDataFragment fragment = NoDataFragment.newInstance(R.layout.layout_home_empty_no_header, drawable, charSequence); - fragment.setListener(getLoadListener()); - getChildFragmentManager().beginTransaction().replace(status.getId(), fragment, STATUS_TAG).commitAllowingStateLoss(); + } + + @Override + public void onReloadData() { + super.onReloadData(); + loadData(true); + } + + @Override + public void onLoadMoreRequested() { + loadData(false); } } diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java index 8a4f5c18e..07ca195e8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java @@ -18,6 +18,7 @@ import com.yizhuan.erban.base.BaseMvpFragment; import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.home.adapter.FragmentViewPagerAdapter; import com.yizhuan.erban.home.adapter.TopMagicIndicatorAdapter; +import com.yizhuan.erban.home.bean.HomeTagInfo; import com.yizhuan.erban.home.dialog.CreateRoomDialog; import com.yizhuan.erban.home.presenter.MainFragmentPresenter; import com.yizhuan.erban.home.view.IMainFragmentTabBg; @@ -33,6 +34,7 @@ import com.yizhuan.xchat_android_core.UriProvider; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.certification.CertificationModel; import com.yizhuan.xchat_android_core.family.bean.HomeBannerInfo; +import com.yizhuan.xchat_android_core.home.bean.BannerInfo; import com.yizhuan.xchat_android_core.home.bean.TagListInfo; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; @@ -396,11 +398,6 @@ public class MainFragment extends BaseMvpFragment bannerInfos) { + + } + + @Override + public void onGetHomeTagSuccess(List tagInfos) { + + } } diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java index 33f4df6d6..2132153e6 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java @@ -20,6 +20,7 @@ import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.FragmentMeBinding; import com.yizhuan.erban.decoration.view.MyDecorationActivity; import com.yizhuan.erban.home.activity.CollectionRoomActivity; +import com.yizhuan.erban.home.bean.HomeTagInfo; import com.yizhuan.erban.home.dialog.CreateRoomDialog; import com.yizhuan.erban.home.presenter.MainFragmentPresenter; import com.yizhuan.erban.home.view.IMainFragmentView; @@ -37,6 +38,7 @@ import com.yizhuan.xchat_android_core.certification.CertificationModel; import com.yizhuan.xchat_android_core.customer_server.CustomerServerModel; import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; import com.yizhuan.xchat_android_core.family.bean.HomeBannerInfo; +import com.yizhuan.xchat_android_core.home.bean.BannerInfo; import com.yizhuan.xchat_android_core.home.bean.TagListInfo; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; @@ -655,11 +657,6 @@ public class MeFragment extends BaseMvpFragment bannerInfos) { + + } + + @Override + public void onGetHomeTagSuccess(List tagInfos) { + + } + } diff --git a/app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java b/app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java index eceb648a3..4beb144c4 100644 --- a/app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java +++ b/app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java @@ -9,6 +9,7 @@ import com.yizhuan.xchat_android_core.base.BaseModel; import com.yizhuan.xchat_android_core.bean.response.ServiceResult; import com.yizhuan.xchat_android_core.community.CommunityConstant; import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.net.rxnet.RxNet; @@ -74,6 +75,14 @@ public class HomeModel extends BaseModel { .compose(RxHelper.handleSchedulers()); } + public Single> getHomeConcerns() { + return api.apiHomeConcerns(String.valueOf(AuthModel.get().getCurrentUid()), + CommunityConstant.VERSION_VALID_TYPE, + AuthModel.get().getTicket()) + .compose(RxHelper.handleBeanData()) + .compose(RxHelper.handleSchedulers()); + } + private static final class Helper { public static final HomeModel INSTANCE = new HomeModel(); @@ -169,6 +178,19 @@ public class HomeModel extends BaseModel { @Query("uid") String uid, @Query("types") String types, @Query("ticket") String ticket); + + /** + * 首页顶部收藏房间列表 + * @param uid + * @param types + * @param ticket + * @return + */ + @GET("/home/concerns") + Single>> apiHomeConcerns( + @Query("uid") String uid, + @Query("types") String types, + @Query("ticket") String ticket); } diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/HomeMorePresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/HomeMorePresenter.java new file mode 100644 index 000000000..721069985 --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/HomeMorePresenter.java @@ -0,0 +1,52 @@ +package com.yizhuan.erban.home.presenter; + +import android.annotation.SuppressLint; +import android.os.Bundle; + +import androidx.annotation.Nullable; + +import com.yizhuan.erban.base.BaseMvpPresenter; +import com.yizhuan.erban.home.model.HomeModel; + +public class HomeMorePresenter extends BaseMvpPresenter { + + public HomeMorePresenter() { + + } + + @Override + public void onCreatePresenter(@Nullable Bundle saveState) { + super.onCreatePresenter(saveState); + + } + + @SuppressLint("CheckResult") + public void getHomeTag(){ + HomeModel.get().getHomeTag().subscribe((homeTabResult, throwable) -> { + if (throwable != null) { + if (mMvpView != null) { + mMvpView.getHomeTagFail(); + } + } else { + if (mMvpView != null) { + mMvpView.getHomeTagSuccess(homeTabResult); + } + } + }); + } + + @SuppressLint("CheckResult") + public void getHomeConcerns(){ + HomeModel.get().getHomeConcerns().subscribe((result, throwable) -> { + if (throwable != null) { + if (mMvpView != null) { + mMvpView.getFollowRoomFail(); + } + } else { + if (mMvpView != null) { + mMvpView.getFollowRoomsSuccess(result); + } + } + }); + } +} diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/HomeTabMapPresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/HomeTabMapPresenter.java new file mode 100644 index 000000000..c7bb94125 --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/HomeTabMapPresenter.java @@ -0,0 +1,65 @@ +package com.yizhuan.erban.home.presenter; + +import com.yizhuan.erban.base.BaseMvpPresenter; +import com.yizhuan.erban.home.bean.HomeTabMapInfo; +import com.yizhuan.erban.home.model.HomeModel; +import com.yizhuan.xchat_android_core.Constants; + +import java.util.List; + +import io.reactivex.SingleObserver; +import io.reactivex.disposables.Disposable; + +public class HomeTabMapPresenter extends BaseMvpPresenter { + + private int page = 0; + + public void loadData(boolean isRefresh, String id) { + if (isRefresh) { + page = 1; + } else { + page++; + } + + HomeModel.get().getHomeTabMap(id, page, Constants.PAGE_SIZE) + .compose(bindToLifecycle()).subscribe(new SingleObserver>() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onSuccess(List homeTabMapInfos) { + if (homeTabMapInfos != null) { + if (mMvpView != null) { + if (isRefresh){ + mMvpView.homeTabMapSuccess(homeTabMapInfos); + }else { + mMvpView.homeTabMapLoadMoreSuccess(homeTabMapInfos); + } + } + } else { + if (mMvpView != null) { + if (isRefresh){ + mMvpView.homeTabMapFails("暂无数据"); + }else { + mMvpView.homeTabMapLoadMoreFails("已经到底啦"); + } + } + } + } + + @Override + public void onError(Throwable e) { + if (mMvpView != null) { + mMvpView.homeTabMapFails(e.getMessage()); + } + + } + }); + } + + public int getPage() { + return page; + } +} diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java b/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java new file mode 100644 index 000000000..c53096cf6 --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java @@ -0,0 +1,15 @@ +package com.yizhuan.erban.home.presenter; + +import com.yizhuan.erban.home.bean.HomeTagInfo; +import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo; +import com.yizhuan.xchat_android_library.base.IMvpBaseView; + +import java.util.List; + +public interface IHomeMoreRoomView extends IMvpBaseView { + void getFollowRoomsSuccess(List infos); + void getFollowRoomFail(); + + void getHomeTagSuccess(List infos); + void getHomeTagFail(); +} diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java b/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java new file mode 100644 index 000000000..e3a32304e --- /dev/null +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java @@ -0,0 +1,13 @@ +package com.yizhuan.erban.home.presenter; + +import com.yizhuan.erban.home.bean.HomeTabMapInfo; +import com.yizhuan.xchat_android_library.base.IMvpBaseView; + +import java.util.List; + +public interface IHomeTabMapView extends IMvpBaseView { + void homeTabMapSuccess(List list); + void homeTabMapFails(String error); + void homeTabMapLoadMoreSuccess(List list); + void homeTabMapLoadMoreFails(String error); +} diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java index 441fa7fe8..1921bc50b 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java @@ -6,9 +6,11 @@ import androidx.annotation.Nullable; import android.text.TextUtils; import com.yizhuan.erban.base.BaseMvpPresenter; +import com.yizhuan.erban.home.bean.HomeTagInfo; import com.yizhuan.erban.home.view.IMainFragmentView; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.family.bean.HomeBannerInfo; +import com.yizhuan.xchat_android_core.home.bean.BannerInfo; import com.yizhuan.xchat_android_core.home.bean.TagListInfo; import com.yizhuan.xchat_android_core.home.model.HomeModel; import com.yizhuan.xchat_android_core.market_verify.event.MarketVerifyUpdateEvent; @@ -285,22 +287,41 @@ public class MainFragmentPresenter extends BaseMvpPresenter { } /** - * 获取首页banner和tab + * 获取首页banner */ - public void getHomeBannerInfo() { + public void getHomeBanner(String type) { if (mDisposable != null && !mDisposable.isDisposed()) { return; } - mDisposable = HomeModel.get() - .getQxBannerInfo() + mDisposable = com.yizhuan.erban.home.model.HomeModel.get() + .getHomeBanner(type) .compose(bindUntilEvent(PresenterEvent.DESTROY)) - .subscribe(new BiConsumer() { + .subscribe(new BiConsumer, Throwable>() { @Override - public void accept(HomeBannerInfo homeBannerInfo, Throwable throwable) throws Exception { + public void accept(List infos, Throwable throwable) throws Exception { if (throwable == null) { - getMvpView().onGetFirstPageBannerSucceeded(homeBannerInfo); - } else { - getMvpView().onGetFirstPageBannerFailed(throwable.getMessage()); + getMvpView().onGetHomeBannerSuccess(infos); + } + } + }); + mCompositeDisposable.add(mDisposable); + } + + /** + * 获取首页banner和tab + */ + public void getHomeTag() { + if (mDisposable != null && !mDisposable.isDisposed()) { + return; + } + mDisposable = com.yizhuan.erban.home.model.HomeModel.get() + .getHomeTag() + .compose(bindUntilEvent(PresenterEvent.DESTROY)) + .subscribe(new BiConsumer, Throwable>() { + @Override + public void accept(List infos, Throwable throwable) throws Exception { + if (throwable == null) { + getMvpView().onGetHomeTagSuccess(infos); } } }); @@ -309,7 +330,6 @@ public class MainFragmentPresenter extends BaseMvpPresenter { public void uploadAddress(long uid, String address, int adcode, double longitude, double latitude) { Disposable disposable = HomeModel.get().uploadAddress(uid, address, adcode, longitude, latitude).compose(bindUntilEvent(PresenterEvent.DESTROY)).subscribe(new BiConsumer() { - @Override public void accept(Object o, Throwable throwable) throws Exception { diff --git a/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java b/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java index 46f714c35..c3b5fe5bf 100644 --- a/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java +++ b/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java @@ -1,5 +1,6 @@ package com.yizhuan.erban.home.view; +import com.yizhuan.erban.home.bean.HomeTagInfo; import com.yizhuan.xchat_android_core.family.bean.HomeBannerInfo; import com.yizhuan.xchat_android_core.home.bean.BannerInfo; import com.yizhuan.xchat_android_core.home.bean.TagListInfo; @@ -52,10 +53,7 @@ public interface IMainFragmentView extends IMvpBaseView { } - @Override - public void onGetFirstPageBannerSucceeded(HomeBannerInfo homeBannerInfo) { - } @Override public void onGetFirstPageBannerFailed(String message) { @@ -71,16 +69,21 @@ public interface IMainFragmentView extends IMvpBaseView { public void roomWorldModeCloseFail(String error) { } + + @Override + public void onGetHomeBannerSuccess(List bannerInfos) { + + } + + @Override + public void onGetHomeTagSuccess(List tagInfos) { + + } } void titleListSuccess(List tagListInfoList); void titleListFail(String msg); - /** - * 获取首页banner成功 - * @param homeBannerInfo - */ - void onGetFirstPageBannerSucceeded(HomeBannerInfo homeBannerInfo); /** * 获取首页banner失败 @@ -91,4 +94,8 @@ public interface IMainFragmentView extends IMvpBaseView { void roomWorldModeCloseSuccess(); void roomWorldModeCloseFail(String error); + void onGetHomeBannerSuccess(List bannerInfos); + + void onGetHomeTagSuccess(List tagInfos); + } diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java index 0a21548f4..5735fdac2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java @@ -152,7 +152,8 @@ public class ChargeActivity extends BaseActivity { titleBar.addAction(new TitleBar.TextAction("我的收益",getResources().getColor(R.color.white)) { @Override public void performAction(View view) { - startActivity(new Intent(ChargeActivity.this, ChargeBillsActivity.class)); + CommonWebViewActivity.start(ChargeActivity.this, + UriProvider.getMyIncomeUrl()); } }); } diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java b/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java index 713296b70..0c62e98dc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java @@ -280,10 +280,7 @@ public class SearchActivity extends BaseMvpActivity + + - + android:layout_height="@dimen/dp_drag_layout_avatar_size" + android:layout_centerVertical="true" + android:layout_marginStart="12.5dp" - + > + - + - + + + + + + + + + + + + android:layout_marginEnd="@dimen/dp_18" + android:layout_centerVertical="true" + android:src="@drawable/ic_room_main_entrance_close" + android:layout_width="@dimen/dp_22" + android:layout_height="@dimen/dp_22" /> diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index fc252f7ac..fcde38c27 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -19,7 +19,7 @@ android:layout_gravity="center|start" android:background="@color/transparent" android:scaleType="centerInside" - android:src="@mipmap/common_ic_back" /> + android:src="@drawable/arrow_left" /> diff --git a/app/src/main/res/layout/fragment_home_tab_map.xml b/app/src/main/res/layout/fragment_home_tab_map.xml index 090b99cef..01ea320c7 100644 --- a/app/src/main/res/layout/fragment_home_tab_map.xml +++ b/app/src/main/res/layout/fragment_home_tab_map.xml @@ -1,10 +1,11 @@ - @@ -21,4 +22,4 @@ - + diff --git a/app/src/main/res/layout/item_home_concerns.xml b/app/src/main/res/layout/item_home_concerns.xml new file mode 100644 index 000000000..c0ad48f29 --- /dev/null +++ b/app/src/main/res/layout/item_home_concerns.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_tab_map.xml b/app/src/main/res/layout/item_home_tab_map.xml index 12001e597..624a35c42 100644 --- a/app/src/main/res/layout/item_home_tab_map.xml +++ b/app/src/main/res/layout/item_home_tab_map.xml @@ -29,14 +29,14 @@ 55dp 12dp 15dp - 80dp - 55dp + 190dp + 63dp + 38dp 50dp 70.5dp diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java index f979cc620..0695af131 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java @@ -54,12 +54,10 @@ public class WorldsChooseFrg extends BaseMvpFragment