diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java index 51da7842a..6b2903bd4 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java +++ b/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: - if (!(tempFragment instanceof SingleRoomFragment)) { - tempFragment = SingleRoomFragment.newInstance(); - } - break; +// case RoomInfo.ROOM_TYPE_SINGLE: +// if (!(tempFragment instanceof SingleRoomFragment)) { +// tempFragment = SingleRoomFragment.newInstance(); +// } +// break; default: if (!(tempFragment instanceof HomePartyRoomFragment)) { tempFragment = HomePartyRoomFragment.newInstance(); diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java index 7f7df6310..0fcd9f376 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java +++ b/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 { -// 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(); } diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt deleted file mode 100644 index 715b50717..000000000 --- a/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt +++ /dev/null @@ -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, 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 { - 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 { - 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) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/avroom/rank/RoomRankWidget.kt b/app/src/main/java/com/chwl/app/avroom/rank/RoomRankWidget.kt deleted file mode 100644 index 5603f1ce1..000000000 --- a/app/src/main/java/com/chwl/app/avroom/rank/RoomRankWidget.kt +++ /dev/null @@ -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?) { - 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 - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java b/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java index 88f3d2474..62bb52325 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java +++ b/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 diff --git a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt deleted file mode 100644 index d4f574f22..000000000 --- a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt +++ /dev/null @@ -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() { - - 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() - } - } - } - } - } - - } - - -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt deleted file mode 100644 index 524c12398..000000000 --- a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt +++ /dev/null @@ -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() { - - 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 - 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() - .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(R.id.tv_rule).setOnClickListener { - DialogWebViewActivity.start(this, UriProvider.getFansTeamRuleUrl()) - popupWindow.dismiss() - } - contentView.findViewById(R.id.tv_exit).setOnClickListener { - dialogManager.showOkCancelDialog("退出後粉絲團後24小時內不能再次加入,確定退出嗎?", true) { - popupWindow.dismiss() - fansTeamViewModel.exitFansTeam() - } - - } - popupWindow.showAsDropDown( - parent, - 0, - 0, - Gravity.END - ) - } - - -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/fansteam/FansTeamListActivity.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamListActivity.kt deleted file mode 100644 index ef399663a..000000000 --- a/app/src/main/java/com/chwl/app/fansteam/FansTeamListActivity.kt +++ /dev/null @@ -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() { - - private lateinit var rvDelegate: RVDelegate - - 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() - .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) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/fansteam/FansTeamListAdapter.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamListAdapter.kt deleted file mode 100644 index 04b58fb6a..000000000 --- a/app/src/main/java/com/chwl/app/fansteam/FansTeamListAdapter.kt +++ /dev/null @@ -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(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) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/fansteam/FansTeamTaskAdapter.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamTaskAdapter.kt deleted file mode 100644 index faa937bab..000000000 --- a/app/src/main/java/com/chwl/app/fansteam/FansTeamTaskAdapter.kt +++ /dev/null @@ -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(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(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(R.id.iv_task_logo).load(item.icon) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/fansteam/FansTeamViewModel.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamViewModel.kt deleted file mode 100644 index 4a83f6b8e..000000000 --- a/app/src/main/java/com/chwl/app/fansteam/FansTeamViewModel.kt +++ /dev/null @@ -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() - val fansTeamJoinInfoLiveData: LiveData = _fansTeamJoinInfoLiveData - - private val _fansTeamInitInfoLiveData = MutableLiveData() - val fansTeamInitInfoLiveData: LiveData = _fansTeamInitInfoLiveData - - private val _fansTeamJoinedInfoLiveData = MutableLiveData() - val fansTeamJoinedInfoLiveData: LiveData = _fansTeamJoinedInfoLiveData - - private val _joinFansTeamListLiveData = MutableLiveData>() - val joinFansTeamListLiveData: LiveData> = _joinFansTeamListLiveData - - private val _exitFansTeamLiveData = MutableLiveData() - val exitFansTeamLiveData: LiveData = _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 - ) - } - ) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt index 2ad2cb416..8efa920f7 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt +++ b/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(), View.OnClickListener { @@ -24,7 +24,6 @@ class HomeFragment : BaseViewBindingFragment(), 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(), 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()) - } } } } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/gift/dialog/GiftInfoVm.java b/app/src/main/java/com/chwl/app/ui/gift/dialog/GiftInfoVm.java index 8e7f08e82..7cc0f1837 100644 --- a/app/src/main/java/com/chwl/app/ui/gift/dialog/GiftInfoVm.java +++ b/app/src/main/java/com/chwl/app/ui/gift/dialog/GiftInfoVm.java @@ -77,8 +77,8 @@ public class GiftInfoVm extends BaseItem { radishDrawableSelected = null; goldText.set(context.getResources().getString(R.string.free_gift)); } else { - radishDrawable = context.getResources().getDrawable(R.drawable.icon_radish_transparent); - radishDrawableSelected = context.getResources().getDrawable(R.drawable.icon_radish_transparent_selected); + radishDrawable = null; + radishDrawableSelected = null; goldText.set(String.valueOf(data.getGoldPrice())); } this.isKnap.set(isKnap); diff --git a/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java b/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java index 38075a6f7..71c9f9570 100644 --- a/app/src/main/java/com/chwl/app/ui/im/RouterHandler.java +++ b/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; diff --git a/app/src/main/java/com/chwl/app/ui/setting/NoticeSettingActivity.java b/app/src/main/java/com/chwl/app/ui/setting/NoticeSettingActivity.java index b95be7d6d..b0c3691f0 100644 --- a/app/src/main/java/com/chwl/app/ui/setting/NoticeSettingActivity.java +++ b/app/src/main/java/com/chwl/app/ui/setting/NoticeSettingActivity.java @@ -60,7 +60,7 @@ public class NoticeSettingActivity extends BaseViewBindingActivity 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); diff --git a/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt b/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt index e360bc767..2a177ee33 100644 --- a/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt +++ b/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(), 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) diff --git a/app/src/main/res/drawable-xhdpi/icon_radish_transparent.webp b/app/src/main/res/drawable-xhdpi/icon_radish_transparent.webp deleted file mode 100644 index 2b7bfab73..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_radish_transparent.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_radish_transparent_selected.webp b/app/src/main/res/drawable-xhdpi/icon_radish_transparent_selected.webp deleted file mode 100644 index 169499ea2..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_radish_transparent_selected.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_room_send_gift_first_charge.webp b/app/src/main/res/drawable-xhdpi/icon_room_send_gift_first_charge.webp deleted file mode 100644 index 0b70d28d0..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_room_send_gift_first_charge.webp and /dev/null differ diff --git a/app/src/main/res/layout/activity_fans_team_join.xml b/app/src/main/res/layout/activity_fans_team_join.xml deleted file mode 100644 index 814b186be..000000000 --- a/app/src/main/res/layout/activity_fans_team_join.xml +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_fans_team_joined.xml b/app/src/main/res/layout/activity_fans_team_joined.xml deleted file mode 100644 index 02964b36b..000000000 --- a/app/src/main/res/layout/activity_fans_team_joined.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_fans_team_list.xml b/app/src/main/res/layout/activity_fans_team_list.xml deleted file mode 100644 index 1bd91afee..000000000 --- a/app/src/main/res/layout/activity_fans_team_list.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_av_room_game.xml b/app/src/main/res/layout/fragment_av_room_game.xml index d25322f3d..8c1cd15af 100644 --- a/app/src/main/res/layout/fragment_av_room_game.xml +++ b/app/src/main/res/layout/fragment_av_room_game.xml @@ -72,41 +72,15 @@ android:layout_marginTop="@dimen/dp_10" android:orientation="horizontal"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_fans_team_list.xml b/app/src/main/res/layout/item_fans_team_list.xml deleted file mode 100644 index b323e6fc8..000000000 --- a/app/src/main/res/layout/item_fans_team_list.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_fans_team_task.xml b/app/src/main/res/layout/item_fans_team_task.xml deleted file mode 100644 index 832ef1d41..000000000 --- a/app/src/main/res/layout/item_fans_team_task.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/layout/item_system_notice.xml b/app/src/main/res/layout/item_system_notice.xml index 6affb12d8..2f383af57 100644 --- a/app/src/main/res/layout/item_system_notice.xml +++ b/app/src/main/res/layout/item_system_notice.xml @@ -1,13 +1,17 @@ + android:layout_height="wrap_content" + android:minHeight="@dimen/dp_setting_sys_notice_item_height"> @@ -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" /> + android:textSize="12sp" + tools:text="@string/layout_item_system_notice_02" /> diff --git a/app/src/main/res/layout/room_rank_widget.xml b/app/src/main/res/layout/room_rank_widget.xml deleted file mode 100644 index e2c16aca3..000000000 --- a/app/src/main/res/layout/room_rank_widget.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/star_send_gift_dialog.xml b/app/src/main/res/layout/star_send_gift_dialog.xml index d1f201d51..a817928d4 100644 --- a/app/src/main/res/layout/star_send_gift_dialog.xml +++ b/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" /> diff --git a/app/src/module_labour_union/res/layout/activity_vip_main.xml b/app/src/module_labour_union/res/layout/activity_vip_main.xml index 2a8c0a0d9..1efbf8f07 100644 --- a/app/src/module_labour_union/res/layout/activity_vip_main.xml +++ b/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" /> - - ? = - launchRequest { - api.getJoinFansTeamList(pageNum, pageSize) - } - - private interface Api { - - /** - * 加入粉丝团 --弹窗内容 - * - * @return - */ - @GET("anchorFansTeam/applyFansTeamPopInfoVo") - suspend fun getFansTeamJoinInfo(@Query("teamUid") roomUid: Long): ServiceResult - - /** - * 粉丝团任务列表 - * - * @return - */ - @GET("anchorFansTeam/getFansTaskInfo") - suspend fun getFansTeamTaskInfo(@Query("teamUid") roomUid: Long): ServiceResult - - /** - * 进房初始化当前用户与房间粉丝团关系 - * - * @return - */ - @GET("/anchorFansTeam/initInRoomFansTeam") - suspend fun getFansTeamInitInfo(@Query("teamUid") roomUid: Long): ServiceResult - - /** - * 退出粉丝团 - * - * @return - */ - @GET("/anchorFansTeam/outAnchorFansTeam") - suspend fun outFansTeam(@Query("teamUid") roomUid: Long): ServiceResult - - /** - * 我的粉丝团列表 - * - * @return - */ - @GET("/anchorFansTeam/getJoinFansTeamList") - suspend fun getJoinFansTeamList( - @Query("page") page: Int, - @Query("pageSize") pageSize: Int - ): ServiceResult> - } - -} \ No newline at end of file diff --git a/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamInfo.kt b/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamInfo.kt deleted file mode 100644 index 86a3ef5e7..000000000 --- a/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamInfo.kt +++ /dev/null @@ -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 -) \ No newline at end of file diff --git a/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamInitInfo.kt b/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamInitInfo.kt deleted file mode 100644 index e54ecdb78..000000000 --- a/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamInitInfo.kt +++ /dev/null @@ -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 -) \ No newline at end of file diff --git a/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamJoinInfo.kt b/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamJoinInfo.kt deleted file mode 100644 index b90c2fcab..000000000 --- a/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamJoinInfo.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.chwl.core.fansteam.bean - - -data class FansTeamJoinInfo( - val anchorAvatar: String = "", - val anchorNick: String = "", - val avatarList: List = listOf(), - val isJoinLimit: Boolean = false, - val privilegeConfigVos: List = listOf(), - val teamId: Int = 0, - val teamNum: Int = 0, - val teamUid: Int = 0, - val taskVos: List? = null -) \ No newline at end of file diff --git a/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamJoinedInfo.kt b/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamJoinedInfo.kt deleted file mode 100644 index aa56d31ed..000000000 --- a/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamJoinedInfo.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.chwl.core.fansteam.bean - -data class FansTeamJoinedInfo( - val anchorAvatar: String = "", - val anchorNick: String = "", - val avatarList: List = listOf(), - val levelExper: Int = 0, - val levelSeq: Int = 0, - val memberAvatar: String = "", - val memberUid: Int = 0, - val nextLevelExper: Int = 0, - val taskVos: List = listOf(), - val teamNum: Int = 0, - val teamUid: Int = 0 -) diff --git a/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamTaskInfo.kt b/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamTaskInfo.kt deleted file mode 100644 index 7af43a8b1..000000000 --- a/core/src/main/java/com/chwl/core/fansteam/bean/FansTeamTaskInfo.kt +++ /dev/null @@ -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 -) \ No newline at end of file diff --git a/core/src/main/java/com/chwl/core/fansteam/bean/PrivilegeConfigVo.kt b/core/src/main/java/com/chwl/core/fansteam/bean/PrivilegeConfigVo.kt deleted file mode 100644 index c0aebad55..000000000 --- a/core/src/main/java/com/chwl/core/fansteam/bean/PrivilegeConfigVo.kt +++ /dev/null @@ -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 -) \ No newline at end of file