diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java index d312c4c2..ca0cd318 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java @@ -137,7 +137,7 @@ public class CommonAppContext extends MultiDexApplication implements Application @Getter public UnreadCountEvent unreadCountEvent; - public static int selectRelease = -1; + public static int selectRelease = 1; public int is_open = 0;//主题的开关 diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/enumType/QXRoomSeatViewType.java b/BaseModule/src/main/java/com/xscm/moduleutil/enumType/QXRoomSeatViewType.java index 48a6b384..d074e790 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/enumType/QXRoomSeatViewType.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/enumType/QXRoomSeatViewType.java @@ -27,6 +27,12 @@ public enum QXRoomSeatViewType { */ SIGNCONTRACT(10,"签约"), + + /** + * 酒吧 + */ + PUB(7,"酒吧"), + /** * 小黑屋麦位 */ diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/enumType/RoomType.kt b/BaseModule/src/main/java/com/xscm/moduleutil/enumType/RoomType.kt index a455f041..a9349d7a 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/enumType/RoomType.kt +++ b/BaseModule/src/main/java/com/xscm/moduleutil/enumType/RoomType.kt @@ -15,6 +15,7 @@ enum class RoomType( DATING("交友", 1,3, 4, 8), // 1、3、4、8 均对应交友 BLACK_ROOM("小黑屋", 6), JUKEBOX("点唱", 9), + PUB_ROOM("酒吧", 7), MUTUAL_ENTERTAINMENT("互娱", 7), SIGN_CONTRACT("签约", 10); diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index 2ad0da9e..d59c2c09 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -3714,11 +3714,17 @@ class RoomActivity : BaseMvpActivity(), setvisibTop(true) QXRoomSeatViewType.SIGNCONTRACT } - + RoomType.PUB_ROOM -> { + changeBackgroundColor(mRoomInfoResp?.room_info?.room_background) + setvisibTop(true) + QXRoomSeatViewType.PUB + } null -> { LogUtils.e("@@@", "RoomType is null") QXRoomSeatViewType.NONE } + + } if (roomFragment == null) { diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/PubContacts.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/PubContacts.kt new file mode 100644 index 00000000..51ba5c84 --- /dev/null +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/PubContacts.kt @@ -0,0 +1,38 @@ +package com.xscm.modulemain.activity.room.contacts + +import android.app.Activity +import com.xscm.moduleutil.activity.IPresenter +import com.xscm.moduleutil.activity.IView +import com.xscm.moduleutil.bean.WalletBean + +class PubContacts { + + interface View : IView{ + + fun signCoinList(list:List) + + fun wallet(list:List,walletBean: WalletBean?) + } + + interface Ipre : IPresenter{ + fun applyPit(roomId:String,pitNumber:String) + + fun signStart(roomId:String,userId:String) + + fun signEnd(signId:String) + + fun signDelay(signId:String,roomId:String) + + fun signRefuse(roomId: String) + + fun signCoinList(signId:String) + + fun signCoin(signId:String,sign_value:String) + + fun setMutePit(roomId:String,pitNumber:String,isMute:String) + + fun setLockPit(roomId:String,pitNumber:String,isLock:String) + + fun wallet(list:List) + } +} \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java index a22eb38d..02bb1323 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java @@ -102,6 +102,7 @@ public class RoomFragment extends BaseMvpFragment() { + + override fun getLayoutId(): Int { + return R.layout.fragment_pub_room + } + + override fun bindPresenter(): PubPresenter { + return PubPresenter(ActivityUtils.getTopActivity(), null) + } + + // 无参构造函数 + constructor() : this(null) + + companion object { + + fun newInstance(roomInfoResp: RoomInfoResp): RoomPubFragment { + return RoomPubFragment(roomInfoResp) + } + } + + private var mUserInfo: RoomUserBean? = mRoomInfoResp?.user_info + private var mRoomId: String = mRoomInfoResp?.room_info?.room_id!! + + private var viewList: MutableList = mutableListOf() + private val indexList: MutableList = + mutableListOf("9", "10", "1", "2", "3", "4", "5", "6") + + override fun initData() { + + } + + override fun initView() { + viewList.clear() + + viewList.add(mBinding.rpwvTopLeft) + viewList.add(mBinding.rpwvTopRight) + viewList.add(mBinding.rpwv1) + viewList.add(mBinding.rpwv2) + viewList.add(mBinding.rpwv3) + viewList.add(mBinding.rpwv4) + viewList.add(mBinding.rpwv5) + viewList.add(mBinding.rpwv6) + + + for ((idx, view) in viewList.withIndex()) { + if (mRoomInfoResp?.room_info?.pit_list!!.size > indexList[idx].toInt() - 1) { + view.setRoomWheatNumber(indexList[idx]) + val bean = mRoomInfoResp?.room_info?.pit_list!![indexList[idx].toInt() - 1] + view.setData(bean) + + view.iv_custom_gift?.setOnClickListener { + ToastUtils.showShort("礼物") + } + + view.ivYueT?.setOnClickListener { + ToastUtils.showShort("约她") + } + + view.ivLiaoT?.setOnClickListener { + ToastUtils.showShort("撩她") + } + + view.setOnClickListener { v -> + if (ClickUtils.isFastDoubleClick(v)) { + return@setOnClickListener + } + + if (mUserInfo?.pit_number == 9 && (view.pitBean.user_id == "0" || view.pitBean.user_id.isEmpty())){ + val mPitBean = + mRoomInfoResp?.room_info?.pit_list!![indexList[idx].toInt() - 1] + + // 处理抱麦逻辑 + (activity as RoomActivity).showUserListDialog( + mRoomId, + mPitBean?.pit_number, + mRoomInfoResp?.user_info, + mRoomInfoResp, + childFragmentManager + ) + } else if (mUserInfo?.pit_number == 9 && !(view.pitBean.user_id == "0" || view.pitBean.user_id.isEmpty())){ + RoomUserInfoFragment.show( + mRoomInfoResp?.room_info?.room_id, + view.getUserId(), + view.pitNumber, + getHostUser(), + false, + 2, + isNumberWhether(), + childFragmentManager + ) + }else{ + if (view.pitBean.user_id == "0" || view.pitBean.user_id.isEmpty()) { + MvpPre!!.applyPit(mRoomInfoResp?.room_info?.room_id!!, view.pitNumber) + }else { + RoomUserInfoFragment.show( + mRoomInfoResp?.room_info?.room_id, + view.getUserId(), + view.pitNumber, + getHostUser(), + false, + 2, + isNumberWhether(), + childFragmentManager + ) + } + } + } + } + } + } + + fun roomInfoUpdate(roomInfoResp: RoomInfoResp) { + this.mRoomInfoResp = roomInfoResp + mUserInfo = this.mRoomInfoResp?.user_info + mRoomId = this.mRoomInfoResp?.room_info?.room_id!! + } + + fun roomTypeSwitch(mRoomInfoResp: RoomInfoResp) { + this.mRoomInfoResp = mRoomInfoResp + + mUserInfo = this.mRoomInfoResp?.user_info + mRoomId = this.mRoomInfoResp?.room_info?.room_id!! + initView() + } + + private fun isNumberWhether(): Int { + if (mRoomInfoResp?.user_info?.pit_number == 9) { + return 1 + } + return 0 + } + + private fun getHostUser(): Int { + LogUtils.e("getHostUser：${mRoomInfoResp?.user_info.toString()}") + return if (mRoomInfoResp?.user_info?.is_room_owner == 1) { + 1 + } else if (mRoomInfoResp?.user_info?.is_management == 1) { + 2 + } else if (mRoomInfoResp?.user_info?.is_host == 1) { + 3 + } else { + 4 + } + } + + fun event1003(messageEvent: RoomMessageEvent) { + val pitNumber = messageEvent.text.pit_number + if (indexList.contains(pitNumber)) { + val viewPos = indexList.indexOf(pitNumber) + val pitBean = mRoomInfoResp?.room_info?.pit_list!![pitNumber.toInt() - 1] + viewList[viewPos].setData(pitBean) + } + } + + fun event1004(messageEvent: RoomMessageEvent) { + val pitNumber = messageEvent.text.pit_number + if (indexList.contains(pitNumber)) { + val viewPos = indexList.indexOf(pitNumber) + val pitBean = mRoomInfoResp?.room_info?.pit_list!![pitNumber.toInt() - 1] + viewList[viewPos].setData(pitBean) + } + } + + fun event1035(messageEvent: RoomMessageEvent) { + val fromUserId = messageEvent.text.fromUserInfo.user_id + for (i in 0 until viewList.size) { + if (viewList[i].pitBean?.user_id == fromUserId.toString()) { + val pitBean = mRoomInfoResp?.room_info?.pit_list!![indexList[i].toInt() - 1] + viewList[i].setData(pitBean) + break + } + } + } + + fun event1039(messageEvent: RoomMessageEvent) { + val fromId = messageEvent.text.from_pit_number + val toId = messageEvent.text.to_pit_number + if (indexList.contains(fromId)) { + val viewPos = indexList.indexOf(fromId) + val pitBean = mRoomInfoResp?.room_info?.pit_list!![fromId.toInt() - 1] + viewList[viewPos].setData(pitBean) + } + + if (indexList.contains(toId)) { + val viewPos = indexList.indexOf(toId) + val pitBean = mRoomInfoResp?.room_info?.pit_list!![toId.toInt() - 1] + viewList[viewPos].setData(pitBean) + } + } + + // TODO: 清除个人魅力 + fun event1059(messageEvent: RoomMessageEvent) { + val userId: String? = messageEvent.text.user_id + + } + + fun event1005(message: RoomMessageEvent) { + // 检查是否有多个用户信息 + if (!message.text.toUserInfos.isNullOrEmpty()) { + // 处理多个用户的情况 + for (userOnlineStatusBean in message.text.toUserInfos) { + updateCharmForUser(userOnlineStatusBean) + } + } else { + // 处理单个用户的情况 + val toUserInfo: UserInfo? = message.text.toUserInfo + if (toUserInfo != null) { + updateCharmForUser(toUserInfo) + } + } + } + + private fun updateCharmForUser(userInfo: UserInfo) { + val userId = userInfo.user_id.toString() + val charm = userInfo.charm + + } + + // TODO: 清除房间的魅力，一键全清 + fun event1021(messageEvent: RoomMessageEvent) { + + } + + fun event1058(messageEvent: RoomMessageEvent) { + val type = messageEvent.text.type + for (view in viewList) { + if (view.userId.isNotEmpty() && view.userId.equals(messageEvent.text.user_id)) { + view.pitBean.is_online = if (type == 1) 1 else 2 + view.setData(view.pitBean) + } + } + } + +} \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/PubPresenter.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/PubPresenter.kt new file mode 100644 index 00000000..f9e86790 --- /dev/null +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/PubPresenter.kt @@ -0,0 +1,147 @@ +package com.xscm.modulemain.activity.room.presenter + +import android.content.Context +import com.xscm.modulemain.activity.room.contacts.MentorShipContacts +import com.xscm.modulemain.activity.room.contacts.PubContacts +import com.xscm.moduleutil.bean.WalletBean +import com.xscm.moduleutil.http.BaseObserver +import com.xscm.moduleutil.http.RetrofitClient +import com.xscm.moduleutil.presenter.BasePresenter +import com.xscm.moduleutil.presenter.RewardGiftContacts +import io.reactivex.disposables.Disposable +import java.lang.ref.WeakReference + + +class PubPresenter(context: Context, val view: PubContacts.View?) : + BasePresenter(view, context), PubContacts.Ipre { + override fun applyPit(roomId: String, pitNumber: String) { + RetrofitClient.getInstance().applyPit(roomId, pitNumber, object : BaseObserver() { + override fun onSubscribe(d: Disposable) { + addDisposable(d) + } + + override fun onNext(s: String) { + + } + }) + } + + + override fun wallet(list:List) { + RetrofitClient.getInstance().wallet(object : BaseObserver() { + override fun onSubscribe(d: Disposable) { + addDisposable(d) + } + + override fun onNext(walletBean: WalletBean) { + if (MvpRef == null) { + MvpRef = WeakReference(view) + } + MvpRef.get()?.wallet(list,walletBean) + } + }) + } + + + override fun signStart(roomId: String, userId: String) { + RetrofitClient.getInstance().signStart(roomId, userId, object : BaseObserver() { + override fun onSubscribe(d: Disposable) { + addDisposable(d) + } + + override fun onNext(s: String) { + + } + }) + } + + override fun signEnd(signId: String) { + RetrofitClient.getInstance().signEnd(signId, object : BaseObserver() { + override fun onSubscribe(d: Disposable) { + addDisposable(d) + } + + override fun onNext(s: String) { + + } + }) + } + + override fun signDelay(signId: String, roomId: String) { + RetrofitClient.getInstance().signDelay(signId, roomId, object : BaseObserver() { + override fun onSubscribe(d: Disposable) { + addDisposable(d) + } + + override fun onNext(s: String) { + + } + }) + } + + override fun signRefuse(roomId: String) { + RetrofitClient.getInstance().signRefuse(roomId, object : BaseObserver(){ + override fun onSubscribe(d: Disposable) { + + } + + override fun onNext(t: String) { + } + }) + } + + override fun signCoinList(signId: String) { + RetrofitClient.getInstance().signCoinList(signId, object : BaseObserver>() { + override fun onSubscribe(d: Disposable) { + addDisposable(d) + } + + override fun onNext(list: List) { + if (MvpRef == null){ + MvpRef = WeakReference(view) + } + MvpRef.get()?.signCoinList(list) + } + }) + } + + override fun signCoin(signId: String, sign_value: String) { + RetrofitClient.getInstance().signCoin(signId, sign_value, object : BaseObserver() { + override fun onSubscribe(d: Disposable) { + addDisposable(d) + } + + override fun onNext(s: String) { + + } + }) + } + + + override fun setMutePit(roomId: String, pitNumber: String, isMute: String) { + RetrofitClient.getInstance() + .setMutePit(roomId, pitNumber, isMute, object : BaseObserver() { + override fun onSubscribe(d: Disposable) { + addDisposable(d) + } + + override fun onNext(string: String) { + + } + }) + } + + override fun setLockPit(roomId: String, pitNumber: String, isLock: String) { + RetrofitClient.getInstance() + .setLockPit(roomId, pitNumber, isLock, object : BaseObserver() { + override fun onSubscribe(d: Disposable) { + addDisposable(d) + } + + override fun onNext(string: String) { + + } + }) + } + +} \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java index 60051616..e2e12add 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java @@ -333,7 +333,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter { + iv_tag_type?.visibility = View.VISIBLE + iv_tag_type?.setImageResource(com.xscm.moduleutil.R.mipmap.zc) + tv_time?.visibility = View.GONE + ll_bottom?.visibility = View.GONE + iv_custom_gift?.visibility = View.GONE + } + + "10" -> { + iv_tag_type?.visibility = View.VISIBLE + iv_tag_type?.setImageResource(com.xscm.moduleutil.R.mipmap.jb) + tv_time?.visibility = View.GONE + ll_bottom?.visibility = View.GONE + iv_custom_gift?.visibility = View.GONE + } + + else -> { + tv_time?.visibility = View.GONE + ll_bottom?.visibility = View.GONE + iv_custom_gift?.visibility = View.GONE + } + } + + mCharmView.visibility = View.GONE + + if (isOn) { + handleOnState(bean) + } else { + handleOffState(bean) + } + + } + + fun setSex(value: String?, format: Boolean) { + mCharmView.setSex("", "", value, format) + } + + + private fun handleOnState(bean: RoomPitBean) { + mIvRipple.visibility = VISIBLE + mTvName.text = bean.nickname + ImageUtils.loadHeadCC(bean.avatar, mRiv) + + if (!bean.pit_number.equals("9") && !bean.pit_number.equals("10")) { + tv_time?.visibility = View.VISIBLE + ll_bottom?.visibility = View.VISIBLE + iv_custom_gift?.visibility = View.VISIBLE + } + + if (TextUtils.isEmpty(bean.dress)) { + mIvFrame.stopAll() + mIvFrame.visibility = INVISIBLE + } else { + mIvFrame.visibility = VISIBLE + mIvFrame.setSource(bean.dress, 3) + } + } + + private val pitNumberText: String + get() { + return "虚位以待" + } + + private fun handleOffState(bean: RoomPitBean) { + mTvName.text = pitNumberText + mRiv.visibility = VISIBLE + mRiv.setImageResource(com.xscm.moduleutil.R.mipmap.room_ic_wheat_default) + mIvShutup.visibility = GONE + iv_tag_type!!.visibility = GONE + mIvFrame.stopAll() + mIvFrame.visibility = GONE + mIvRipple.visibility = GONE + } + + private fun stopAndClearAnimation() { + if (mIvRipple != null) { + mIvRipple.stopAnimation(true) + } + } + + + override fun onRemoteSoundLevelUpdate(userId: String, soundLevel: Int) { + } + + override fun onLocalSoundLevelUpdate(volume: Int) { + } + + override fun userJoined(userId: Int, elapsd: Int) { + } + + override fun userOffline(userId: Int, reason: Int) { + } + + override fun pkOffSide(userId: Int) { + } +} diff --git a/MainModule/src/main/res/layout/fragment_pub_room.xml b/MainModule/src/main/res/layout/fragment_pub_room.xml new file mode 100644 index 00000000..a8122597 --- /dev/null +++ b/MainModule/src/main/res/layout/fragment_pub_room.xml @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MainModule/src/main/res/layout/layout_room_pub_wheat.xml b/MainModule/src/main/res/layout/layout_room_pub_wheat.xml new file mode 100644 index 00000000..784ce5f4 --- /dev/null +++ b/MainModule/src/main/res/layout/layout_room_pub_wheat.xml @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_left_set_time.png b/MainModule/src/main/res/mipmap-hdpi/icon_left_set_time.png new file mode 100644 index 00000000..2ff3bf9e Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_left_set_time.png differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_pub_all_you.png b/MainModule/src/main/res/mipmap-hdpi/icon_pub_all_you.png new file mode 100644 index 00000000..d5cf728c Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_pub_all_you.png differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_pub_custom_gift_bg.png b/MainModule/src/main/res/mipmap-hdpi/icon_pub_custom_gift_bg.png new file mode 100644 index 00000000..08440fbe Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_pub_custom_gift_bg.png differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_pub_gift_bg.png b/MainModule/src/main/res/mipmap-hdpi/icon_pub_gift_bg.png new file mode 100644 index 00000000..546c9683 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_pub_gift_bg.png differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_pub_liao_t.png b/MainModule/src/main/res/mipmap-hdpi/icon_pub_liao_t.png new file mode 100644 index 00000000..694a8bc0 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_pub_liao_t.png differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_pub_time_bg.png b/MainModule/src/main/res/mipmap-hdpi/icon_pub_time_bg.png new file mode 100644 index 00000000..365d2461 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_pub_time_bg.png differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_pub_top_friend_bg.png b/MainModule/src/main/res/mipmap-hdpi/icon_pub_top_friend_bg.png new file mode 100644 index 00000000..d96e7aeb Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_pub_top_friend_bg.png differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_pub_yue_t.png b/MainModule/src/main/res/mipmap-hdpi/icon_pub_yue_t.png new file mode 100644 index 00000000..f005b7df Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_pub_yue_t.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_left_set_time.png b/MainModule/src/main/res/mipmap-xhdpi/icon_left_set_time.png new file mode 100644 index 00000000..f17b6126 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_left_set_time.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_pub_all_you.png b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_all_you.png new file mode 100644 index 00000000..7f10b7b3 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_all_you.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_pub_custom_gift_bg.png b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_custom_gift_bg.png new file mode 100644 index 00000000..18488778 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_custom_gift_bg.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_pub_gift_bg.png b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_gift_bg.png new file mode 100644 index 00000000..ae016dee Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_gift_bg.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_pub_liao_t.png b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_liao_t.png new file mode 100644 index 00000000..0ba5ab7f Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_liao_t.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_pub_time_bg.png b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_time_bg.png new file mode 100644 index 00000000..66e8b78c Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_time_bg.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_pub_top_friend_bg.png b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_top_friend_bg.png new file mode 100644 index 00000000..1c5d7752 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_top_friend_bg.png differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_pub_yue_t.png b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_yue_t.png new file mode 100644 index 00000000..21d6c984 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_pub_yue_t.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_left_set_time.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_left_set_time.png new file mode 100644 index 00000000..c84fad7c Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_left_set_time.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_all_you.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_all_you.png new file mode 100644 index 00000000..76f103de Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_all_you.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_custom_gift_bg.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_custom_gift_bg.png new file mode 100644 index 00000000..a08d39c0 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_custom_gift_bg.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_gift_bg.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_gift_bg.png new file mode 100644 index 00000000..5b12d779 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_gift_bg.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_liao_t.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_liao_t.png new file mode 100644 index 00000000..3fa0f530 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_liao_t.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_time_bg.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_time_bg.png new file mode 100644 index 00000000..6ce740ca Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_time_bg.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_top_friend_bg.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_top_friend_bg.png new file mode 100644 index 00000000..20bbe73b Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_top_friend_bg.png differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_yue_t.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_yue_t.png new file mode 100644 index 00000000..968ab36f Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_pub_yue_t.png differ