diff --git a/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomBlackListAdapter.java b/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomBlackListAdapter.java deleted file mode 100644 index 90aa796de..000000000 --- a/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomBlackListAdapter.java +++ /dev/null @@ -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{ - - 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; - } -} diff --git a/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomRankFragmentPageAdapter.java b/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomRankFragmentPageAdapter.java deleted file mode 100644 index 7d253ea59..000000000 --- a/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomRankFragmentPageAdapter.java +++ /dev/null @@ -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 fragmentList; - - public RoomRankFragmentPageAdapter(FragmentManager fm, List fragmentList) { - super(fm); - this.fragmentList = fragmentList; - } - - @Override - public Fragment getItem(int position) { - return fragmentList.get(position); - } - - @Override - public int getCount() { - return fragmentList.size(); - } -} diff --git a/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomRankHalfHourListAdapter.java b/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomRankHalfHourListAdapter.java deleted file mode 100644 index 1438eddc4..000000000 --- a/app/src/main/java/com/nnbc123/app/avroom/adapter/RoomRankHalfHourListAdapter.java +++ /dev/null @@ -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 { - - 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()); - } -} diff --git a/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt b/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt index 420bcdc07..6796ab3cb 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt +++ b/app/src/main/java/com/nnbc123/app/avroom/fragment/HomePartyFragment.kt @@ -28,10 +28,12 @@ import com.nnbc123.app.databinding.FragmentChatroomGameMainBinding import com.nnbc123.app.friend.view.SelectFriendActivity import com.nnbc123.app.home.helper.OpenRoomHelper import com.nnbc123.app.ui.utils.loadAvatar +import com.nnbc123.app.ui.webview.DialogWebViewActivity import com.nnbc123.app.ui.widget.ShareDialog import com.nnbc123.app.ui.widget.ShareDialog.OnShareDialogItemClick import com.nnbc123.app.utils.RegexUtil import com.nnbc123.app.vip.VipMainActivity +import com.nnbc123.core.UriProvider import com.nnbc123.core.gift.bean.GiftMultiReceiverInfo import com.nnbc123.core.gift.bean.GiftReceiveInfo import com.nnbc123.core.gift.bean.LuckyBagGifts @@ -467,11 +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, "房间榜") - if (childFragmentManager.findFragmentByTag("dialog_fragment_room_rank") != null) { - return - } - val roomRankDialogFragment = RoomRankDialogFragment.newInstance() - roomRankDialogFragment.show(childFragmentManager, "dialog_fragment_room_rank") + DialogWebViewActivity.start(mContext, UriProvider.getRoomRanking()) } else -> {} } diff --git a/app/src/main/java/com/nnbc123/app/avroom/fragment/IRoomRankDialogChangePageListener.java b/app/src/main/java/com/nnbc123/app/avroom/fragment/IRoomRankDialogChangePageListener.java deleted file mode 100644 index 6a1c39388..000000000 --- a/app/src/main/java/com/nnbc123/app/avroom/fragment/IRoomRankDialogChangePageListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.nnbc123.app.avroom.fragment; - -public interface IRoomRankDialogChangePageListener { - void onChangePage(int pos); -} diff --git a/app/src/main/java/com/nnbc123/app/avroom/fragment/IRoomRankDialogDismissListener.java b/app/src/main/java/com/nnbc123/app/avroom/fragment/IRoomRankDialogDismissListener.java deleted file mode 100644 index d862e9f66..000000000 --- a/app/src/main/java/com/nnbc123/app/avroom/fragment/IRoomRankDialogDismissListener.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.nnbc123.app.avroom.fragment; - -public interface IRoomRankDialogDismissListener { - void onDismiss(); -} diff --git a/app/src/main/java/com/nnbc123/app/avroom/fragment/RoomRankDialogFragment.java b/app/src/main/java/com/nnbc123/app/avroom/fragment/RoomRankDialogFragment.java deleted file mode 100644 index 2d8704262..000000000 --- a/app/src/main/java/com/nnbc123/app/avroom/fragment/RoomRankDialogFragment.java +++ /dev/null @@ -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 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); - } -} diff --git a/app/src/main/java/com/nnbc123/app/avroom/fragment/RoomRankDialogUtils.java b/app/src/main/java/com/nnbc123/app/avroom/fragment/RoomRankDialogUtils.java deleted file mode 100644 index 5e9ba8291..000000000 --- a/app/src/main/java/com/nnbc123/app/avroom/fragment/RoomRankDialogUtils.java +++ /dev/null @@ -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; - } - } -} diff --git a/app/src/main/java/com/nnbc123/app/avroom/fragment/RoomRankListFragment.java b/app/src/main/java/com/nnbc123/app/avroom/fragment/RoomRankListFragment.java deleted file mode 100644 index 9f35e40b5..000000000 --- a/app/src/main/java/com/nnbc123/app/avroom/fragment/RoomRankListFragment.java +++ /dev/null @@ -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 implements View.OnClickListener, IRoomRankDialogDismissListener{ - - public static RoomRankListFragment newInstance() { - return new RoomRankListFragment(); - } - - @Override - public void initiate() { - mBinding.setClick(this); - List 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; - } -} diff --git a/app/src/main/java/com/nnbc123/app/avroom/presenter/RoomRankHalfHourPresenter.java b/app/src/main/java/com/nnbc123/app/avroom/presenter/RoomRankHalfHourPresenter.java deleted file mode 100644 index 5ff5b7407..000000000 --- a/app/src/main/java/com/nnbc123/app/avroom/presenter/RoomRankHalfHourPresenter.java +++ /dev/null @@ -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 { - - public void getRankListInfo() { - RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo; - if (roomInfo != null) { - RoomRankModel.get() - .getRoomRankHalfHourList(roomInfo.getUid()) - .compose(bindToLifecycle()) - .subscribe(new SingleObserver() { - @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 dataInfoList) { - - if (dataInfoList != null) { - List top3rankInfo; - if (dataInfoList.size() >= 3) { - top3rankInfo = dataInfoList.subList(0, 3); - } else { - top3rankInfo = dataInfoList; - } - mMvpView.showTop3Info(top3rankInfo); - // 第四名开始以后的信息 - List 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 otherRankInfo = new ArrayList<>(); - RoomRankMultiItem item = new RoomRankMultiItem(); - item.setItemType(RoomRankMultiItem.TYPE_EMPTY); - otherRankInfo.add(item); - mMvpView.showRankListInfo(otherRankInfo); - } - } - -} diff --git a/app/src/main/java/com/nnbc123/app/avroom/widget/MicroView.java b/app/src/main/java/com/nnbc123/app/avroom/widget/MicroView.java index dc4645e11..71f7ff78b 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/widget/MicroView.java +++ b/app/src/main/java/com/nnbc123/app/avroom/widget/MicroView.java @@ -116,6 +116,9 @@ public class MicroView extends LinearLayout implements View.OnLayoutChangeListen } private void subMsg() { + if (isInEditMode()) { + return; + } subscribe = IMNetEaseManager.get() .getChatRoomEventObservable().subscribe( roomEvent -> onReceiveRoomEvent(roomEvent), diff --git a/app/src/main/res/layout/dialog_fragment_room_rank.xml b/app/src/main/res/layout/dialog_fragment_room_rank.xml deleted file mode 100644 index 3f44436c7..000000000 --- a/app/src/main/res/layout/dialog_fragment_room_rank.xml +++ /dev/null @@ -1,6 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_rank_half_tips.xml b/app/src/main/res/layout/item_rank_half_tips.xml deleted file mode 100644 index a7fcfd8e1..000000000 --- a/app/src/main/res/layout/item_rank_half_tips.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_room_black.xml b/app/src/main/res/layout/list_item_room_black.xml deleted file mode 100644 index aa0966bad..000000000 --- a/app/src/main/res/layout/list_item_room_black.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java b/core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java index f2bc6b9dc..6930ce68a 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java +++ b/core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java @@ -2,6 +2,8 @@ package com.nnbc123.core; import android.text.TextUtils; +import com.nnbc123.core.initial.InitialModel; +import com.nnbc123.core.initial.bean.InitInfo; import com.nnbc123.core.manager.AvRoomDataManager; /** @@ -68,9 +70,31 @@ public class UriProvider { * 贵族介绍页 */ public static String getRanking() { + InitInfo info = InitialModel.get().getCacheInitInfo(); + if (info != null) { + String uri = info.getH5Uri("rank"); + if (uri != null && uri.length() > 0) { + return uri; + } + } return WEB_URL.concat("/yinmeng/modules/rank/index.html#/rank"); } + /** + * 房间榜单 + */ + public static String getRoomRanking() { + long roomUid = AvRoomDataManager.get().getRoomUid(); + InitInfo info = InitialModel.get().getCacheInitInfo(); + if (info != null) { + String uri = info.getH5Uri("roomRank"); + if (uri != null && uri.length() > 0) { + return uri + "?roomUid=" + roomUid; + } + } + return WEB_URL.concat("/yinmeng/modules/room_rank/index.html?roomUid=" + roomUid); + } + /** * 帮助页 */ @@ -329,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协议 * diff --git a/core/src/main/java/com/nnbc123/core/initial/bean/H5Uri.kt b/core/src/main/java/com/nnbc123/core/initial/bean/H5Uri.kt new file mode 100644 index 000000000..c4cf31648 --- /dev/null +++ b/core/src/main/java/com/nnbc123/core/initial/bean/H5Uri.kt @@ -0,0 +1,9 @@ +package com.nnbc123.core.initial.bean + +import java.io.Serializable + +/** + * Created by Max on 2023/11/5 13:56 + * Desc:H5配置 + **/ +data class H5Uri(val code: String? = null, val uri: String? = null) : Serializable \ No newline at end of file diff --git a/core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java b/core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java index 541b41f86..04377b256 100644 --- a/core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java +++ b/core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java @@ -187,6 +187,36 @@ public class InitInfo implements Serializable { } private List checkUids; + + public List getH5Uris() { + return h5Uris; + } + + /** + * 获取H5-Uri + * @param code + * @return + */ + public String getH5Uri(String code) { + if (code == null) { + return null; + } + if (h5Uris == null) { + return null; + } + for (int i = 0; i < h5Uris.size(); i++) { + H5Uri item = h5Uris.get(i); + if (item.getCode() != null && item.getCode().equals(code)) { + return item.getUri(); + } + } + return null; + } + + public void setH5Uris(List h5Uris) { + h5Uris = h5Uris; + } + private boolean checkInviteCode; private List homeTabList; private int roomBlackListSize; @@ -196,6 +226,8 @@ public class InitInfo implements Serializable { private List officialAccountUids; private boolean twelveStarSwitch; + private List h5Uris; + // @SuppressWarnings("all") public InitInfo() { @@ -839,6 +871,9 @@ public class InitInfo implements Serializable { final Object this$monsters = this.getMonsters(); final Object other$monsters = other.getMonsters(); if (this$monsters == null ? other$monsters != null : !this$monsters.equals(other$monsters)) return false; + final Object this$h5Uris = this.getH5Uris(); + final Object other$h5Uris = other.getH5Uris(); + if (this$h5Uris == null ? other$h5Uris != null : !this$h5Uris.equals(other$h5Uris)) return false; final Object this$tax = this.getTax(); final Object other$tax = other.getTax(); if (this$tax == null ? other$tax != null : !this$tax.equals(other$tax)) return false; @@ -932,6 +967,8 @@ public class InitInfo implements Serializable { result = result * PRIME + ($nobleResource == null ? 43 : $nobleResource.hashCode()); final Object $monsters = this.getMonsters(); result = result * PRIME + ($monsters == null ? 43 : $monsters.hashCode()); + final Object $h5Uris = this.getH5Uris(); + result = result * PRIME + ($h5Uris == null ? 43 : $h5Uris.hashCode()); final Object $tax = this.getTax(); result = result * PRIME + ($tax == null ? 43 : $tax.hashCode()); final Object $webHostName = this.getWebHostName();