去掉房间小时榜、房间排行榜、粉丝团、个播房

去掉礼物入口首充图标
去掉规则一些H5入口
去掉首页排行榜入口

app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java

@@ -352,11 +352,11 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
 //                        tempFragment = GameRoomFragment.newInstance();
 //                    }
 //                    break;
-                case RoomInfo.ROOM_TYPE_SINGLE:
+//                case RoomInfo.ROOM_TYPE_SINGLE:
-                    if (!(tempFragment instanceof SingleRoomFragment)) {
+//                    if (!(tempFragment instanceof SingleRoomFragment)) {
-                        tempFragment = SingleRoomFragment.newInstance();
+//                        tempFragment = SingleRoomFragment.newInstance();
-                    }
+//                    }
-                    break;
+//                    break;
                 default:
                     if (!(tempFragment instanceof HomePartyRoomFragment)) {
                         tempFragment = HomePartyRoomFragment.newInstance();

app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java

@@ -8,10 +8,7 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.databinding.DataBindingUtil;
 
-import com.chwl.app.avroom.rank.RoomRankWidget;
 import com.chwl.app.music.widget.MusicPlayerView;
-import com.chwl.app.ui.webview.DialogWebViewActivity;
-import com.chwl.core.home.bean.BannerInfo;
 import com.netease.nim.uikit.common.util.log.LogUtil;
 import com.trello.rxlifecycle3.android.FragmentEvent;
 import com.chwl.app.R;
@@ -45,7 +42,6 @@ import com.chwl.core.im.custom.bean.RoomPkBean;
 import com.chwl.core.manager.AvRoomDataManager;
 import com.chwl.core.manager.RoomEvent;
 import com.chwl.core.market_verify.MarketVerifyModel;
-import com.chwl.core.pay.event.FirstChargeEvent;
 import com.chwl.core.room.bean.RoomInfo;
 import com.chwl.core.room.event.DatingSelectUserEvent;
 import com.chwl.core.room.face.DynamicFaceModel;
@@ -135,7 +131,6 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
     @Override
     public void initWidget() {
         super.initWidget();
-        registerWidget(RoomRankWidget.class.getSimpleName(), gameBinding.rankWidget);
     }
 
     @SuppressLint("CheckResult")
@@ -589,12 +584,6 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
                     getMvpPresenter().cancelDragon();
                 });
                 break;
-            case R.id.tv_hour_rank:
-                DialogWebViewActivity.start(
-                        mContext,
-                        UriProvider.getRoomHourRankUrl(AvRoomDataManager.get().getRoomUid())
-                );
-                break;
             default:
                 break;
         }
@@ -783,42 +772,6 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
         if (AvRoomDataManager.get().mCurrentRoomInfo == null) {
             return;
         }
-
-        if (AvRoomDataManager.get().mCurrentRoomInfo.getIsPermitRoom() == 1) {
-            gameBinding.tvHourRank.setVisibility(View.VISIBLE);
-        } else {
-            gameBinding.tvHourRank.setVisibility(View.GONE);
-        }
-
-//        if (!GoldBoxHelper.needIntegrateBoxEntrance()) {
-//            GoldBoxHelper.isHideBox().subscribe(
-//                    hide -> {
-//                        if (hide != null && !hide) {
-//                            if (AvRoomDataManager.get().isCpRoom()) {
-//                                gameBinding.ivTreasureBoxCp.setVisibility(View.VISIBLE);
-//                                gameBinding.ivTreasureBox.setVisibility(View.GONE);
-//                            } else {
-//                                gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
-//                                gameBinding.ivTreasureBox.setVisibility(View.VISIBLE);
-//                                GlideApp.with(BasicConfig.INSTANCE.getAppContext())
-//                                        .load(GoldBoxHelper.getBoxIcon())
-//                                        .error(R.drawable.icon_room_treasure_box)
-//                                        .into(gameBinding.ivTreasureBox);
-//                            }
-//                        } else {
-//                            gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
-//                            gameBinding.ivTreasureBox.setVisibility(View.GONE);
-//                        }
-//                    },
-//                    throwable -> {
-//                        gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
-//                        gameBinding.ivTreasureBox.setVisibility(View.GONE);
-//                    });
-//        } else {
-//            gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
-//            gameBinding.ivTreasureBox.setVisibility(View.GONE);
-//        }
-
         setDragonView();
     }
 

app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt

@@ -1,250 +0,0 @@
-package com.chwl.app.avroom.fragment
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.View
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.viewModels
-import com.chwl.app.R
-import com.chwl.app.avroom.adapter.OnMicroItemClickListener
-import com.chwl.app.avroom.adapter.SingleAnchorMicroViewAdapter
-import com.chwl.app.avroom.adapter.SingleRoomPKMicroViewAdapter
-import com.chwl.app.avroom.dialog.RequestUpMicDialog
-import com.chwl.app.avroom.presenter.SingleRoomPresenter
-import com.chwl.app.avroom.rank.RoomRankWidget
-import com.chwl.app.avroom.singleroompk.SingleRoomPkFinishDialog
-import com.chwl.app.avroom.singleroompk.SingleRoomPkForceFinishDialog
-import com.chwl.app.avroom.singleroompk.SingleRoomPkReceivedDialog
-import com.chwl.app.avroom.view.ISingleRoomView
-import com.chwl.app.databinding.FragmentSingleRoomBinding
-import com.chwl.app.fansteam.FansTeamJoinActivity
-import com.chwl.app.fansteam.FansTeamJoinedActivity
-import com.chwl.app.fansteam.FansTeamViewModel
-import com.chwl.app.music.widget.MusicPlayerView
-import com.chwl.app.ui.webview.CommonWebViewActivity
-import com.chwl.app.ui.webview.DialogWebViewActivity
-import com.chwl.core.UriProvider
-import com.chwl.core.auth.AuthModel
-import com.chwl.core.fansteam.bean.FansTeamInitInfo
-import com.chwl.core.home.bean.BannerInfo
-import com.chwl.core.im.custom.bean.FansTeamMsgAttachment
-import com.chwl.core.im.custom.bean.RequestUpmicAttachment
-import com.chwl.core.im.custom.bean.RoomPKAttachment
-import com.chwl.core.manager.AvRoomDataManager
-import com.chwl.core.manager.RoomEvent
-import com.chwl.core.pay.event.FirstChargeEvent
-import com.chwl.core.user.bean.UserInfo
-import com.chwl.library.base.factory.CreatePresenter
-import com.chwl.library.utils.ResUtil
-import com.example.lib_utils.ktx.singleClick
-import com.netease.nim.uikit.common.util.sys.ScreenUtil
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
-
-/**
- * 個播房間
- *
- * @author chenran
- * @date 2017/7/26
- */
-@CreatePresenter(SingleRoomPresenter::class)
-class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresenter?>(),
-    ISingleRoomView, OnMicroItemClickListener {
-
-    companion object {
-        @JvmStatic
-        fun newInstance(): SingleRoomFragment {
-            val roomFragment = SingleRoomFragment()
-            val bundle = Bundle()
-            roomFragment.arguments = bundle
-            return roomFragment
-        }
-    }
-
-    private lateinit var gameBinding: FragmentSingleRoomBinding
-    private lateinit var upMicDialog: RequestUpMicDialog
-
-    private val fansTeamViewModel: FansTeamViewModel by viewModels()
-    override fun getRootLayoutId(): Int {
-        return R.layout.fragment_single_room
-    }
-
-    override fun onFindViews() {
-        super.onFindViews()
-        gameBinding = DataBindingUtil.bind(mView)!!
-        gameBinding.lifecycleOwner = this
-        gameBinding.click = this
-    }
-
-
-    @SuppressLint("CheckResult")
-    override fun initiate() {
-        super.initiate()
-        fansTeamViewModel.loadFansTeamInitInfo()
-
-        fansTeamViewModel.fansTeamInitInfoLiveData.observe(viewLifecycleOwner) {
-            it?.let {
-                updateFansTeamInfo(it)
-            }
-        }
-
-        gameBinding.tvHourRank.singleClick {
-            DialogWebViewActivity.start(
-                mContext,
-                UriProvider.getSingleRoomHourRankUrl(AvRoomDataManager.get().roomUid)
-            )
-        }
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun updateFansTeamInfo(initInfo: FansTeamInitInfo) {
-        var clickListener: View.OnClickListener? = null
-        if (initInfo.hasFansTeamCurrentRoom) {
-            if (AvRoomDataManager.get().isRoomOwner) {
-                gameBinding.flFansTeamJoinTip.isVisible = false
-                gameBinding.tvFansTeamOpt.isVisible = true
-                gameBinding.tvFansTeamOpt.text = ResUtil.getString(R.string.fan_club)+"(${initInfo.anchorFansNum})"
-                clickListener = View.OnClickListener {
-                    DialogWebViewActivity.start(
-                        requireContext(),
-                        UriProvider.getFansTeamMyFansUrl(AvRoomDataManager.get().roomUid)
-                    )
-                }
-            } else {
-                if (initInfo.isAnchorFans) {
-                    gameBinding.flFansTeamJoinTip.isVisible = false
-                    gameBinding.tvFansTeamOpt.isVisible = true
-                    gameBinding.tvFansTeamOpt.text =
-                        "${ResUtil.getString(R.string.fan)}LV.${if (initInfo.fansLevelSeq == 0) 1 else initInfo.fansLevelSeq}"
-                    clickListener = View.OnClickListener {
-                        FansTeamJoinedActivity.start(requireContext())
-                    }
-                } else {
-                    gameBinding.flFansTeamJoinTip.isVisible = true
-                    gameBinding.tvFansTeamOpt.isVisible = false
-                    clickListener = View.OnClickListener {
-                        FansTeamJoinActivity.start(requireContext())
-                    }
-                }
-            }
-        } else {
-            if (AvRoomDataManager.get().isRoomOwner) {
-                gameBinding.flFansTeamJoinTip.isVisible = false
-                gameBinding.tvFansTeamOpt.isVisible = true
-                gameBinding.tvFansTeamOpt.text = ResUtil.getString(R.string.open_fan_club)
-                clickListener = View.OnClickListener {
-                    CommonWebViewActivity.start(
-                        requireContext(),
-                        UriProvider.getFansTeamOpenUrl(AvRoomDataManager.get().roomUid)
-                    )
-                }
-            } else {
-                gameBinding.flFansTeamJoinTip.isVisible = false
-                gameBinding.tvFansTeamOpt.isVisible = true
-                gameBinding.tvFansTeamOpt.text = ResUtil.getString(R.string.layout_fragment_single_room_03)
-            }
-        }
-        gameBinding.flFansTeam.setOnClickListener(clickListener)
-    }
-
-    override fun onReceiveRoomEvent(roomEvent: RoomEvent?) {
-        super.onReceiveRoomEvent(roomEvent)
-        if (roomEvent == null) return
-        when (roomEvent.event) {
-            RoomEvent.REQUEST_UP_MIC -> {
-                (roomEvent.chatRoomMessage?.attachment as? RequestUpmicAttachment)?.userInfo?.let {
-                    showInviteDialog(it)
-                }
-            }
-            RoomEvent.FANS_TEAM_OPEN_SUCCESS,
-            RoomEvent.FANS_TEAM_OPEN_FAILED,
-            RoomEvent.FANS_TEAM_JOIN,
-            RoomEvent.FANS_TEAM_EXIT -> {
-                (roomEvent.chatRoomMessage?.attachment as? FansTeamMsgAttachment)?.fansTeamMsgInfo?.let {
-                    val currFansTeamInitInfo = fansTeamViewModel.fansTeamInitInfoLiveData.value
-                    updateFansTeamInfo(
-                        FansTeamInitInfo(
-                            it.count,
-                            currFansTeamInitInfo?.fansLevelSeq ?: 1,
-                            roomEvent.event != RoomEvent.FANS_TEAM_OPEN_FAILED,
-                            if (AuthModel.get().currentUid == it.uid) {
-                                roomEvent.event == RoomEvent.FANS_TEAM_JOIN
-                            } else {
-                                currFansTeamInitInfo?.isAnchorFans ?: false
-                            },
-                            AvRoomDataManager.get().isRoomOwner,
-                            roomEvent.event == RoomEvent.FANS_TEAM_OPEN_FAILED
-                        )
-                    )
-                }
-            }
-            RoomEvent.ROOM_PK_INVITE ->
-                SingleRoomPkReceivedDialog.newInstance((roomEvent.chatRoomMessage.attachment as RoomPKAttachment).roomPkBean)
-                    .show(mContext)
-            RoomEvent.ROOM_PK_FINISH -> {
-                val roomPkBean =
-                    (roomEvent.chatRoomMessage.attachment as RoomPKAttachment).roomPkBean
-                if (roomPkBean.isForce) {
-                    SingleRoomPkForceFinishDialog.newInstance(roomPkBean).show(mContext)
-                } else {
-                    SingleRoomPkFinishDialog.newInstance(roomPkBean).show(mContext)
-                }
-                gameBinding.microView.adapter?.notifyDataSetChanged()
-            }
-
-        }
-    }
-
-    //顯示請求上麥彈窗
-    private fun showInviteDialog(userInfo: UserInfo) {
-        if (!this::upMicDialog.isInitialized) {
-            upMicDialog = RequestUpMicDialog(requireContext())
-        }
-        if (!upMicDialog.isShowing) {
-            upMicDialog.openDialog()
-            upMicDialog.setUser(userInfo)
-        }
-    }
-
-    override fun onSetListener() {
-        super.onSetListener()
-        bottomView.setBottomViewListener(BaseRoomBottomViewWrapper())
-    }
-
-    override fun onEnterRoom() {
-        super.onEnterRoom()
-        fansTeamViewModel.loadFansTeamInitInfo()
-    }
-
-    override fun updateView() {
-        super.updateView()
-        if (AvRoomDataManager.get().isOpenAnotherPKMode && gameBinding.microView.adapter !is SingleRoomPKMicroViewAdapter) {
-            gameBinding.microView.bindAdapter(SingleRoomPKMicroViewAdapter(context))
-            gameBinding.viewPkBoard.isVisible = true
-            gameBinding.microView.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                topMargin = ScreenUtil.dip2px(140f)
-            }
-        } else if (!AvRoomDataManager.get().isOpenAnotherPKMode && gameBinding.microView.adapter !is SingleAnchorMicroViewAdapter) {
-            gameBinding.microView.bindAdapter(SingleAnchorMicroViewAdapter(context))
-            gameBinding.viewPkBoard.isVisible = false
-            gameBinding.microView.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                topMargin = ScreenUtil.dip2px(110f)
-            }
-        } else {
-            gameBinding.microView.adapter?.notifyDataSetChanged()
-        }
-    }
-
-    override fun initWidget() {
-        super.initWidget()
-        registerWidget(RoomRankWidget::class.java.simpleName, gameBinding.rankWidget)
-    }
-
-    override fun onInitMusicPlayerView(view: MusicPlayerView) {
-        super.onInitMusicPlayerView(view)
-        view.linkIconView(gameBinding.ivMusic, gameBinding.ivMusic)
-    }
-}

app/src/main/java/com/chwl/app/avroom/rank/RoomRankWidget.kt

@@ -1,90 +0,0 @@
-package com.chwl.app.avroom.rank
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import androidx.core.view.isVisible
-import androidx.databinding.DataBindingUtil
-import com.chwl.app.R
-import com.chwl.app.databinding.RoomRankWidgetBinding
-import com.chwl.app.ui.utils.loadAvatar
-import com.chwl.app.ui.webview.DialogWebViewActivity
-import com.chwl.core.UriProvider
-import com.chwl.core.room.bean.RoomContributeDataInfo
-import com.chwl.core.room.bean.RoomContributeUserInfo
-import com.chwl.core.room.model.RoomContributeListModel
-import com.chwl.core.support.room.FrameLayoutRoomWidget
-import com.chwl.core.support.room.RoomContext
-import com.chwl.core.support.room.RoomView
-import com.chwl.core.support.room.RoomWidget
-import com.chwl.core.utils.net.RxHelper
-import com.example.lib_utils.ktx.singleClick
-
-/**
- * 房间榜单入口
- */
-class RoomRankWidget : FrameLayoutRoomWidget, RoomWidget {
-
-    private val binding: RoomRankWidgetBinding =
-        DataBindingUtil.inflate(
-            LayoutInflater.from(
-                context
-            ), R.layout.room_rank_widget, this, true
-        )
-
-    constructor(context: Context) : super(context)
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    )
-
-    constructor(
-        context: Context,
-        attrs: AttributeSet?,
-        defStyleAttr: Int,
-        defStyleRes: Int
-    ) : super(context, attrs, defStyleAttr, defStyleRes)
-
-    init {
-        this.singleClick {
-            DialogWebViewActivity.start(context, UriProvider.getRoomRanking())
-            refreshData()
-        }
-    }
-
-    override fun onInitialize(roomView: RoomView, roomContext: RoomContext) {
-        super.onInitialize(roomView, roomContext)
-        refreshData()
-    }
-
-    override fun onUnbindContext() {
-        super.onUnbindContext()
-        updateView(null)
-    }
-
-    private fun refreshData() {
-        val disposable = RoomContributeListModel.get()
-            .getSingleRoomRanking(1, RoomContributeDataInfo.TYPE_ROOM_DAY_RANKING)
-            .compose(RxHelper.handleBeanData())
-            .subscribe { roomContributeDataInfo: RoomContributeDataInfo ->
-                updateView(roomContributeDataInfo.rankings)
-            }
-        getCompositeDisposable().add(disposable)
-    }
-
-    private fun updateView(list: List<RoomContributeUserInfo>?) {
-        arrayListOf(
-            binding.ivRank0, binding.ivRank1, binding.ivRank2
-        ).forEachIndexed { index, imageView ->
-            val url = list?.getOrNull(index)?.avatar
-            if (url.isNullOrEmpty()) {
-                imageView.isVisible = false
-            } else {
-                imageView.loadAvatar(url)
-                imageView.isVisible = true
-            }
-        }
-    }
-}

app/src/main/java/com/chwl/app/avroom/widget/BottomView.java

@@ -131,15 +131,6 @@ public class BottomView extends FrameLayout implements View.OnClickListener {
             sendGift.setVisibility(GONE);
             sendMsgInput.setVisibility(GONE);
         }
-
-        UserModel.get().getCurrentUserInfo()
-                .compose(RxHelper.bindContext(getContext()))
-                .subscribe(userInfo -> {
-                    if (userInfo.isFirstCharge()) {
-                        sendGift.setImageResource(R.drawable.icon_room_send_gift_first_charge);
-                    }
-                });
-
     }
 
     @Override

app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt

@@ -1,108 +0,0 @@
-package com.chwl.app.fansteam
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.view.Gravity
-import android.view.WindowManager
-import androidx.activity.viewModels
-import com.chwl.app.R
-import com.chwl.app.base.BaseViewBindingActivity
-import com.chwl.app.databinding.ActivityFansTeamJoinBinding
-import com.chwl.app.ui.utils.load
-import com.chwl.app.ui.webview.DialogWebViewActivity
-import com.chwl.core.UriProvider
-import com.chwl.core.gift.GiftModel
-import com.chwl.core.manager.AvRoomDataManager
-import com.chwl.core.utils.net.handleBeanData
-import com.chwl.core.utils.extension.subAndReplaceDot
-import com.chwl.core.utils.extension.toast
-import com.chwl.library.utils.ResUtil
-
-class FansTeamJoinActivity : BaseViewBindingActivity<ActivityFansTeamJoinBinding>() {
-
-    companion object {
-        @JvmStatic
-        fun start(context: Context) {
-            val starter = Intent(context, FansTeamJoinActivity::class.java)
-            context.startActivity(starter)
-        }
-    }
-
-    private val fansTeamViewModel: FansTeamViewModel by viewModels()
-
-    @SuppressLint("CheckResult", "SetTextI18n")
-    override fun init() {
-        window.setLayout(
-            WindowManager.LayoutParams.MATCH_PARENT,
-            WindowManager.LayoutParams.WRAP_CONTENT
-        )
-        window.setGravity(Gravity.BOTTOM)
-
-        binding.ivHelp.setOnClickListener {
-            DialogWebViewActivity.start(this, UriProvider.getFansTeamRuleUrl())
-        }
-
-        binding.llRank.setOnClickListener {
-            DialogWebViewActivity.start(
-                this,
-                UriProvider.getFansTeamRankUrl(AvRoomDataManager.get().roomUid)
-            )
-        }
-
-        fansTeamViewModel.loadTeamJoinInfo()
-
-        fansTeamViewModel.fansTeamJoinInfoLiveData.observe(this) {
-            it?.let {
-                binding.ivAvatar.load(it.anchorAvatar)
-                binding.tvFansTeamName.text = it.anchorNick.subAndReplaceDot(7) + ResUtil.getString(R.string.erban_fansteam_fansteamjoinactivity_01)
-                binding.tvFansTeamFansNum.text = "${it.teamNum}人"
-                binding.ivRank0.load(it.avatarList.getOrNull(0))
-                binding.ivRank1.load(it.avatarList.getOrNull(1))
-                binding.ivRank2.load(it.avatarList.getOrNull(2))
-
-                it.privilegeConfigVos.find { configVo -> configVo.type == 1 }
-                    ?.let { privilegeConfig ->
-                        binding.tvNameplateTitle.text = privilegeConfig.name
-                        binding.tvNameplateDesc.text = privilegeConfig.description
-                        binding.ivFansNameplate.load(privilegeConfig.icon)
-                    }
-
-                it.privilegeConfigVos.find { configVo -> configVo.type == 2 }
-                    ?.let { privilegeConfig ->
-                        binding.tvGiftTitle.text = privilegeConfig.name
-                        binding.tvGiftDesc.text = privilegeConfig.description
-                        binding.ivFansGift.load(privilegeConfig.icon)
-                    }
-
-                it.privilegeConfigVos.find { configVo -> configVo.type == 3 }
-                    ?.let { privilegeConfig ->
-                        binding.ivJoinLogo.load(privilegeConfig.icon)
-                        binding.tvJoin.text = privilegeConfig.name
-                        binding.bgJoin.setOnClickListener {
-                            privilegeConfig.giftVo?.let { giftInfo ->
-                                GiftModel.get().sendFansTeamGift(
-                                    giftInfo.giftId,
-                                    AvRoomDataManager.get().roomUid.toString(),
-                                )
-                                    .compose(bindToLifecycle())
-                                    .handleBeanData()
-                                    .subscribe({
-                                        "加入粉絲團成功!".toast()
-                                        finish()
-                                    }, { t ->
-                                        t.message.toast()
-                                    })
-
-                            } ?: run {
-                                "數據初始化中,請稍後~".toast()
-                            }
-                        }
-                    }
-            }
-        }
-
-    }
-
-
-}

app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt

@@ -1,134 +0,0 @@
-package com.chwl.app.fansteam
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.View
-import android.view.WindowManager
-import android.widget.PopupWindow
-import androidx.activity.viewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.netease.nim.uikit.common.util.sys.ScreenUtil
-import com.chwl.app.R
-import com.chwl.app.base.BaseViewBindingActivity
-import com.chwl.app.common.EmptyViewHelper
-import com.chwl.app.databinding.ActivityFansTeamJoinedBinding
-import com.chwl.app.ui.utils.RVDelegate
-import com.chwl.app.ui.utils.load
-import com.chwl.app.ui.webview.DialogWebViewActivity
-import com.chwl.core.UriProvider
-import com.chwl.core.fansteam.bean.FansTeamTaskInfo
-import com.chwl.core.manager.AvRoomDataManager
-import com.chwl.core.utils.extension.subAndReplaceDot
-import com.chwl.core.utils.extension.toast
-import com.chwl.library.utils.ResUtil
-
-class FansTeamJoinedActivity : BaseViewBindingActivity<ActivityFansTeamJoinedBinding>() {
-
-    companion object {
-        @JvmStatic
-        fun start(context: Context) {
-            val starter = Intent(context, FansTeamJoinedActivity::class.java)
-            context.startActivity(starter)
-        }
-    }
-
-    private val fansTeamViewModel: FansTeamViewModel by viewModels()
-    private lateinit var rvDelegate: RVDelegate<FansTeamTaskInfo>
-    private lateinit var popupWindow: PopupWindow
-
-    @SuppressLint("SetTextI18n")
-    override fun init() {
-        window.setLayout(
-            WindowManager.LayoutParams.MATCH_PARENT,
-            WindowManager.LayoutParams.WRAP_CONTENT
-        )
-        window.setGravity(Gravity.BOTTOM)
-
-        rvDelegate = RVDelegate.Builder<FansTeamTaskInfo>()
-            .setLayoutManager(LinearLayoutManager(this))
-            .setRecyclerView(binding.rvTask)
-            .setAdapter(FansTeamTaskAdapter())
-            .setEmptyView(EmptyViewHelper.createEmptyTextView(this, ResUtil.getString(R.string.erban_fansteam_fansteamjoinedactivity_01)))
-            .build()
-
-        binding.llRank.setOnClickListener {
-            DialogWebViewActivity.start(
-                this,
-                UriProvider.getFansTeamRankUrl(AvRoomDataManager.get().roomUid)
-            )
-        }
-
-        binding.ivHelp.setOnClickListener {
-            showMorePopup(binding.ivHelp)
-        }
-
-        fansTeamViewModel.loadTeamTaskInfo()
-
-        fansTeamViewModel.fansTeamJoinedInfoLiveData.observe(this) {
-            it?.let {
-                binding.ivAvatar.load(it.anchorAvatar)
-                binding.tvFansTeamName.text = it.anchorNick.subAndReplaceDot(7) + ResUtil.getString(R.string.erban_fansteam_fansteamjoinedactivity_02)
-                binding.tvFansTeamFansNum.text = "${it.teamNum}人"
-
-                binding.ivMeAvatar.load(it.memberAvatar)
-                binding.tvValue.text = "親密值Lv.${it.levelSeq}"
-                binding.tvCurrValue.text = "${it.levelExper}/${it.nextLevelExper}"
-                binding.pbValue.max = it.nextLevelExper
-                binding.pbValue.progress = it.levelExper
-
-                binding.ivRank0.load(it.avatarList.getOrNull(0))
-                binding.ivRank1.load(it.avatarList.getOrNull(1))
-                binding.ivRank2.load(it.avatarList.getOrNull(2))
-                rvDelegate.setNewData(it.taskVos)
-            }
-        }
-
-        fansTeamViewModel.exitFansTeamLiveData.observe(this) {
-            if (it == true) {
-                "退出粉絲團成功!".toast()
-                finish()
-            }
-        }
-
-    }
-
-    private fun showMorePopup(parent: View?) {
-        if (parent == null) return
-
-        val contentView: View
-        if (!this::popupWindow.isInitialized) {
-            contentView =
-                LayoutInflater.from(this).inflate(R.layout.popup_fans_team_more, null)
-            popupWindow =
-                PopupWindow(contentView, ScreenUtil.dip2px(124f), ScreenUtil.dip2px(98f))
-            popupWindow.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-            popupWindow.isFocusable = true
-        } else {
-            contentView = popupWindow.contentView
-        }
-        contentView.findViewById<View>(R.id.tv_rule).setOnClickListener {
-            DialogWebViewActivity.start(this, UriProvider.getFansTeamRuleUrl())
-            popupWindow.dismiss()
-        }
-        contentView.findViewById<View>(R.id.tv_exit).setOnClickListener {
-            dialogManager.showOkCancelDialog("退出後粉絲團後24小時內不能再次加入,確定退出嗎?", true) {
-                popupWindow.dismiss()
-                fansTeamViewModel.exitFansTeam()
-            }
-
-        }
-        popupWindow.showAsDropDown(
-            parent,
-            0,
-            0,
-            Gravity.END
-        )
-    }
-
-
-}

app/src/main/java/com/chwl/app/fansteam/FansTeamListActivity.kt

@@ -1,70 +0,0 @@
-package com.chwl.app.fansteam
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import androidx.activity.viewModels
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.netease.nim.uikit.StatusBarUtil
-import com.chwl.app.R
-import com.chwl.app.base.BaseViewBindingActivity
-import com.chwl.app.common.EmptyViewHelper
-import com.chwl.app.databinding.ActivityFansTeamListBinding
-import com.chwl.app.ui.utils.RVDelegate
-import com.chwl.core.fansteam.bean.FansTeamInfo
-import com.chwl.library.annatation.ActLayoutRes
-import com.chwl.library.utils.ResUtil
-
-@ActLayoutRes(R.layout.activity_fans_team_list)
-class FansTeamListActivity : BaseViewBindingActivity<ActivityFansTeamListBinding>() {
-
-    private lateinit var rvDelegate: RVDelegate<FansTeamInfo>
-
-    companion object {
-        @JvmStatic
-        fun start(context: Context) {
-            val starter = Intent(context, FansTeamListActivity::class.java)
-            context.startActivity(starter)
-        }
-    }
-
-    private var pageNum = 1
-    private val pageSize = 20
-    private val fansTeamViewModel: FansTeamViewModel by viewModels()
-
-    @SuppressLint("CheckResult")
-    override fun init() {
-        initTitleBar(ResUtil.getString(R.string.erban_fansteam_fansteamlistactivity_01))
-        rvDelegate = RVDelegate.Builder<FansTeamInfo>()
-            .setRefreshLayout(binding.swipeRefresh)
-            .setLayoutManager(LinearLayoutManager(this))
-            .setRecyclerView(binding.recyclerView)
-            .setAdapter(FansTeamListAdapter())
-            .setPageSize(pageSize)
-            .setEmptyView(EmptyViewHelper.createEmptyTextView(this, ResUtil.getString(R.string.erban_fansteam_fansteamlistactivity_02)))
-            .build()
-
-        binding.swipeRefresh.setOnRefreshListener {
-            pageNum = 1
-            fansTeamViewModel.loadJoinFansTeamList(pageNum, pageSize)
-        }
-
-        rvDelegate.adapter.setOnLoadMoreListener({
-            pageNum++
-            fansTeamViewModel.loadJoinFansTeamList(pageNum, pageSize)
-        }, binding.recyclerView)
-
-        fansTeamViewModel.loadJoinFansTeamList(pageNum, pageSize)
-        fansTeamViewModel.joinFansTeamListLiveData.observe(this) {
-            rvDelegate.loadData(it)
-        }
-    }
-
-    override fun needSteepStateBar() = true
-
-    override fun setStatusBar() {
-        super.setStatusBar()
-        StatusBarUtil.transparencyBar(this)
-        StatusBarUtil.StatusBarLightMode(this)
-    }
-}

app/src/main/java/com/chwl/app/fansteam/FansTeamListAdapter.kt

@@ -1,35 +0,0 @@
-package com.chwl.app.fansteam
-
-import com.chad.library.adapter.base.BaseQuickAdapter
-import com.chad.library.adapter.base.BaseViewHolder
-import com.chwl.app.R
-import com.chwl.app.ui.user.activity.UserInfoActivity
-import com.chwl.app.ui.utils.ImageLoadUtils
-import com.chwl.core.fansteam.bean.FansTeamInfo
-
-
-class FansTeamListAdapter :
-    BaseQuickAdapter<FansTeamInfo?, BaseViewHolder>(R.layout.item_fans_team_list) {
-    override fun convert(helper: BaseViewHolder, item: FansTeamInfo?) {
-        if (item == null) {
-            return
-        }
-
-        ImageLoadUtils.loadAvatar(
-            mContext,
-            item.anchorAvatar,
-            helper.getView(R.id.iv_avatar)
-        )
-
-        ImageLoadUtils.loadAvatar(
-            mContext,
-            item.icon,
-            helper.getView(R.id.iv_nameplate)
-        )
-        helper.setText(R.id.tv_nickname, item.anchorNick)
-
-        helper.itemView.setOnClickListener {
-            UserInfoActivity.Companion.start(mContext, item.teamUid)
-        }
-    }
-}

app/src/main/java/com/chwl/app/fansteam/FansTeamTaskAdapter.kt

@@ -1,34 +0,0 @@
-package com.chwl.app.fansteam
-
-import android.graphics.Color
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.core.graphics.toColorInt
-import com.chad.library.adapter.base.BaseQuickAdapter
-import com.chad.library.adapter.base.BaseViewHolder
-import com.chwl.app.R
-import com.chwl.app.ui.utils.load
-import com.chwl.core.fansteam.bean.FansTeamTaskInfo
-import com.chwl.library.utils.ResUtil
-
-class FansTeamTaskAdapter :
-    BaseQuickAdapter<FansTeamTaskInfo, BaseViewHolder>(R.layout.item_fans_team_task) {
-
-    override fun convert(helper: BaseViewHolder, item: FansTeamTaskInfo) {
-
-        helper.setText(R.id.tv_task_title, item.taskName)
-            .setText(R.id.tv_task_desc, item.taskDesc)
-
-        val tvTaskStatus = helper.getView<TextView>(R.id.tv_task_status)
-        tvTaskStatus.text = if (item.isFinished || item.awardVal == 0) {
-            tvTaskStatus.setBackgroundResource(R.drawable.shape_f4f4f4_radius_4dp)
-            tvTaskStatus.setTextColor("#FF999999".toColorInt())
-            if (item.isFinished) ResUtil.getString(R.string.erban_fansteam_fansteamtaskadapter_01) else "${item.awardVal}/${item.totalNum}"
-        } else {
-            tvTaskStatus.setBackgroundResource(R.drawable.shape_ff4e7f_radius_4dp)
-            tvTaskStatus.setTextColor(Color.WHITE)
-            "${item.awardVal}/${item.totalNum}"
-        }
-        helper.getView<ImageView>(R.id.iv_task_logo).load(item.icon)
-    }
-}

app/src/main/java/com/chwl/app/fansteam/FansTeamViewModel.kt

@@ -1,75 +0,0 @@
-package com.chwl.app.fansteam
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.chwl.app.base.BaseViewModel
-import com.chwl.core.bean.response.ListResult
-import com.chwl.core.fansteam.*
-import com.chwl.core.fansteam.bean.FansTeamInfo
-import com.chwl.core.fansteam.bean.FansTeamInitInfo
-import com.chwl.core.fansteam.bean.FansTeamJoinInfo
-import com.chwl.core.fansteam.bean.FansTeamJoinedInfo
-import com.chwl.core.manager.AvRoomDataManager
-import com.chwl.core.utils.extension.toast
-
-class FansTeamViewModel : BaseViewModel() {
-
-    private val _fansTeamJoinInfoLiveData = MutableLiveData<FansTeamJoinInfo>()
-    val fansTeamJoinInfoLiveData: LiveData<FansTeamJoinInfo> = _fansTeamJoinInfoLiveData
-
-    private val _fansTeamInitInfoLiveData = MutableLiveData<FansTeamInitInfo>()
-    val fansTeamInitInfoLiveData: LiveData<FansTeamInitInfo> = _fansTeamInitInfoLiveData
-
-    private val _fansTeamJoinedInfoLiveData = MutableLiveData<FansTeamJoinedInfo>()
-    val fansTeamJoinedInfoLiveData: LiveData<FansTeamJoinedInfo> = _fansTeamJoinedInfoLiveData
-
-    private val _joinFansTeamListLiveData = MutableLiveData<ListResult<FansTeamInfo>>()
-    val joinFansTeamListLiveData: LiveData<ListResult<FansTeamInfo>> = _joinFansTeamListLiveData
-
-    private val _exitFansTeamLiveData = MutableLiveData<Boolean>()
-    val exitFansTeamLiveData: LiveData<Boolean> = _exitFansTeamLiveData
-
-    fun loadTeamJoinInfo() {
-        safeLaunch {
-            _fansTeamJoinInfoLiveData.value = FansTeamModel.getFansTeamJoinInfo()
-        }
-    }
-
-    fun loadTeamTaskInfo() {
-        safeLaunch {
-            _fansTeamJoinedInfoLiveData.value = FansTeamModel.getFansTeamTaskInfo()
-        }
-    }
-
-    fun loadFansTeamInitInfo() {
-        if (AvRoomDataManager.get().roomUid == 0L) {
-            return
-        }
-        safeLaunch {
-            _fansTeamInitInfoLiveData.value = FansTeamModel.getFansTeamInitInfo()
-        }
-    }
-
-    fun exitFansTeam() {
-        safeLaunch {
-            FansTeamModel.outFansTeam()
-            _exitFansTeamLiveData.value = true
-        }
-    }
-
-    fun loadJoinFansTeamList(pageNum: Int, pageSize: Int) {
-        safeLaunch(
-            onError = {
-                it.message.toast()
-                _joinFansTeamListLiveData.value = ListResult.failed(pageNum)
-            },
-            block = {
-                _joinFansTeamListLiveData.value =
-                    ListResult.success(
-                        FansTeamModel.getJoinFansTeamList(pageNum, pageSize),
-                        pageNum
-                    )
-            }
-        )
-    }
-}

app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt

@@ -12,7 +12,7 @@ import com.chwl.core.DemoCache
 import com.chwl.core.UriProvider
 
 /**
- 首页
+首页
  */
 class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>(), View.OnClickListener {
 
@@ -24,7 +24,6 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>(), View.OnClic
 
     private fun initListener() {
         binding.ivSearch.setOnClickListener(this)
-        binding.ivRanking.setOnClickListener(this)
     }
 
     override fun onClick(v: View) {
@@ -43,16 +42,6 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>(), View.OnClic
                     DemoCache.saveAnchorCardView(1)
                 }
             }
-            R.id.iv_ranking -> {
-                //首页_排行榜
-                ReportManager.get().reportEvent(
-                    IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf(
-                        Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.THREE),
-                        Pair(IReportConstants.MODULE, IReportConstants.MOLISTAR_HOMEPAGE)
-                    )
-                )
-                CommonWebViewActivity.start(mContext, UriProvider.getRanking())
-            }
         }
     }
 }

app/src/main/java/com/chwl/app/ui/gift/dialog/GiftInfoVm.java

@@ -77,8 +77,8 @@ public class GiftInfoVm extends BaseItem<GiftInfo> {
             radishDrawableSelected = null;
             goldText.set(context.getResources().getString(R.string.free_gift));
         } else {
-            radishDrawable = context.getResources().getDrawable(R.drawable.icon_radish_transparent);
+            radishDrawable = null;
-            radishDrawableSelected = context.getResources().getDrawable(R.drawable.icon_radish_transparent_selected);
+            radishDrawableSelected = null;
             goldText.set(String.valueOf(data.getGoldPrice()));
         }
         this.isKnap.set(isKnap);

app/src/main/java/com/chwl/app/ui/im/RouterHandler.java

@@ -14,7 +14,6 @@ import com.chwl.app.base.BaseActivity;
 import com.chwl.app.base.DialogManagerInterface;
 import com.chwl.app.common.widget.dialog.DialogManager;
 import com.chwl.app.decoration.view.MyDecorationActivity;
-import com.chwl.app.fansteam.FansTeamListActivity;
 import com.chwl.app.home.activity.CollectionRoomActivity;
 import com.chwl.app.home.activity.VisitorListActivity;
 import com.chwl.app.home.helper.OpenRoomHelper;
@@ -253,10 +252,6 @@ public class RouterHandler {
                 //CP主页
                 CpHomeActivity.Companion.start(context);
                 break;
-            case RouterType.FANS_TEAM_LIST:
-                //粉丝团列表
-                FansTeamListActivity.start(context);
-                break;
             case RouterType.DECORATION_STORE:
                 if (intRouterValue < 0 || intRouterValue > 4) {
                     intRouterValue = 0;

app/src/main/java/com/chwl/app/ui/setting/NoticeSettingActivity.java

@@ -60,7 +60,7 @@ public class NoticeSettingActivity extends BaseViewBindingActivity<ActivityNotic
             switchSystemNotice = systemNoticeView.findViewById(R.id.switch_notice);
             binding.llContainer.addView(systemNoticeView, new ViewGroup.LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT,
-                    getResources().getDimensionPixelOffset(R.dimen.dp_setting_sys_notice_item_height))
+                    ViewGroup.LayoutParams.WRAP_CONTENT)
             );
             setName(systemNoticeView, ResUtil.getString(R.string.ui_setting_noticesettingactivity_03));
             setDesc(systemNoticeView, ResUtil.getString(R.string.ui_setting_noticesettingactivity_04));
@@ -95,7 +95,7 @@ public class NoticeSettingActivity extends BaseViewBindingActivity<ActivityNotic
             switchAttentionNotice = attentionNoticeView.findViewById(R.id.switch_notice);
             binding.llContainer.addView(attentionNoticeView, new ViewGroup.LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT,
-                    getResources().getDimensionPixelOffset(R.dimen.dp_setting_sys_notice_item_height))
+                    ViewGroup.LayoutParams.WRAP_CONTENT)
             );
             setName(attentionNoticeView, ResUtil.getString(R.string.ui_setting_noticesettingactivity_06));
             setDesc(attentionNoticeView, ResUtil.getString(R.string.ui_setting_noticesettingactivity_07));

app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java

@@ -172,10 +172,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
     private View sendContainer;
     private TextView tvTextGold;
     private TextView tvRecharge;
-    private ImageView ivAvatarCharm;
-    private ImageView ivAvatarLevel;
-    private TextView tvNickCharm;
-    private TextView tvNickLevel;
     private View llStarWeek;
     private List<MicMemberInfo> micMemberInfos;
     private View giftNumLayout;
@@ -427,10 +423,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
         tvTextGold = root.findViewById(R.id.tv_text_gold);
         tvRecharge = root.findViewById(R.id.tv_recharge);
 
-        ivAvatarCharm = root.findViewById(R.id.iv_avatar_charm);
-        ivAvatarLevel = root.findViewById(R.id.iv_avatar_level);
-        tvNickCharm = root.findViewById(R.id.tv_nick_charm);
-        tvNickLevel = root.findViewById(R.id.tv_nick_level);
         llStarWeek = root.findViewById(R.id.ll_star_week);
 
         giftNumberText = root.findViewById(R.id.gift_number_text);

app/src/main/java/com/chwl/app/vip/VipMainActivity.kt

@@ -12,9 +12,6 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.GridLayoutManager
-//import com.appsflyer.AFInAppEventParameterName
-//import com.appsflyer.AFInAppEventType
-//import com.appsflyer.AppsFlyerLib
 import com.example.module_base.support.billing.IBillingResult
 import com.example.module_base.support.billing.IBillingService
 import com.example.module_base.support.billing.IProductDetails
@@ -34,13 +31,11 @@ import com.chwl.app.databinding.ActivityVipMainBinding
 import com.chwl.app.ui.pay.ChargeActivity
 import com.chwl.app.ui.setting.ModifyPwdActivity
 import com.chwl.app.ui.utils.RVDelegate
-import com.chwl.app.ui.webview.CommonWebViewActivity
 import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
 import com.chwl.app.vip.adapter.VipAuthAdapter
 import com.chwl.app.vip.adapter.VipMagicIndicatorAdapter
 import com.chwl.app.vip.dialog.SelectPayTypeDialog
 import com.chwl.app.vip.dialog.VipRemainTimeDialog
-import com.chwl.core.UriProvider
 import com.chwl.core.auth.AuthModel
 import com.chwl.core.pay.PayModel
 import com.chwl.core.pay.bean.ChargeBean
@@ -83,15 +78,6 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
     override fun init() {
         EventBus.getDefault().register(this)
         initWhiteTitleBar(getString(R.string.vip_center))
-        mTitleBar.addAction(object : TitleBar.ImageAction(R.drawable.ic_vip_help) {
-            override fun performAction(view: View) {
-                CommonWebViewActivity.start(this@VipMainActivity, UriProvider.getVipHelpUrl())
-            }
-        })
-
-        binding.ivRankList.setOnClickListener {
-            CommonWebViewActivity.start(this@VipMainActivity, UriProvider.getRankListUrl())
-        }
 
         binding.ivTimeHelp.setOnClickListener {
             VipRemainTimeDialog.newInstance().show(this)

app/src/main/res/layout/activity_fans_team_join.xml

@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:background="@drawable/fans_team_bg_join">
-
-        <ImageView
-            android:id="@+id/iv_help"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:scaleType="center"
-            android:src="@drawable/fans_team_ic_help"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.chwl.app.common.widget.CircleImageView
-            android:id="@+id/iv_avatar"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="36dp"
-            android:src="@drawable/default_avatar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_fans_team_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:textColor="#ff333333"
-            android:textSize="14sp"
-            app:layout_constraintStart_toEndOf="@id/iv_avatar"
-            app:layout_constraintTop_toTopOf="@id/iv_avatar"
-            tools:text="@string/layout_activity_fans_team_join_01" />
-
-        <TextView
-            android:id="@+id/tv_fans_team_fans_num"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:background="@drawable/shape_white_20dp_round"
-            android:includeFontPadding="false"
-            android:paddingStart="5dp"
-            android:paddingTop="2dp"
-            android:paddingEnd="5dp"
-            android:paddingBottom="2dp"
-            android:textColor="#fffe3478"
-            android:textSize="10sp"
-            app:layout_constraintBottom_toBottomOf="@id/tv_fans_team_name"
-            app:layout_constraintStart_toEndOf="@id/tv_fans_team_name"
-            app:layout_constraintTop_toTopOf="@id/tv_fans_team_name"
-            tools:text="@string/layout_activity_fans_team_join_02" />
-
-        <LinearLayout
-            android:id="@+id/ll_rank"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/shape_white_20dp_round"
-            android:gravity="center"
-            android:paddingStart="10dp"
-            android:paddingTop="4dp"
-            android:paddingEnd="10dp"
-            android:paddingBottom="4dp"
-            app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
-            app:layout_constraintStart_toStartOf="@id/tv_fans_team_name"
-            app:layout_constraintTop_toBottomOf="@id/tv_fans_team_name">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/fans_team_ic_fans" />
-
-            <com.chwl.app.common.widget.CircleImageView
-                android:id="@+id/iv_rank_0"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="8dp"
-                android:src="@drawable/default_avatar" />
-
-            <com.chwl.app.common.widget.CircleImageView
-                android:id="@+id/iv_rank_1"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="8dp"
-                android:src="@drawable/default_avatar" />
-
-            <com.chwl.app.common.widget.CircleImageView
-                android:id="@+id/iv_rank_2"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="8dp"
-                android:src="@drawable/default_avatar" />
-
-        </LinearLayout>
-
-        <ImageView
-            android:id="@+id/iv_privilege"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="18dp"
-            android:src="@drawable/fans_team_bg_privilege"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_avatar" />
-
-        <View
-            android:id="@+id/bg_fans_nameplate"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="7dp"
-            android:layout_marginEnd="15dp"
-            android:background="@drawable/shape_white_8dp_round"
-            app:layout_constraintDimensionRatio="345:58"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_privilege" />
-
-        <View
-            android:layout_width="42dp"
-            android:layout_height="42dp"
-            android:background="@drawable/shape_f4f4f4_radius_8dp"
-            app:layout_constraintBottom_toBottomOf="@id/iv_fans_nameplate"
-            app:layout_constraintEnd_toEndOf="@id/iv_fans_nameplate"
-            app:layout_constraintStart_toStartOf="@id/iv_fans_nameplate"
-            app:layout_constraintTop_toTopOf="@id/iv_fans_nameplate" />
-
-        <ImageView
-            android:id="@+id/iv_fans_nameplate"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
-            android:layout_marginStart="10dp"
-            android:src="@drawable/default_cover"
-            app:layout_constraintBottom_toBottomOf="@id/bg_fans_nameplate"
-            app:layout_constraintStart_toStartOf="@id/bg_fans_nameplate"
-            app:layout_constraintTop_toTopOf="@id/bg_fans_nameplate" />
-
-        <TextView
-            android:id="@+id/tv_nameplate_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:textColor="#ff333333"
-            android:textSize="14sp"
-            app:layout_constraintBottom_toTopOf="@id/tv_nameplate_desc"
-            app:layout_constraintStart_toEndOf="@id/iv_fans_nameplate"
-            app:layout_constraintTop_toTopOf="@id/iv_fans_nameplate"
-            app:layout_constraintVertical_chainStyle="packed"
-            tools:text="@string/layout_activity_fans_team_join_03" />
-
-        <TextView
-            android:id="@+id/tv_nameplate_desc"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="#ff999999"
-            android:textSize="10sp"
-            app:layout_constraintBottom_toBottomOf="@id/iv_fans_nameplate"
-            app:layout_constraintStart_toStartOf="@id/tv_nameplate_title"
-            app:layout_constraintTop_toBottomOf="@id/tv_nameplate_title"
-            tools:text="@string/layout_activity_fans_team_join_04" />
-
-        <View
-            android:id="@+id/bg_fans_gift"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="7dp"
-            android:layout_marginEnd="15dp"
-            android:background="@drawable/shape_white_8dp_round"
-            app:layout_constraintDimensionRatio="345:58"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/bg_fans_nameplate" />
-
-        <View
-            android:layout_width="42dp"
-            android:layout_height="42dp"
-            android:background="@drawable/shape_f4f4f4_radius_8dp"
-            app:layout_constraintBottom_toBottomOf="@id/iv_fans_gift"
-            app:layout_constraintEnd_toEndOf="@id/iv_fans_gift"
-            app:layout_constraintStart_toStartOf="@id/iv_fans_gift"
-            app:layout_constraintTop_toTopOf="@id/iv_fans_gift" />
-
-        <ImageView
-            android:id="@+id/iv_fans_gift"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
-            android:layout_marginStart="10dp"
-            android:src="@drawable/default_cover"
-            app:layout_constraintBottom_toBottomOf="@id/bg_fans_gift"
-            app:layout_constraintStart_toStartOf="@id/bg_fans_gift"
-            app:layout_constraintTop_toTopOf="@id/bg_fans_gift" />
-
-        <TextView
-            android:id="@+id/tv_gift_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:textColor="#ff333333"
-            android:textSize="14sp"
-            app:layout_constraintBottom_toTopOf="@id/tv_gift_desc"
-            app:layout_constraintStart_toEndOf="@id/iv_fans_gift"
-            app:layout_constraintTop_toTopOf="@id/iv_fans_gift"
-            app:layout_constraintVertical_chainStyle="packed"
-            tools:text="@string/layout_activity_fans_team_join_05" />
-
-        <TextView
-            android:id="@+id/tv_gift_desc"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="#ff999999"
-            android:textSize="10sp"
-            app:layout_constraintBottom_toBottomOf="@id/iv_fans_gift"
-            app:layout_constraintStart_toStartOf="@id/tv_gift_title"
-            app:layout_constraintTop_toBottomOf="@id/tv_gift_title"
-            tools:text="@string/layout_activity_fans_team_join_06" />
-
-        <View
-            android:id="@+id/bg_join"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="32dp"
-            android:layout_marginEnd="15dp"
-            android:layout_marginBottom="48dp"
-            android:background="@drawable/fans_team_bg_join_btn"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="345:48"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/bg_fans_gift" />
-
-        <TextView
-            android:id="@+id/tv_join"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/white"
-            android:textSize="14sp"
-            app:layout_constraintBottom_toBottomOf="@id/bg_join"
-            app:layout_constraintStart_toEndOf="@id/iv_join_logo"
-            app:layout_constraintTop_toTopOf="@id/bg_join"
-            tools:text="@string/layout_activity_fans_team_join_07" />
-
-        <ImageView
-            android:id="@+id/iv_join_logo"
-            android:layout_width="76dp"
-            android:layout_height="75dp"
-            android:layout_marginStart="15dp"
-            app:layout_constraintBottom_toBottomOf="@id/bg_join"
-            app:layout_constraintStart_toStartOf="@id/bg_join"
-            tools:src="@drawable/fans_team_ic_join_logo" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</FrameLayout>

app/src/main/res/layout/activity_fans_team_joined.xml

@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/fans_team_bg_joined"
-        android:layout_gravity="bottom">
-
-        <ImageView
-            android:id="@+id/iv_help"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:scaleType="center"
-            android:src="@drawable/fans_team_ic_more"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.chwl.app.common.widget.CircleImageView
-            android:id="@+id/iv_avatar"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginTop="36dp"
-            android:src="@drawable/default_avatar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_fans_team_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:textColor="#ff333333"
-            android:textSize="14sp"
-            app:layout_constraintStart_toEndOf="@id/iv_avatar"
-            app:layout_constraintTop_toTopOf="@id/iv_avatar"
-            tools:text="@string/layout_activity_fans_team_joined_01" />
-
-        <TextView
-            android:id="@+id/tv_fans_team_fans_num"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:background="@drawable/shape_white_20dp_round"
-            android:includeFontPadding="false"
-            android:paddingStart="5dp"
-            android:paddingTop="2dp"
-            android:paddingEnd="5dp"
-            android:paddingBottom="2dp"
-            android:textColor="#fffe3478"
-            android:textSize="10sp"
-            app:layout_constraintBottom_toBottomOf="@id/tv_fans_team_name"
-            app:layout_constraintStart_toEndOf="@id/tv_fans_team_name"
-            app:layout_constraintTop_toTopOf="@id/tv_fans_team_name"
-            tools:text="@string/layout_activity_fans_team_joined_02" />
-
-        <LinearLayout
-            android:id="@+id/ll_rank"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/shape_white_20dp_round"
-            android:gravity="center"
-            android:paddingStart="10dp"
-            android:paddingTop="4dp"
-            android:paddingEnd="10dp"
-            android:paddingBottom="4dp"
-            app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
-            app:layout_constraintStart_toStartOf="@id/tv_fans_team_name"
-            app:layout_constraintTop_toBottomOf="@id/tv_fans_team_name">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/fans_team_ic_fans" />
-
-            <com.chwl.app.common.widget.CircleImageView
-                android:id="@+id/iv_rank_0"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="8dp"
-                android:src="@drawable/default_avatar" />
-
-            <com.chwl.app.common.widget.CircleImageView
-                android:id="@+id/iv_rank_1"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="8dp"
-                android:src="@drawable/default_avatar" />
-
-            <com.chwl.app.common.widget.CircleImageView
-                android:id="@+id/iv_rank_2"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_marginStart="8dp"
-                android:src="@drawable/default_avatar" />
-
-        </LinearLayout>
-
-        <ImageView
-            android:id="@+id/iv_task_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:src="@drawable/fans_team_bg_task_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_avatar" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_task"
-            android:layout_width="0dp"
-            android:layout_height="200dp"
-            android:layout_marginStart="25dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="25dp"
-            android:layout_marginBottom="10dp"
-            android:overScrollMode="never"
-            android:scrollbars="none"
-            app:layout_constraintBottom_toTopOf="@id/view_me_info"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_task_title" />
-
-        <View
-            android:id="@+id/view_me_info"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@color/white"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="375:88"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <com.chwl.app.common.widget.CircleImageView
-            android:id="@+id/iv_me_avatar"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="10dp"
-            android:src="@drawable/default_avatar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/view_me_info" />
-
-        <TextView
-            android:id="@+id/tv_value"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:includeFontPadding="false"
-            android:textColor="#ff333333"
-            android:textSize="10sp"
-            app:layout_constraintStart_toEndOf="@id/iv_me_avatar"
-            app:layout_constraintTop_toTopOf="@id/iv_me_avatar"
-            app:layout_constraintVertical_chainStyle="packed"
-            tools:text="@string/layout_activity_fans_team_joined_03" />
-
-        <ProgressBar
-            android:id="@+id/pb_value"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="0dp"
-            android:layout_height="16dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginEnd="24dp"
-            android:max="100"
-            android:progress="50"
-            android:progressDrawable="@drawable/fans_team_bg_pb"
-            app:layout_constraintBottom_toBottomOf="@id/iv_me_avatar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/tv_value"
-            app:layout_constraintTop_toBottomOf="@id/tv_value" />
-
-        <TextView
-            android:id="@+id/tv_curr_value"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:includeFontPadding="false"
-            android:text="70/100"
-            android:textColor="@color/white"
-            android:textSize="10sp"
-            app:layout_constraintBottom_toBottomOf="@id/pb_value"
-            app:layout_constraintEnd_toEndOf="@id/pb_value"
-            app:layout_constraintStart_toStartOf="@id/pb_value"
-            app:layout_constraintTop_toTopOf="@id/pb_value" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</FrameLayout>

app/src/main/res/layout/activity_fans_team_list.xml

@@ -1,35 +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="match_parent"
-    android:background="@color/white"
-    android:orientation="vertical">
-
-    <com.chwl.app.base.TitleBar
-        android:id="@+id/title_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_30" />
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_refresh"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:clipToPadding="false"
-                android:paddingTop="10dp" />
-
-        </FrameLayout>
-
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-</LinearLayout>

app/src/main/res/layout/fragment_av_room_game.xml

@@ -72,41 +72,15 @@
             android:layout_marginTop="@dimen/dp_10"
             android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/tv_hour_rank"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_22"
-                android:background="@drawable/room_bg_hour_rank"
-                android:drawableStart="@drawable/room_ic_hour_rank"
-                android:drawablePadding="@dimen/dp_3"
-                android:gravity="center_vertical"
-                android:onClick="@{click}"
-                android:paddingEnd="@dimen/dp_6"
-                android:text="@string/hour_rank"
-                android:textColor="@color/white"
-                android:textSize="@dimen/dp_10"
-                android:visibility="gone" />
-
             <ImageView
                 android:id="@+id/iv_music"
                 android:layout_width="@dimen/dp_22"
                 android:layout_height="@dimen/dp_22"
-                android:layout_alignTop="@id/tv_hour_rank"
-                android:layout_marginStart="@dimen/dp_4"
-                android:layout_toEndOf="@id/tv_hour_rank"
                 android:src="@drawable/room_ic_music"
                 android:visibility="gone"
                 tools:visibility="visible" />
         </LinearLayout>
 
-
-        <com.chwl.app.avroom.rank.RoomRankWidget
-            android:id="@+id/rank_widget"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignTop="@id/layout_left_top_menu"
-            android:layout_alignParentEnd="true" />
-
         <LinearLayout
             android:id="@+id/ll_dating_step"
             android:layout_width="wrap_content"

app/src/main/res/layout/fragment_chatroom_game_main.xml

@@ -95,16 +95,6 @@
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
-                    <!--                    <androidx.appcompat.widget.AppCompatImageView-->
-                    <!--                        android:id="@+id/iv_good_number"-->
-                    <!--                        android:layout_width="wrap_content"-->
-                    <!--                        android:layout_height="wrap_content"-->
-                    <!--                        android:layout_gravity="center_vertical"-->
-                    <!--                        android:layout_marginEnd="5dp"-->
-                    <!--                        android:src="@drawable/icon_room_good_number"-->
-                    <!--                        android:visibility="gone"-->
-                    <!--                        tools:visibility="visible" />-->
-
                     <com.chwl.app.common.widget.CircleImageView
                         android:layout_width="@dimen/dp_3"
                         android:layout_height="@dimen/dp_3"
@@ -137,66 +127,6 @@
                 android:layout_height="0dp"
                 android:layout_weight="1" />
 
-            <!--            <LinearLayout-->
-            <!--                android:id="@+id/ll_change_game"-->
-            <!--                android:layout_width="wrap_content"-->
-            <!--                android:layout_height="wrap_content"-->
-            <!--                android:layout_marginTop="5dp"-->
-            <!--                android:layout_marginEnd="6dp"-->
-            <!--                android:background="@drawable/bg_room_select_game"-->
-            <!--                android:orientation="vertical"-->
-            <!--                android:paddingStart="8dp"-->
-            <!--                android:paddingTop="2dp"-->
-            <!--                android:paddingEnd="8dp"-->
-            <!--                android:paddingBottom="2dp"-->
-            <!--                android:visibility="gone"-->
-            <!--                tools:visibility="visible">-->
-
-            <!--                <LinearLayout-->
-            <!--                    android:id="@+id/ll_select_game"-->
-            <!--                    android:layout_width="wrap_content"-->
-            <!--                    android:layout_height="wrap_content"-->
-            <!--                    android:gravity="center"-->
-            <!--                    android:orientation="horizontal">-->
-
-            <!--                    <TextView-->
-            <!--                        android:id="@+id/tv_curr_game"-->
-            <!--                        android:layout_width="wrap_content"-->
-            <!--                        android:layout_height="wrap_content"-->
-            <!--                        android:gravity="center"-->
-            <!--                        android:includeFontPadding="true"-->
-            <!--                        android:textColor="@color/white"-->
-            <!--                        android:textSize="15sp"-->
-            <!--                        tools:text="@string/layout_fragment_chatroom_game_main_04" />-->
-
-            <!--                    <ImageView-->
-            <!--                        android:id="@+id/iv_change_game_arrow"-->
-            <!--                        android:layout_width="20dp"-->
-            <!--                        android:layout_height="10dp"-->
-            <!--                        android:scaleType="center"-->
-            <!--                        android:src="@drawable/ic_room_arrow_type_below" />-->
-
-            <!--                </LinearLayout>-->
-
-            <!--                <androidx.recyclerview.widget.RecyclerView-->
-            <!--                    android:id="@+id/rv_game"-->
-            <!--                    android:layout_width="wrap_content"-->
-            <!--                    android:layout_height="wrap_content"-->
-            <!--                    android:paddingBottom="4dp"-->
-            <!--                    android:visibility="gone" />-->
-
-            <!--            </LinearLayout>-->
-
-            <!--            <ImageView-->
-            <!--                android:id="@+id/iv_room_share"-->
-            <!--                android:layout_width="@dimen/dp_20"-->
-            <!--                android:layout_height="@dimen/dp_20"-->
-            <!--                android:layout_marginTop="7dp"-->
-            <!--                android:layout_marginEnd="@dimen/dp_12"-->
-            <!--                android:scaleType="center"-->
-            <!--                android:src="@drawable/ic_share_white"-->
-            <!--                android:visibility="gone" />-->
-
             <ImageView
                 android:id="@+id/iv_follow_room"
                 android:layout_width="@dimen/dp_32"

app/src/main/res/layout/fragment_home.xml

@@ -27,19 +27,11 @@
             android:id="@+id/iv_search"
             android:layout_width="@dimen/dp_30"
             android:layout_height="@dimen/dp_30"
-            android:layout_marginEnd="@dimen/dp_10"
+            android:layout_marginEnd="@dimen/dp_21"
             android:gravity="center_vertical"
             android:scaleType="centerInside"
             android:src="@drawable/home_ic_search" />
 
-        <ImageView
-            android:id="@+id/iv_ranking"
-            android:layout_width="@dimen/dp_30"
-            android:layout_height="@dimen/dp_30"
-            android:layout_marginEnd="@dimen/dp_21"
-            android:scaleType="centerInside"
-            android:src="@drawable/home_ic_rank" />
-
     </LinearLayout>
 
     <TextView

app/src/main/res/layout/fragment_single_room.xml

@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.chwl.app.avroom.fragment.SingleRoomFragment">
-
-    <data>
-
-        <variable
-            name="click"
-            type="android.view.View.OnClickListener" />
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.chwl.app.avroom.widget.MicroView
-            android:id="@+id/micro_view"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="110dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:background="@color/color_red" />
-
-        <com.chwl.app.avroom.singleroompk.SingleRoomPKBoardView
-            android:id="@+id/view_pk_board"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/micro_view" />
-
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/barrier_micro"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="view_pk_board,micro_view" />
-
-        <TextView
-            android:id="@+id/tv_hour_rank"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_22"
-            android:layout_marginStart="@dimen/dp_15"
-            android:layout_marginTop="@dimen/dp_95"
-            android:background="@drawable/room_bg_hour_rank"
-            android:drawableStart="@drawable/room_ic_hour_rank"
-            android:drawablePadding="@dimen/dp_3"
-            android:gravity="center_vertical"
-            android:paddingEnd="@dimen/dp_6"
-            android:text="@string/hour_rank"
-            android:textColor="@color/white"
-            android:textSize="@dimen/dp_10"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/iv_music"
-            android:layout_width="@dimen/dp_22"
-            android:layout_height="@dimen/dp_22"
-            android:layout_marginStart="@dimen/dp_4"
-            android:src="@drawable/room_ic_music"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/tv_hour_rank"
-            app:layout_constraintStart_toEndOf="@id/tv_hour_rank"
-            app:layout_constraintTop_toTopOf="@id/tv_hour_rank"
-            tools:visibility="visible" />
-
-        <com.chwl.app.avroom.rank.RoomRankWidget
-            android:id="@+id/rank_widget"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="@id/tv_hour_rank"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/tv_hour_rank" />
-
-        <FrameLayout
-            android:id="@+id/fl_fans_team"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_8"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_hour_rank"
-            tools:visibility="visible">
-
-            <LinearLayout
-                android:id="@+id/fl_fans_team_join_tip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/bg_fans_team_entrance"
-                android:orientation="horizontal"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="25dp"
-                    android:layout_gravity="bottom"
-                    android:layout_marginStart="8dp"
-                    android:gravity="center"
-                    android:includeFontPadding="false"
-                    android:text="@string/layout_fragment_single_room_02"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/sp_12" />
-
-                <ImageView
-                    android:layout_marginStart="6dp"
-                    android:scaleType="centerInside"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:layout_gravity="end"
-                    android:layout_marginEnd="8dp"
-                    android:src="@drawable/fans_team_ic_room_entrance" />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/tv_fans_team_opt"
-                android:layout_width="wrap_content"
-                android:layout_height="22dp"
-                android:layout_marginTop="6dp"
-                android:background="@drawable/bg_fans_team_entrance"
-                android:drawableEnd="@drawable/fans_team_ic_room_love"
-                android:drawablePadding="5dp"
-                android:gravity="center"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                android:text="@string/layout_fragment_single_room_03"
-                android:textColor="@color/white"
-                android:textSize="@dimen/sp_12"
-                android:visibility="gone" />
-
-        </FrameLayout>
-
-        <ViewStub
-            android:id="@+id/vs_music_player"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="@dimen/dp_8"
-            android:layout="@layout/avroom_music_player_layout"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_music" />
-
-        <com.chwl.app.avroom.widget.BottomView
-            android:id="@+id/bottom_view"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <com.chwl.app.avroom.widget.MessageView
-            android:id="@+id/message_view"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="@dimen/dp_8"
-            android:layout_marginEnd="90dp"
-            android:layout_marginBottom="@dimen/dp_10"
-            app:layout_constraintBottom_toTopOf="@id/bottom_view"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/barrier_micro" />
-
-        <RelativeLayout
-            android:id="@+id/input_layout"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:visibility="visible">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_alignParentBottom="true"
-                android:background="@android:color/white"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <EditText
-                    android:id="@+id/input_edit"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:background="@android:color/white"
-                    android:hint="@string/layout_fragment_single_room_08"
-                    android:paddingLeft="10dp"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:textColor="#888889"
-                    android:textColorHint="#c8c8c8"
-                    android:textSize="12sp" />
-
-                <ImageView
-                    android:id="@+id/input_send"
-                    android:layout_width="50dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
-                    android:background="@drawable/click_white_gray_selector"
-                    android:scaleType="center"
-                    android:src="@android:drawable/ic_menu_send" />
-            </LinearLayout>
-
-        </RelativeLayout>
-
-        <com.chwl.app.vip.view.VipBroadcastView
-            android:id="@+id/vip_broadcast_view"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="100dp"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/micro_view" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>

app/src/main/res/layout/item_fans_team_list.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root_view"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingStart="15dp"
-    android:paddingTop="8dp"
-    android:paddingEnd="15dp"
-    android:paddingBottom="8dp">
-
-
-    <com.chwl.app.common.widget.CircleImageView
-        android:id="@+id/iv_avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:scaleType="centerCrop"
-        android:src="@drawable/default_avatar"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tv_nickname"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_10"
-        android:ellipsize="end"
-        android:lines="1"
-        android:textColor="@color/color_333333"
-        android:textSize="13sp"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/iv_avatar"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@string/layout_item_fans_team_list_01" />
-
-
-    <ImageView
-        android:id="@+id/iv_nameplate"
-        android:layout_width="wrap_content"
-        android:layout_height="27dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/item_fans_team_task.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="58dp"
-    android:layout_marginTop="4dp"
-    android:layout_marginBottom="4dp"
-    android:background="@drawable/shape_white_8dp_round">
-
-    <ImageView
-        android:id="@+id/iv_task_logo"
-        android:layout_width="38dp"
-        android:layout_height="38dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
-        android:src="@drawable/default_cover"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tv_task_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:includeFontPadding="false"
-        android:textColor="@color/color_333333"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/tv_task_desc"
-        app:layout_constraintStart_toEndOf="@id/iv_task_logo"
-        app:layout_constraintTop_toTopOf="@id/iv_task_logo"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@string/layout_item_fans_team_task_01" />
-
-    <TextView
-        android:id="@+id/tv_task_desc"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:lines="1"
-        android:textColor="@color/color_999999"
-        android:textSize="10sp"
-        app:layout_constraintBottom_toBottomOf="@id/iv_task_logo"
-        app:layout_constraintStart_toStartOf="@id/tv_task_title"
-        app:layout_constraintTop_toBottomOf="@id/tv_task_title"
-        tools:text="@string/layout_item_fans_team_task_02" />
-
-    <TextView
-        android:id="@+id/tv_task_status"
-        android:layout_width="wrap_content"
-        android:layout_height="20dp"
-        android:layout_marginEnd="10dp"
-        android:gravity="center"
-        android:minWidth="48dp"
-        android:textColor="@color/color_999999"
-        android:textSize="10sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="0/20" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/item_system_notice.xml

@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_setting_sys_notice_item_height"
+    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:minHeight="@dimen/dp_setting_sys_notice_item_height">
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
         android:layout_marginStart="@dimen/dp_15"
+        android:layout_toLeftOf="@id/switch_notice"
         android:gravity="center_vertical"
         android:orientation="vertical">
 
@@ -15,18 +19,18 @@
             android:id="@+id/tv_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            tools:text="@string/layout_item_system_notice_01"
             android:textColor="@color/text_title_color"
-            android:textSize="14sp" />
+            android:textSize="14sp"
+            tools:text="@string/layout_item_system_notice_01" />
 
         <TextView
             android:id="@+id/tv_desc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            tools:text="@string/layout_item_system_notice_02"
             android:textColor="@color/text_normal_c6c6e9"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            tools:text="@string/layout_item_system_notice_02" />
 
     </LinearLayout>
 

app/src/main/res/layout/room_rank_widget.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_24"
-        android:background="@drawable/room_rank_widget_bg"
-        android:gravity="center_vertical"
-        android:paddingHorizontal="@dimen/dp_4"
-        tools:background="@color/black">
-
-        <ImageView
-            android:id="@+id/iv_rank_0"
-            android:layout_width="@dimen/dp_20"
-            android:layout_height="@dimen/dp_20"
-            android:visibility="gone"
-            tools:src="@drawable/default_avatar"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/iv_rank_1"
-            android:layout_width="@dimen/dp_20"
-            android:layout_height="@dimen/dp_20"
-            android:layout_marginStart="-12dp"
-            android:visibility="gone"
-            tools:src="@drawable/default_avatar"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/iv_rank_2"
-            android:layout_width="@dimen/dp_20"
-            android:layout_height="@dimen/dp_20"
-            android:layout_marginStart="-12dp"
-            android:visibility="gone"
-            tools:src="@drawable/default_avatar"
-            tools:visibility="visible" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_4"
-            android:includeFontPadding="false"
-            android:text="@string/room_rank"
-            android:textColor="@color/white"
-            android:textSize="@dimen/dp_10" />
-
-        <ImageView
-            android:layout_width="@dimen/dp_9"
-            android:layout_height="@dimen/dp_9"
-            android:scaleType="centerInside"
-            android:src="@drawable/base_arrow_right_f1f1fa" />
-    </LinearLayout>
-
-</layout>

app/src/main/res/layout/star_send_gift_dialog.xml

@@ -74,7 +74,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/dp_8"
-            android:text="今日不再提示"
+            android:text="@string/star_send_gift_ignore_today"
             android:textColor="#9D9FA3"
             android:textSize="@dimen/dp_12" />
     </LinearLayout>

app/src/module_labour_union/res/layout/activity_vip_main.xml

@@ -68,16 +68,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/ivRankList"
-                android:src="@drawable/ic_rank_list"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_24"
-                android:layout_marginTop="@dimen/dp_10"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
-
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_my_level"
                 android:layout_width="wrap_content"

core/src/main/java/com/chwl/core/UriProvider.java

@@ -58,13 +58,6 @@ public class UriProvider {
         return IM_SERVER_URL.concat("/molistar/modules/nobles/intro.html");
     }
 
-    /**
-     * 贵族介绍页
-     */
-    public static String getRanking() {
-        return IM_SERVER_URL.concat("/molistar/modules/rank/index.html#/rank");
-    }
-
     /**
      * 帮助页
      */
@@ -142,14 +135,6 @@ public class UriProvider {
         return JAVA_WEB_URL.concat("/molistar/modules/rule/dating.html");
     }
 
-
-    /**
-     * 房间排行榜
-     */
-    public static String getRoomRanking() {
-        return IM_SERVER_URL.concat("/molistar/modules/room_rank/index.html?roomUid=" + AvRoomDataManager.get().getRoomUid());
-    }
-
     /**
      * 第三方SDK协议
      *
@@ -166,20 +151,6 @@ public class UriProvider {
         return JAVA_WEB_URL.concat("/molistar/modules/rule/privacy-wap.html");
     }
 
-    /**
-     * 贵族中心帮助页
-     */
-    public static String getVipHelpUrl() {
-        return JAVA_WEB_URL.concat("/molistar/modules/rule/introduction-patrician.html");
-    }
-
-    /**
-     * 贵族榜
-     */
-    public static String getRankListUrl() {
-        return JAVA_WEB_URL.concat("/molistar/modules/noble/index.html");
-    }
-
     /**
      * 用户充值协议
      */
@@ -201,56 +172,6 @@ public class UriProvider {
         return JAVA_WEB_URL.concat("/molistar/modules/rule/logout-agreement.html");
     }
 
-    /**
-     * 开通粉丝团
-     */
-    public static String getFansTeamOpenUrl(long roomUid) {
-        return JAVA_WEB_URL.concat("/molistar/modules/fans_club/nameplate.html?roomUid=" + roomUid);
-    }
-
-    /**
-     * 粉丝团排行
-     */
-    public static String getFansTeamRankUrl(long roomUid) {
-        return JAVA_WEB_URL.concat("/molistar/modules/fans_club/fans_rank.html?roomUid=" + roomUid);
-    }
-
-    /**
-     * 我的粉丝团
-     */
-    public static String getFansTeamMyFansUrl(long roomUid) {
-        return JAVA_WEB_URL.concat("/molistar/modules/fans_club/myfans.html?roomUid=" + roomUid);
-    }
-
-    /**
-     * 粉丝团规则
-     */
-    public static String getFansTeamRuleUrl() {
-        return JAVA_WEB_URL.concat("/molistar/modules/fans_club/rule.html");
-    }
-
-    /**
-     * 个播小时榜
-     */
-    public static String getSingleRoomHourRankUrl(long roomUid) {
-        return JAVA_WEB_URL.concat("/molistar/modules/room_rank/hourRank.html?roomUid=" + roomUid);
-    }
-
-    /**
-     * 牌照房小时榜
-     */
-    public static String getRoomHourRankUrl(long roomUid) {
-        return JAVA_WEB_URL.concat("/molistar/modules/room_rank/hourRankLicense.html?roomUid=" + roomUid);
-    }
-
-
-    /**
-     * 周星榜
-     */
-    public static String getWeekStarUrl() {
-        return JAVA_WEB_URL.concat("/molistar/modules/weekStar/newWeekStar.html");
-    }
-
     /**
      * 直播乱象
      *

core/src/main/java/com/chwl/core/fansteam/FansTeamModel.kt

@@ -1,90 +0,0 @@
-package com.chwl.core.fansteam
-
-import com.chwl.core.base.BaseModel
-import com.chwl.core.bean.response.ServiceResult
-import com.chwl.core.fansteam.bean.FansTeamInfo
-import com.chwl.core.fansteam.bean.FansTeamInitInfo
-import com.chwl.core.fansteam.bean.FansTeamJoinInfo
-import com.chwl.core.fansteam.bean.FansTeamJoinedInfo
-import com.chwl.core.manager.AvRoomDataManager
-import com.chwl.core.utils.net.launchRequest
-import com.chwl.library.net.rxnet.RxNet
-import retrofit2.http.GET
-import retrofit2.http.Query
-
-object FansTeamModel : BaseModel() {
-
-    private val api = RxNet.create(Api::class.java)
-
-    suspend fun getFansTeamJoinInfo(): FansTeamJoinInfo? =
-        launchRequest {
-            api.getFansTeamJoinInfo(AvRoomDataManager.get().roomUid)
-        }
-
-    suspend fun getFansTeamTaskInfo(): FansTeamJoinedInfo? =
-        launchRequest {
-            api.getFansTeamTaskInfo(AvRoomDataManager.get().roomUid)
-        }
-
-    suspend fun getFansTeamInitInfo(): FansTeamInitInfo? =
-        launchRequest {
-            api.getFansTeamInitInfo(AvRoomDataManager.get().roomUid)
-        }
-
-    suspend fun outFansTeam(): String? =
-        launchRequest {
-            api.outFansTeam(AvRoomDataManager.get().roomUid)
-        }
-
-    suspend fun getJoinFansTeamList(pageNum: Int, pageSize: Int): List<FansTeamInfo>? =
-        launchRequest {
-            api.getJoinFansTeamList(pageNum, pageSize)
-        }
-
-    private interface Api {
-
-        /**
-         * 加入粉丝团 --弹窗内容
-         *
-         * @return
-         */
-        @GET("anchorFansTeam/applyFansTeamPopInfoVo")
-        suspend fun getFansTeamJoinInfo(@Query("teamUid") roomUid: Long): ServiceResult<FansTeamJoinInfo>
-
-        /**
-         * 粉丝团任务列表
-         *
-         * @return
-         */
-        @GET("anchorFansTeam/getFansTaskInfo")
-        suspend fun getFansTeamTaskInfo(@Query("teamUid") roomUid: Long): ServiceResult<FansTeamJoinedInfo>
-
-        /**
-         * 进房初始化当前用户与房间粉丝团关系
-         *
-         * @return
-         */
-        @GET("/anchorFansTeam/initInRoomFansTeam")
-        suspend fun getFansTeamInitInfo(@Query("teamUid") roomUid: Long): ServiceResult<FansTeamInitInfo>
-
-        /**
-         * 退出粉丝团
-         *
-         * @return
-         */
-        @GET("/anchorFansTeam/outAnchorFansTeam")
-        suspend fun outFansTeam(@Query("teamUid") roomUid: Long): ServiceResult<String>
-
-        /**
-         * 我的粉丝团列表
-         *
-         * @return
-         */
-        @GET("/anchorFansTeam/getJoinFansTeamList")
-        suspend fun getJoinFansTeamList(
-            @Query("page") page: Int,
-            @Query("pageSize") pageSize: Int
-        ): ServiceResult<List<FansTeamInfo>>
-    }
-
-}

core/src/main/java/com/chwl/core/fansteam/bean/FansTeamInfo.kt

@@ -1,8 +0,0 @@
-package com.chwl.core.fansteam.bean
-
-data class FansTeamInfo(
-    val anchorAvatar: String = "",
-    val anchorNick: String = "",
-    val icon: String = "",
-    val teamUid: Long = 0
-)

core/src/main/java/com/chwl/core/fansteam/bean/FansTeamInitInfo.kt

@@ -1,10 +0,0 @@
-package com.chwl.core.fansteam.bean
-
-data class FansTeamInitInfo(
-    val anchorFansNum: Int = 0,
-    val fansLevelSeq: Int = 0,
-    val hasFansTeamCurrentRoom: Boolean = false,
-    val isAnchorFans: Boolean = false,
-    val isCurrentRoomAnchor: Boolean = false,
-    val isRedPop: Boolean = false
-)

core/src/main/java/com/chwl/core/fansteam/bean/FansTeamJoinInfo.kt

@@ -1,14 +0,0 @@
-package com.chwl.core.fansteam.bean
-
-
-data class FansTeamJoinInfo(
-    val anchorAvatar: String = "",
-    val anchorNick: String = "",
-    val avatarList: List<String> = listOf(),
-    val isJoinLimit: Boolean = false,
-    val privilegeConfigVos: List<PrivilegeConfigVo> = listOf(),
-    val teamId: Int = 0,
-    val teamNum: Int = 0,
-    val teamUid: Int = 0,
-    val taskVos: List<FansTeamTaskInfo>? = null
-)

core/src/main/java/com/chwl/core/fansteam/bean/FansTeamJoinedInfo.kt

@@ -1,15 +0,0 @@
-package com.chwl.core.fansteam.bean
-
-data class FansTeamJoinedInfo(
-    val anchorAvatar: String = "",
-    val anchorNick: String = "",
-    val avatarList: List<String> = listOf(),
-    val levelExper: Int = 0,
-    val levelSeq: Int = 0,
-    val memberAvatar: String = "",
-    val memberUid: Int = 0,
-    val nextLevelExper: Int = 0,
-    val taskVos: List<FansTeamTaskInfo> = listOf(),
-    val teamNum: Int = 0,
-    val teamUid: Int = 0
-)

core/src/main/java/com/chwl/core/fansteam/bean/FansTeamTaskInfo.kt

@@ -1,12 +0,0 @@
-package com.chwl.core.fansteam.bean
-
-data class FansTeamTaskInfo(
-    val awardVal: Int = 0,
-    val icon: String = "",
-    val taskId:  String = "",
-    val isFinished: Boolean = false,
-    val taskCode: String = "",
-    val taskDesc: String = "",
-    val taskName: String = "",
-    val totalNum: Int = 0
-)

core/src/main/java/com/chwl/core/fansteam/bean/PrivilegeConfigVo.kt

@@ -1,17 +0,0 @@
-package com.chwl.core.fansteam.bean
-
-import com.chwl.core.gift.bean.GiftInfo
-
-data class PrivilegeConfigVo(
-    val createTime: String = "",
-    val description: String = "",
-    val icon: String = "",
-    val isShow: Int = 0,
-    val name: String = "",
-    val normalId: Int = 0,
-    val privilegeId: Int = 0,
-    val seq: Int = 0,
-    val status: Int = 0,
-    val type: Int = 0,//特权类型 1铭牌 2专属礼物 3入团礼物
-    val giftVo: GiftInfo? = null
-)