diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/WalletBean.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/WalletBean.java index 742cd4d2..355ab54a 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/WalletBean.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/WalletBean.java @@ -11,7 +11,7 @@ public class WalletBean { private String id; private String user_id; - private String coin;//金币 + private String coin="0";//金币 private String earnings;//钻石 private String url;//灵活就业合作伙伴协议 private String title;//状态 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 d20fab71..55a5cec9 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 @@ -192,7 +192,6 @@ import java.lang.ref.WeakReference import java.nio.charset.StandardCharsets import java.util.Arrays import java.util.Date -import java.util.concurrent.Executors import java.util.concurrent.TimeUnit import java.util.stream.Collectors @@ -602,6 +601,12 @@ class RoomActivity : BaseMvpActivity(), ) } + mBinding?.clGold?.setOnClickListener { view : View -> + this.onClick( + view + ) + } + mBinding!!.inputMenu1.performClick() V2TIMManager.getConversationManager() @@ -1098,6 +1103,16 @@ class RoomActivity : BaseMvpActivity(), SpUtil.getInstance().setIntValue("is_pk",mRoomInfoResp?.room_info?.is_pk?:1) } + // TODO: 小黑屋充值 + fun refillGold(){ + RechargeDialogFragment.show(roomId, null, supportFragmentManager, "", "") + } + + // TODO: 充值赋值 + fun goldAssignment(gold_coin: String){ + mBinding?.tvGold?.text = "余额:"+ gold_coin + + } private fun checkAndRestoreMinimizeState() { val prefs = getSharedPreferences("room_minimize_state", Context.MODE_PRIVATE) @@ -2879,6 +2894,8 @@ class RoomActivity : BaseMvpActivity(), mBinding!!.svgaGift.visibility = View.VISIBLE } + } else if (id == R.id.cl_gold){ + refillGold() } } @@ -3072,6 +3089,7 @@ class RoomActivity : BaseMvpActivity(), if (voive) View.VISIBLE else View.VISIBLE mBinding?.rlPrivateMsg?.visibility = View.VISIBLE mBinding?.rlEffects?.visibility = View.VISIBLE + mBinding?.clGold?.visibility= View.VISIBLE if (SpUtil.getOpenEffect()==1){ mBinding?.ivIcon?.setImageResource(com.xscm.moduleutil.R.mipmap.icon_close_effects) @@ -3104,6 +3122,8 @@ class RoomActivity : BaseMvpActivity(), if (voive) View.VISIBLE else View.GONE mBinding?.rlPrivateMsg?.visibility = View.GONE mBinding?.rlEffects?.visibility = View.GONE + mBinding?.clGold?.visibility= View.GONE + } /** 这里是当进入电影放房的时候,如果是排麦模式,并且不是电影放的时候,就隐藏排麦视图 */ diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/PrivateContacts.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/PrivateContacts.kt index 1e7319ee..0012b50b 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/PrivateContacts.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/PrivateContacts.kt @@ -11,7 +11,7 @@ class PrivateContacts { interface View : IView{ - fun wallet(list:List,walletBean: WalletBean?) + fun wallet(walletBean: WalletBean?) fun sendGiftResult(success:Boolean,idx: Int) @@ -29,7 +29,7 @@ class PrivateContacts { fun exitRoom(roomId: String?, userId: String?) - fun wallet(list:List) + fun wallet() } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt index 1687b2eb..cabb8aee 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPrivateFragment.kt @@ -203,6 +203,7 @@ class RoomPrivateFragment(var mRoomInfoResp: RoomInfoResp?) : override fun initData() { MvpPre?.getGiftList(mRoomId) + MvpPre?.wallet() } fun roomInfoUpdate(roomInfoResp: RoomInfoResp) { @@ -229,7 +230,10 @@ class RoomPrivateFragment(var mRoomInfoResp: RoomInfoResp?) : } - override fun wallet(list: List, walletBean: WalletBean?) { + override fun wallet(walletBean: WalletBean?) { + if (ActivityUtils.getTopActivity() is RoomActivity) { + (ActivityUtils.getTopActivity() as RoomActivity).goldAssignment(walletBean?.coin.toString()) + } } @@ -243,7 +247,7 @@ class RoomPrivateFragment(var mRoomInfoResp: RoomInfoResp?) : itemTextView.visibility = View.VISIBLE return } - + MvpPre?.wallet() val itemImage = giftViewList[idx] val itemTextView = giftTViewList[idx] diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/PrivatePresenter.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/PrivatePresenter.kt index c0bba8ee..10e4d394 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/PrivatePresenter.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/PrivatePresenter.kt @@ -108,7 +108,7 @@ class PrivatePresenter(context: Context, val view: PrivateContacts.View?) : } - override fun wallet(list:List) { + override fun wallet() { RetrofitClient.getInstance().wallet(object : BaseObserver() { override fun onSubscribe(d: Disposable) { addDisposable(d) @@ -118,9 +118,11 @@ class PrivatePresenter(context: Context, val view: PrivateContacts.View?) : if (MvpRef == null) { MvpRef = WeakReference(view) } - MvpRef.get()?.wallet(list,walletBean) + MvpRef.get()?.wallet(walletBean) } }) } + + } \ No newline at end of file diff --git a/MainModule/src/main/res/layout/activity_room.xml b/MainModule/src/main/res/layout/activity_room.xml index 4730b870..ba10eead 100644 --- a/MainModule/src/main/res/layout/activity_room.xml +++ b/MainModule/src/main/res/layout/activity_room.xml @@ -83,7 +83,7 @@ - + - + app:layout_constraintVertical_bias="0.0" + app:spanCount="1" /> + android:gravity="center_vertical" + android:visibility="gone"> + android:layout_weight="0.3" + android:visibility="gone"> + android:layout_weight="0.3" + android:visibility="gone"> + android:layout_weight="0.3" + android:visibility="gone"> + android:layout_weight="0.6" + android:visibility="gone"> + + + + + + + + + + +