YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1:添加实名认证的时候，身份证号前后输入空格，出现的不能实名的情况

Browse Source 
2:修改一键全撩的时候，麦上只有自己的时候，就给提示
3:添加酒吧房进入交友房，双方下麦，在麦上的下麦，
This commit is contained in:
梁小江
2026-01-08 11:43:30 +08:00
parent a8ae4a61c2
commit 26a40f8ffb
3 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -242,7 +242,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
//用户列表用
private var mOnlineBean: RoomOnline? = null
var redPacketConfig : RedPacketConfig= RedPacketConfig()
var redPacketConfig: RedPacketConfig = RedPacketConfig()
override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_DOWN) {
@@ -1577,10 +1577,15 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
QXGiftPlayerManager.getInstance(this)
.displayChatEffectView(messageEvent.text.play_image)
}else if( msgType == EMMessageInfo.QXRoomMessageTypeFlirtatious){ //酒吧房撩ta推送的信息
} else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatious) { //酒吧房撩ta推送的信息
roomFragment?.handleRoomMessage(messageEvent)
}else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoom) {//酒吧房约她进入小黑屋
MvpPre?.postRoomInfo(messageEvent.text.room_id)
} else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoom) {//酒吧房约她进入小黑屋
if (mRoomInfoResp?.user_info?.user_id == messageEvent.text.user_id.toInt() || mRoomInfoResp?.user_info?.user_id == messageEvent.text.meet_user_id.toInt()) {
if (mRoomInfoResp?.user_info?.pit_number !=0) {
MvpPre?.downPit(roomId, mRoomInfoResp?.user_info?.pit_number.toString())
}
MvpPre?.postRoomInfo(messageEvent.text.room_id)
}
}
}
@@ -1752,7 +1757,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
}
// TODO: 房间类型切换
// TODO: 房间类型切换
private fun handleMsgType1012() {
if (customMusicFloatingView != null) {
customMusicFloatingView!!.destroy()
@@ -1767,7 +1772,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
AgoraManager.getInstance().ClientRole(false)
}
if (mRoomInfoResp?.song_user_info != null && mRoomInfoResp?.song_user_info?.user_id != null) {
if (mRoomInfoResp?.song_user_info?.user_id == SpUtil.getUserId().toString() + "") {
if (mRoomInfoResp?.song_user_info?.user_id == SpUtil.getUserId()
.toString() + ""
) {
AgoraManager.getInstance().ClientRole(false)
}
}
@@ -2340,7 +2347,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
mRoomInfoResp?.user_info?.pit_number = roomPitBean.pit_number.toInt()
roomBtnShowIsHide(mRoomInfoResp?.user_info?.user_id!!)
}
mRoomInfoResp?.room_info?.pit_list!![roomPitBean.pit_number.toInt() - 1] = roomPitBean
mRoomInfoResp?.room_info?.pit_list!![roomPitBean.pit_number.toInt() - 1] =
roomPitBean
pitArr.add(roomPitBean)
}
@@ -2616,10 +2624,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
)
} else if (id == R.id.rl) {
MvpPre!!.clearUserCharm(roomId, "")
}else if (id == R.id.rl2) {
} else if (id == R.id.rl2) {
MakeFriendsDialog(this, roomId).show()
}
else if (id == R.id.ll_input) {
} else if (id == R.id.ll_input) {
mBinding?.llInput?.visibility = View.GONE
mBinding?.inputMenu1?.dismiss()
} else if (id == R.id.iv_emoji) {
@@ -2711,21 +2718,21 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// MvpPre!!.downPit(roomId, "")
// }
// } else {
if (maiStatus) {
if (mRoomInfoResp?.room_info?.type_id == "11"){
WishGiftDialog(
ActivityUtils.getTopActivity(),
roomId.toString(),
""
).show()
}else {
MvpPre!!.applyPit(roomId, "")
}
maiStatus = false
if (maiStatus) {
if (mRoomInfoResp?.room_info?.type_id == "11") {
WishGiftDialog(
ActivityUtils.getTopActivity(),
roomId.toString(),
""
).show()
} else {
MvpPre!!.downPit(roomId, "")
maiStatus = true
MvpPre!!.applyPit(roomId, "")
}
maiStatus = false
} else {
MvpPre!!.downPit(roomId, "")
maiStatus = true
}
// }
}
}
@@ -2889,7 +2896,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
}
fun setPrivateRoomShowBottom(){
fun setPrivateRoomShowBottom() {
mBinding!!.rlPk.visibility =
if (voive) View.GONE else View.GONE
mBinding!!.rlMisc.visibility =
@@ -3136,13 +3143,17 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
if (mRoomInfoResp?.room_info?.head_line != null) {
mBinding!!.flaoatZuoji.visibility = View.VISIBLE
ImageUtils.loadHeadCC(mRoomInfoResp?.room_info?.head_line?.avatar, mBinding!!.headAvate)
ImageUtils.loadHeadCC(
mRoomInfoResp?.room_info?.head_line?.avatar,
mBinding!!.headAvate
)
mBinding!!.headName.text = mRoomInfoResp?.room_info?.head_line?.nickname
mBinding!!.headCone.text = mRoomInfoResp?.room_info?.head_line?.content
mBinding!!.headAvate.setOnClickListener { view ->
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE)
.withString("userId", mRoomInfoResp?.room_info?.head_line?.user_id).navigation()
.withString("userId", mRoomInfoResp?.room_info?.head_line?.user_id)
.navigation()
}
mBinding!!.ivQuanQiang.setOnClickListener { v: View? ->
@@ -3269,7 +3280,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
override fun showPasswordDialog() {
val roomPasswordSetDialogFragment = RoomPasswordSetDialogFragment.newInstance(true, roomId)
val roomPasswordSetDialogFragment =
RoomPasswordSetDialogFragment.newInstance(true, roomId)
roomPasswordSetDialogFragment.show(supportFragmentManager)
}
@@ -3729,11 +3741,11 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
RoomType.BLACK_ROOM -> {
if ("11" == labelId){
if ("11" == labelId) {
changeBackground(R.mipmap.icon_pri_bg)
setvisibTop(false)
QXRoomSeatViewType.PRIVATE
}else{
} else {
changeBackground(com.xscm.moduleutil.R.mipmap.cabin_bj)
setvisibTop(false)
QXRoomSeatViewType.CABIN
@@ -3761,16 +3773,19 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
setvisibTop(true)
QXRoomSeatViewType.SIGNCONTRACT
}
RoomType.PUB_ROOM -> {
changeBackgroundColor(mRoomInfoResp?.room_info?.room_background)
setvisibTop(true)
QXRoomSeatViewType.PUB
}
RoomType.PRIVATE_ROOM -> {
changeBackgroundColor(mRoomInfoResp?.room_info?.room_background)
setvisibTop(true)
QXRoomSeatViewType.PRIVATE
}
null -> {
LogUtils.e("@@@", "RoomType is null")
QXRoomSeatViewType.NONE
@@ -3890,8 +3905,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun getRedpacketConfig(data: RedPacketConfig?) {
this.redPacketConfig= data!!
RedBagSendDialog(this, roomId,redPacketConfig).show()
this.redPacketConfig = data!!
RedBagSendDialog(this, roomId, redPacketConfig).show()
}
fun getTasksMessageService(number: Int) {
@@ -4226,7 +4241,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
private val AUDIO_PERMISSIONS = arrayOf(Manifest.permission.RECORD_AUDIO)
}
override fun onRedPacketsAdded(redPackets: MutableList<RedPacketInfo>?, remainingCount: Int) {
override fun onRedPacketsAdded(
redPackets: MutableList<RedPacketInfo>?,
remainingCount: Int
) {
// 处理添加红包列表的逻辑
if (redPackets!!.isNotEmpty()) {
mBinding!!.drvRed.visibility = View.VISIBLE
@@ -4335,11 +4353,11 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
userMakeVisibility()
}
// TODO: 判断房间类型是否是酒吧房，只有酒吧房才会有交友小屋，其他房间类型没有
private fun userMakeVisibility(){
if(mRoomInfoResp?.room_info?.type_id=="11"){
// TODO: 判断房间类型是否是酒吧房，只有酒吧房才会有交友小屋，其他房间类型没有
private fun userMakeVisibility() {
if (mRoomInfoResp?.room_info?.type_id == "11") {
mBinding?.roomTop?.rl2?.visibility = View.VISIBLE
}else{
} else {
mBinding?.roomTop?.rl2?.visibility = View.GONE
}
}
@@ -4350,7 +4368,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
val builder = AlertDialog.Builder(this)
val inflater = layoutInflater
val dialogView =
inflater.inflate(com.xscm.moduleutil.R.layout.room_message_input_menu, null)
inflater.inflate(com.xscm.moduleutil.R.layout.room_message_input_menu, null)
builder.setView(dialogView)
val etContent = dialogView.findViewById<EditText>(com.xscm.moduleutil.R.id.et_content)
val tvSend = dialogView.findViewById<Button>(com.xscm.moduleutil.R.id.tv_send)
@@ -4460,7 +4478,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
}
private fun logIn(name:String){
private fun logIn(name: String) {
// ========== 核心：打印调用来源 ==========
val stackTrace = Throwable().stackTrace
if (stackTrace.size >= 2) { // stackTrace[0]是当前方法，stackTrace[1]是直接调用方

5
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPubFragment.kt
View File

@@ -269,7 +269,10 @@ class RoomPubFragment(var mRoomInfoResp: RoomInfoResp?) :
val validCount = mRoomInfoResp?.room_info?.pit_list?.take(6)
?.count { !it.user_id.isNullOrEmpty() && it.user_id != "0" && it.user_id != mRoomInfoResp?.user_info?.user_id.toString() }
?: 0
if (validCount == 0) {
ToastUtils.showShort("当前没有可撩的嘉宾哦！")
return@setOnClickListener
}
ConfirmDialog(
ActivityUtils.getTopActivity(),
"温馨提示",

2
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/RealNameActivity.java
View File

@@ -192,7 +192,7 @@ public class RealNameActivity extends BaseMvpActivity<RealNamePresenter, Activit
// mBinding.l1.setVisibility(View.GONE);
// mBinding.l2.setVisibility(View.VISIBLE);
// mBinding.btnSubmit.setText("立即认证");
MvpPre.realName(mBinding.edName.getText().toString(),mBinding.edPassword.getText().toString());
MvpPre.realName(mBinding.edName.getText().toString(),mBinding.edPassword.getText().toString().trim());
} else {
SpUtil.setRealName(true);
finish();