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

1:添加权限说明

Browse Source 
2：聊天添加举报按钮
This commit is contained in:
梁小江
2025-10-30 18:13:59 +08:00
parent a5ebc83dea
commit a993a7710f
21 changed files with 423 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
View File

@@ -1184,6 +1184,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun initData() {
if (!EasyPermissions.hasPermissions(this, *permissions)) {
PermissionDescriptionHelper.addPermissionDescription(false,mBinding?.root as ViewGroup,permissions)
EasyPermissions.requestPermissions(
this, "请开启录音使用权限",
1, *permissions
@@ -3127,26 +3128,26 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
if (pit_number != 0) View.VISIBLE else View.GONE
rl_more?.visibility =
if (pit_number == 9) View.VISIBLE else View.GONE
rl_misc?.visibility = View.VISIBLE
rl_misc?.visibility = View.GONE
}
0 -> {
rl_voice?.visibility = View.VISIBLE
rl_mic?.visibility =
if (pit_number != 0) View.VISIBLE else View.GONE
rl_misc?.visibility = View.VISIBLE
rl_misc?.visibility = View.GONE
}
5 -> {
rl_voice?.visibility = View.VISIBLE
rl_more?.visibility = View.GONE
rl_misc?.visibility = View.VISIBLE
rl_misc?.visibility = View.GONE
}
else -> {}
}
if (roleType != 5) {
rl_misc?.visibility = View.VISIBLE
rl_misc?.visibility = View.GONE
if (userPitNumber == 9) {
rl_more?.visibility = View.VISIBLE
}
@@ -3156,7 +3157,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// label_id 和 type_id 联合判断
if (mutableListOf<String>("1").contains(typeId) && "1" == labelId) {
rl_more?.visibility = View.VISIBLE
rl_misc?.visibility = View.VISIBLE
rl_misc?.visibility = View.GONE
}else{
rl_more?.visibility = View.GONE
rl_misc?.visibility = View.GONE
@@ -3994,11 +3995,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun postRoomInfo(resp: RoomInfoResp?) {
if (resp == null) {
// CommonAppContext.getInstance().isShow = false;
// CommonAppContext.getInstance().isPlaying = false;
// ToastUtils.showShort("您已经掉线，需要重新进入房间！");
// ARouter.getInstance().build(ARouteConstants.ME)
// .navigation();
// 只有在没有房间信息时才重新获取
if (mRoomInfoResp == null) {
cleanupResources()
@@ -4009,91 +4005,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
this.mRoomInfoResp = resp
setview(resp)
// val roomBean = resp.room_info
// if (roomBean!!.type_id.equals("6")) {
//
//// upHeight()
// initPublicScreenFragment()
// if (!isFinishing && !isDestroyed) {
// resetFragment()
// upHeight()
// } else {
// Log.e("Fragment", "Fragment transaction skipped due to state loss.")
// }
// return
// }
// this.mRoomBean = roomBean
// this.mRoomUserBean = resp.user_info
// this.mRoomOwnerBean = resp.room_owner
// this.mPitList = mRoomBean!!.pit_list!!
//
// ImageUtils.loadHeadCC(resp.room_info.room_cover, mBinding!!.roomTop.avatar)
// mBinding!!.roomTop.name.text = roomBean.room_name
// mBinding!!.roomTop.idVal.text = roomBean.room_number
// if (mRoomUserBean?.getIs_room_owner() == 1) {
// mBinding!!.roomTop.btnFollow.visibility = View.GONE
// } else {
// mBinding!!.roomTop.btnFollow.visibility = View.VISIBLE
// if (resp.isCollect) {
// mBinding!!.roomTop.btnFollow.background =
// resources.getDrawable(com.xscm.moduleutil.R.mipmap.collected)
// mBinding!!.roomTop.btnFollow.text = ""
// }
// }
// initPublicScreenFragment()
// if (!isFinishing && !isDestroyed) {
// resetFragment()
// upHeight()
// } else {
// Log.e("Fragment", "Fragment transaction skipped due to state loss.")
// }
//
// if (mRoomUserBean?.getIs_collect() == 1) {
// mBinding!!.roomTop.btnFollow.background =
// resources.getDrawable(com.xscm.moduleutil.R.mipmap.yishouc)
// mBinding!!.roomTop.btnFollow.text = ""
// } else {
//// mBinding.roomTop.btnFollow.setBackground(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.collect));
// ThemeableDrawableUtils.setThemeableRoundedBackground(
// mBinding!!.roomTop.btnFollow,
// ColorManager.getInstance().primaryColorInt,
// 53
// )
// mBinding!!.roomTop.btnFollow.setTextColor(ColorManager.getInstance().buttonColorInt)
// mBinding!!.roomTop.btnFollow.text = "收藏"
// }
// if ((resp.room_info.type_id == "3" || resp.room_info.type_id == "1" || resp.room_info.type_id == "4") && resp.room_info.label_id == "2") {
// AgoraManager.getInstance(this).isBjMusic = false
// } else {
// AgoraManager.getInstance(this).isBjMusic = true
// }
//
//
// AgoraManager.stopMuisc()
// if (!CommonAppContext.getInstance().isMai) {
// initializeAudio()
// }
//
// if (mRoomInfoResp!!.room_info.label_id == "2" || mRoomInfoResp!!.room_info.type_id == "7") {
// mBinding!!.rlMore.visibility = View.GONE
// // mBinding.rlMisc.setVisibility(GONE);
// } else if (mRoomInfoResp!!.room_info.label_id == "1" || mRoomInfoResp!!.room_info.type_id == "3" || mRoomInfoResp!!.room_info.type_id == "4" ||
// mRoomInfoResp!!.room_info.type_id == "8"
// ) {
// mBinding!!.rlMore.visibility = View.GONE
// mBinding!!.rlMisc.visibility = View.VISIBLE
// }
//
// if (resp.room_info.type_id == "7" || resp.room_info.type_id == "2") {
// mBinding!!.rlMore.visibility = View.GONE
// mBinding!!.rlMisc.visibility = View.GONE
// }
//
// if (mRoomInfoResp!!.hour_ranking_open == 1) {
// mBinding!!.clXsb.visibility = View.VISIBLE
// } else {
// mBinding!!.clXsb.visibility = View.GONE
// }
}
fun upHeight() {
@@ -4211,15 +4122,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
"@@@",
"上一个房间的roonid" + AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId
)
// MvpPre.getRoomIn(AgoraManager.getInstance(context).getLastRoomId(), "");
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "电影房")
// .withString("roomId", AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId)
// .navigation()
// RoomManager.getInstance().fetchRoomDataAndEnter(
// this,
// AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId,
// ""
// )
if (AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId != null && !AgoraManager.getInstance(
OkDownloadProvider.context
).lastRoomId.isEmpty()
@@ -4227,8 +4129,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
MvpPre?.getRoomIn(AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId, "")
}
AgoraManager.getInstance(OkDownloadProvider.context).lastRoomId = ""
// setviewyc(true);
// exitFullScreen()
}
override fun userGuanzSuccess(s: String) {
@@ -4529,12 +4429,14 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
override fun onPermissionsGranted(requestCode: Int, perms: List<String>) {
PermissionDescriptionHelper.removePermissionDescription(mBinding?.root as ViewGroup)
if (perms.contains(Manifest.permission.RECORD_AUDIO)) {
Log.d("Permission", "录音权限已授权")
}
}
override fun onPermissionsDenied(requestCode: Int, perms: List<String>) {
PermissionDescriptionHelper.removePermissionDescription(mBinding?.root as ViewGroup)
if (EasyPermissions.somePermissionPermanentlyDenied(this, perms)) {
AppSettingsDialog.Builder(this).build().show()
} else {

2
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomBackgroundDialogFragment.java
View File

@@ -29,6 +29,7 @@ import com.xscm.moduleutil.bean.RoomBgBean;
import com.xscm.moduleutil.dialog.ConfirmDialog;
import com.xscm.moduleutil.utils.GlideEngine;
import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.PermissionDescriptionHelper;
import com.xscm.moduleutil.widget.Constants;
import org.greenrobot.eventbus.EventBus;
@@ -106,6 +107,7 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment<RoomBack
.openGallery(mimeType)
.isGif(isVideo)
.setImageEngine(GlideEngine.createGlideEngine())
.setPermissionDescriptionListener(PermissionDescriptionHelper.createListener())
.setMaxSelectNum(type)
.isPreviewImage(true)
.isDisplayCamera(false)