yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:删除房间榜单部分代码（新的是H5实现，删除旧原生实现）

Browse Source
This commit is contained in:
Max
2023-11-06 11:44:01 +08:00
parent b9c165f355
commit 892b8192cc
14 changed files with 4 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/com/nnbc123/app/avroom/adapter/RoomBlackListAdapter.java
View File

@@ -1,36 +0,0 @@
package com.nnbc123.app.avroom.adapter;
import android.content.Context;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.nnbc123.app.R;
import com.nnbc123.app.ui.utils.ImageLoadUtils;
import com.nnbc123.app.ui.widget.magicindicator.buildins.UIUtil;
/**
* 右滑操作的，写了暂时不用
* Created by lvzebiao
*/
public class RoomBlackListAdapter extends BaseQuickAdapter<ChatRoomMember, BaseViewHolder>{
private Context context;
private int itemWidth;
public RoomBlackListAdapter(Context context) {
super(R.layout.list_item_room_black);
this.context = context;
itemWidth = UIUtil.getScreenWidth(context);
}
@Override
protected void convert(BaseViewHolder helper, ChatRoomMember chatRoomMember) {
helper.setText(R.id.nick, chatRoomMember.getNick());
ImageLoadUtils.loadAvatar(context, chatRoomMember.getAvatar(), helper.getView(R.id.avatar));
helper.getView(R.id.layout_item).getLayoutParams().width = itemWidth;
}
}

27
app/src/main/java/com/nnbc123/app/avroom/adapter/RoomRankFragmentPageAdapter.java
View File

@@ -1,27 +0,0 @@
package com.nnbc123.app.avroom.adapter;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import java.util.List;
public class RoomRankFragmentPageAdapter extends FragmentPagerAdapter {
private List<Fragment> fragmentList;
public RoomRankFragmentPageAdapter(FragmentManager fm, List<Fragment> fragmentList) {
super(fm);
this.fragmentList = fragmentList;
}
@Override
public Fragment getItem(int position) {
return fragmentList.get(position);
}
@Override
public int getCount() {
return fragmentList.size();
}
}

63
app/src/main/java/com/nnbc123/app/avroom/adapter/RoomRankHalfHourListAdapter.java
View File

@@ -1,63 +0,0 @@
package com.nnbc123.app.avroom.adapter;
import android.content.Context;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.nnbc123.app.R;
import com.nnbc123.app.avroom.fragment.RoomRankDialogUtils;
import com.nnbc123.app.common.widget.CircleImageView;
import com.nnbc123.app.ui.utils.ImageLoadUtils;
import com.nnbc123.core.room.bean.RoomRankHalfHourRankInfo;
import com.nnbc123.core.room.bean.RoomRankMultiItem;
import java.util.ArrayList;
public class RoomRankHalfHourListAdapter extends BaseMultiItemQuickAdapter<RoomRankMultiItem, BaseViewHolder> {
public final static int TYPE_TIPS = 4;
public RoomRankHalfHourListAdapter(Context context) {
super(new ArrayList<>());
addItemType(RoomRankMultiItem.TYPE_LINEAR, R.layout.item_room_rank_layout);
addItemType(RoomRankMultiItem.TYPE_EMPTY, R.layout.item_empty_list);
addItemType(TYPE_TIPS, R.layout.item_rank_half_tips);
}
@Override
protected void convert(BaseViewHolder baseViewHolder, RoomRankMultiItem roomConsumeInfo) {
if (roomConsumeInfo == null) {
return;
}
if (roomConsumeInfo.getItemType() == RoomRankMultiItem.TYPE_LINEAR) {
setLinearData(baseViewHolder, roomConsumeInfo);
} else if (roomConsumeInfo.getItemType() == RoomRankMultiItem.TYPE_EMPTY) {
}
}
private void setLinearData(BaseViewHolder baseViewHolder, RoomRankMultiItem roomConsumeInfo) {
if (roomConsumeInfo == null) {
return;
}
RoomRankHalfHourRankInfo roomRankHalfHourRankInfo = (RoomRankHalfHourRankInfo) roomConsumeInfo.getData();
if (roomRankHalfHourRankInfo == null)
return;
// 值
TextView valueTV = baseViewHolder.getView(R.id.tv_room_rank_value);
valueTV.setText(RoomRankDialogUtils.getRoomRankValueText(roomRankHalfHourRankInfo.getTotalNum()));
int drawable = RoomRankDialogUtils.getNumberImage(roomRankHalfHourRankInfo.getSeqNo());
if (drawable != 0)
baseViewHolder.setImageResource(R.id.iv_number, drawable);
// 标题
baseViewHolder.setText(R.id.tv_room_rank_title, roomRankHalfHourRankInfo.getRoomTitle());
// 头像
CircleImageView avatarView = baseViewHolder.getView(R.id.iv_room_rank_avatar);
ImageLoadUtils.loadAvatar(mContext, roomRankHalfHourRankInfo.getAvatar(), avatarView, true);
baseViewHolder.setText(R.id.tv_room_rank_id, "ID:" + roomRankHalfHourRankInfo.getErbanNo());
}
}

15
app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt
View File

@@ -469,20 +469,7 @@ class HomePartyFragment : BaseFragment(), View.OnClickListener, OnShareDialogIte
.onEvent(StatisticsProtocol.EVENT_CP_ROOM_RANKING_LIST_CLICK, "房间榜")
} else StatisticManager.Instance()
.onEvent(StatisticsProtocol.EVENT_MP_ROOM_RANKING_LIST_CLICK, "房间榜")
val roomUid = AvRoomDataManager.get().mCurrentRoomInfo?.roomUid
var rankUri: String? = null
if (roomUid != null) {
rankUri = UriProvider.getRoomRanking(roomUid)
}
if (rankUri.isNullOrEmpty()) {
if (childFragmentManager.findFragmentByTag("dialog_fragment_room_rank") != null) {
return
}
val roomRankDialogFragment = RoomRankDialogFragment.newInstance()
roomRankDialogFragment.show(childFragmentManager, "dialog_fragment_room_rank")
} else {
DialogWebViewActivity.start(mContext, rankUri)
}
DialogWebViewActivity.start(mContext, UriProvider.getRoomRanking())
}
else -> {}
}

5
app/src/main/java/com/nnbc123/app/avroom/fragment/IRoomRankDialogChangePageListener.java
View File

@@ -1,5 +0,0 @@
package com.nnbc123.app.avroom.fragment;
public interface IRoomRankDialogChangePageListener {
void onChangePage(int pos);
}

5
app/src/main/java/com/nnbc123/app/avroom/fragment/IRoomRankDialogDismissListener.java
View File

@@ -1,5 +0,0 @@
package com.nnbc123.app.avroom.fragment;
public interface IRoomRankDialogDismissListener {
void onDismiss();
}

98
app/src/main/java/com/nnbc123/app/avroom/fragment/RoomRankDialogFragment.java
View File

@@ -1,98 +0,0 @@
package com.nnbc123.app.avroom.fragment;
import android.app.Dialog;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.app.AppCompatDialogFragment;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import com.nnbc123.app.R;
import com.nnbc123.app.avroom.adapter.RoomRankFragmentPageAdapter;
import java.util.ArrayList;
import java.util.List;
public class RoomRankDialogFragment extends AppCompatDialogFragment implements IRoomRankDialogDismissListener, IRoomRankDialogChangePageListener {
private ViewPager mViewPager;
public static RoomRankDialogFragment newInstance() {
Bundle args = new Bundle();
RoomRankDialogFragment fragment = new RoomRankDialogFragment();
fragment.setArguments(args);
return fragment;
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
if (getActivity() != null) {
Dialog dialog = new Dialog(getActivity(), R.style.room_rank_dialog);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setContentView(R.layout.dialog_fragment_room_rank);
dialog.setCanceledOnTouchOutside(true);
// 设置弹出框布局参数，宽度铺满全屏，底部。
Window window = dialog.getWindow();
if (window != null) {
WindowManager.LayoutParams wlp = window.getAttributes();
wlp.gravity = Gravity.BOTTOM;
wlp.width = WindowManager.LayoutParams.MATCH_PARENT;
wlp.height = WindowManager.LayoutParams.WRAP_CONTENT;
window.setDimAmount(0.3f);
window.setAttributes(wlp);
window.setBackgroundDrawableResource(R.drawable.bg_room_rank);
return dialog;
} else {
return super.onCreateDialog(savedInstanceState);
}
} else {
return super.onCreateDialog(savedInstanceState);
}
}
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.dialog_fragment_room_rank, container, false);
mViewPager = view.findViewById(R.id.vp_room_rank);
List<Fragment> fragmentList = new ArrayList<>();
if (getChildFragmentManager().getFragments() != null && getChildFragmentManager().getFragments().size() != 0) {
fragmentList = getChildFragmentManager().getFragments();
} else {
RoomRankListFragment roomInsideFragment = RoomRankListFragment.newInstance();
roomInsideFragment.setDismissListener(this);
roomInsideFragment.setChangePageListener(this);
fragmentList.add(roomInsideFragment);
}
mViewPager.setAdapter(new RoomRankFragmentPageAdapter(getChildFragmentManager(), fragmentList));
mViewPager.setOffscreenPageLimit(fragmentList.size());
mViewPager.setCurrentItem(0, false);
return view;
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setCancelable(true);
}
@Override
public void onDismiss() {
dismiss();
}
@Override
public void onChangePage(int pos) {
mViewPager.setCurrentItem(pos, false);
}
}

64
app/src/main/java/com/nnbc123/app/avroom/fragment/RoomRankDialogUtils.java
View File

@@ -1,64 +0,0 @@
package com.nnbc123.app.avroom.fragment;
import com.nnbc123.app.R;
import java.math.BigDecimal;
public class RoomRankDialogUtils {
public static String getRoomRankValueText(int value) {
if (value >= 10000) {
BigDecimal bigDecimal = new BigDecimal(value / 10000.0);
double doubleValue = bigDecimal.setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
return String.valueOf(doubleValue) + "万";
} else {
return String.valueOf(value);
}
}
public static int getNumberImage(int number) {
switch (number) {
case 1:
return R.drawable.ic_rank_1;
case 2:
return R.drawable.ic_rank_2;
case 3:
return R.drawable.ic_rank_3;
case 4:
return R.drawable.ic_rank_4;
case 5:
return R.drawable.ic_rank_5;
case 6:
return R.drawable.ic_rank_6;
case 7:
return R.drawable.ic_rank_7;
case 8:
return R.drawable.ic_rank_8;
case 9:
return R.drawable.ic_rank_9;
case 10:
return R.drawable.ic_rank_10;
case 11:
return R.drawable.ic_rank_11;
case 12:
return R.drawable.ic_rank_12;
case 13:
return R.drawable.ic_rank_13;
case 14:
return R.drawable.ic_rank_14;
case 15:
return R.drawable.ic_rank_15;
case 16:
return R.drawable.ic_rank_16;
case 17:
return R.drawable.ic_rank_17;
case 18:
return R.drawable.ic_rank_18;
case 19:
return R.drawable.ic_rank_19;
case 20:
return R.drawable.ic_rank_20;
default:
return 0;
}
}
}

79
app/src/main/java/com/nnbc123/app/avroom/fragment/RoomRankListFragment.java
View File

@@ -1,79 +0,0 @@
package com.nnbc123.app.avroom.fragment;
import androidx.fragment.app.Fragment;
import android.view.View;
import com.nnbc123.app.R;
import com.nnbc123.app.avroom.adapter.RoomContributeListAdapter;
import com.nnbc123.app.avroom.widget.RoomRankNavigatorAdapter;
import com.nnbc123.app.base.BaseBindingFragment;
import com.nnbc123.app.ui.widget.magicindicator.ViewPagerHelper;
import com.nnbc123.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
import com.nnbc123.library.annatation.ActLayoutRes;
import java.util.ArrayList;
import java.util.List;
import com.nnbc123.app.databinding.FragmentRoomRankListBinding;
@ActLayoutRes(R.layout.fragment_room_rank_list)
public class RoomRankListFragment extends BaseBindingFragment<FragmentRoomRankListBinding> implements View.OnClickListener, IRoomRankDialogDismissListener{
public static RoomRankListFragment newInstance() {
return new RoomRankListFragment();
}
@Override
public void initiate() {
mBinding.setClick(this);
List<Fragment> list = new ArrayList<>(2);
list.add(new RoomContributeListFragment());
list.add(RoomCharmListFragment.newInstance());
mBinding.viewPager.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), list));
CommonNavigator commonNavigator = new CommonNavigator(getActivity());
commonNavigator.setAdjustMode(true);
RoomRankNavigatorAdapter indicator = new RoomRankNavigatorAdapter();
indicator.setOnItemSelectListener(position -> mBinding.viewPager.setCurrentItem(position));
commonNavigator.setAdapter(indicator);
mBinding.miRoomRank.setNavigator(commonNavigator);
ViewPagerHelper.bind(mBinding.miRoomRank, mBinding.viewPager);
}
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.tv_room_rank_half_hour_tab:
goToChangePage(0);
break;
case R.id.tv_room_rank_in_room_tab:
goToChangePage(1);
break;
}
}
private IRoomRankDialogDismissListener dismissListener;
private IRoomRankDialogChangePageListener changePageListener;
@Override
public void onDismiss() {
if (dismissListener != null) {
dismissListener.onDismiss();
}
}
public void setDismissListener(IRoomRankDialogDismissListener dismissListener) {
this.dismissListener = dismissListener;
}
/**
* 修改最外层Dialog的显示页面
*/
private void goToChangePage(int pos) {
if (changePageListener != null) {
changePageListener.onChangePage(pos);
}
}
public void setChangePageListener(IRoomRankDialogChangePageListener changePageListener) {
this.changePageListener = changePageListener;
}
}

103
app/src/main/java/com/nnbc123/app/avroom/presenter/RoomRankHalfHourPresenter.java
View File

@@ -1,103 +0,0 @@
package com.nnbc123.app.avroom.presenter;
import com.nnbc123.app.avroom.fragment.IRoomRankHalfHourView;
import com.nnbc123.core.manager.AvRoomDataManager;
import com.nnbc123.core.room.bean.RoomInfo;
import com.nnbc123.core.room.bean.RoomRankHalfHourDataInfo;
import com.nnbc123.core.room.bean.RoomRankHalfHourRankInfo;
import com.nnbc123.core.room.bean.RoomRankMultiItem;
import com.nnbc123.core.room.model.RoomRankModel;
import com.nnbc123.library.base.factory.AbstractMvpPresenter;
import com.nnbc123.library.utils.SingleToastUtil;
import java.util.ArrayList;
import java.util.List;
import io.reactivex.SingleObserver;
import io.reactivex.disposables.Disposable;
public class RoomRankHalfHourPresenter extends AbstractMvpPresenter<IRoomRankHalfHourView> {
public void getRankListInfo() {
RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
if (roomInfo != null) {
RoomRankModel.get()
.getRoomRankHalfHourList(roomInfo.getUid())
.compose(bindToLifecycle())
.subscribe(new SingleObserver<RoomRankHalfHourDataInfo>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onSuccess(RoomRankHalfHourDataInfo roomRankHalfHourDataInfo) {
if (roomRankHalfHourDataInfo != null) {
if (mMvpView != null) {
if (roomRankHalfHourDataInfo.getMe() != null) {
mMvpView.showMeInfo(roomRankHalfHourDataInfo.getMe());
} else
mMvpView.showMeInfo(null);
transformData(roomRankHalfHourDataInfo.getRankVoList());
}
} else {
if (mMvpView != null)
mMvpView.loadDataFailure();
}
}
@Override
public void onError(Throwable e) {
if (mMvpView != null)
mMvpView.loadDataFailure();
SingleToastUtil.showToast(e.getMessage());
}
});
}
}
private void transformData(List<RoomRankHalfHourRankInfo> dataInfoList) {
if (dataInfoList != null) {
List<RoomRankHalfHourRankInfo> top3rankInfo;
if (dataInfoList.size() >= 3) {
top3rankInfo = dataInfoList.subList(0, 3);
} else {
top3rankInfo = dataInfoList;
}
mMvpView.showTop3Info(top3rankInfo);
// 第四名开始以后的信息
List<RoomRankMultiItem> otherRankInfo = new ArrayList<>();
if (dataInfoList.size() > 3) {
for (int i = 3; i < dataInfoList.size(); i++) {
RoomRankHalfHourRankInfo info = dataInfoList.get(i);
RoomRankMultiItem item = new RoomRankMultiItem();
item.setItemType(RoomRankMultiItem.TYPE_LINEAR);
item.setData(info);
otherRankInfo.add(item);
}
}
// RoomRankMultiItem item = new RoomRankMultiItem();
// item.setItemType(RoomRankHalfHourListAdapter.TYPE_TIPS);
// otherRankInfo.add(item);
mMvpView.showRankListInfo(otherRankInfo);
} else {
mMvpView.showTop3Info(null);
List<RoomRankMultiItem> otherRankInfo = new ArrayList<>();
RoomRankMultiItem item = new RoomRankMultiItem();
item.setItemType(RoomRankMultiItem.TYPE_EMPTY);
otherRankInfo.add(item);
mMvpView.showRankListInfo(otherRankInfo);
}
}
}

6
app/src/main/res/layout/dialog_fragment_room_rank.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.nnbc123.app.avroom.widget.RoomRankWrapViewPager xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/vp_room_rank"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"/>

24
app/src/main/res/layout/item_rank_half_tips.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/color_f5f5f5"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="每整点半小时内，房间礼物流水排名前十将有机会登上房间首页的官方推荐哦~"
android:textSize="12dp"
android:textColor="@color/color_999999"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="38dp"/>
</LinearLayout>

81
app/src/main/res/layout/list_item_room_black.xml
View File

@@ -1,81 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.nnbc123.app.avroom.widget.SliddingView
android:scrollbars="none"
android:layout_width="match_parent"
android:layout_height="65dp">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/layout_item"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.nnbc123.app.common.widget.CircleImageView
android:id="@+id/avatar"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_marginStart="20dp"
android:layout_centerVertical="true"
/>
<LinearLayout
android:layout_toEndOf="@id/avatar"
android:layout_width="wrap_content"
android:orientation="vertical"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
>
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_333333"
android:text="昵称:"
android:textSize="@dimen/sp_15"
android:singleLine="true"
android:maxWidth="250dp"
/>
<TextView
android:id="@+id/erban_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ID:111111"
android:textColor="@color/text_color_secondary"
android:textSize="12dp"
android:visibility="gone"
/>
</LinearLayout>
</RelativeLayout>
<TextView
android:id="@+id/remove_opration"
android:layout_width="63dp"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@color/color_FF3362"
android:gravity="center"
android:text="删除"
android:textColor="@color/white"
android:textSize="@dimen/sp_15" />
</LinearLayout>
</com.nnbc123.app.avroom.widget.SliddingView>
<View
android:background="@color/line_color"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_width="match_parent"
android:layout_height="1px" />
</LinearLayout>

12
core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java
View File

@@ -83,7 +83,8 @@ public class UriProvider {
/**
* 房间榜单
*/
public static String getRoomRanking(long roomUid) {
public static String getRoomRanking() {
long roomUid = AvRoomDataManager.get().getRoomUid();
InitInfo info = InitialModel.get().getCacheInitInfo();
if (info != null) {
String uri = info.getH5Uri("roomRank");
@@ -91,7 +92,7 @@ public class UriProvider {
return uri + "?roomUid=" + roomUid;
}
}
return null;
return WEB_URL.concat("/yinmeng/modules/room_rank/index.html?roomUid=" + roomUid);
}
/**
@@ -352,13 +353,6 @@ public class UriProvider {
}
/**
* 房间排行榜
*/
public static String getRoomRanking() {
return WEB_URL.concat("/yinmeng/modules/room_rank/index.html?roomUid=" + AvRoomDataManager.get().getRoomUid());
}
/**
* 第三方SDK协议
*