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-12-05 19:40:05 +08:00
parent 582adedd55
commit 3fea806732
10 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MainModule/src/main/java/com/xscm/modulemain/activity/plaza/activity/ReleaseActivity.java
View File

@@ -302,6 +302,10 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
btnConfirm.setOnClickListener(v -> {
topicId=new ArrayList<>();
List<HeatedBean> selectedTopics = adapter.getSelectedItems();
if (selectedTopics==null || selectedTopics.isEmpty()){
ToastUtils.showShort("请选择话题");
return;
}
// 返回结果给调用页面（可使用接口或 onActivityResult 等方式）
Log.d("Selected Topics", selectedTopics.toString());
List<String> selectedTopicIds = new ArrayList<>();

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

@@ -3347,16 +3347,19 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
mBinding!!.headCone.text = mRoomInfoResp?.room_info?.head_line?.content
mBinding!!.headAvate.setOnClickListener { view ->
RoomUserInfoFragment.show(
roomId,
mRoomInfoResp?.room_info?.head_line?.user_id,
"",
getHostUser(),
false,
2,
isNumberWhether(),
supportFragmentManager
)
// RoomUserInfoFragment.show(
// roomId,
// mRoomInfoResp?.room_info?.head_line?.user_id,
// "",
// getHostUser(),
// false,
// 2,
// isNumberWhether(),
// supportFragmentManager
// )
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE)
.withString("userId", mRoomInfoResp?.room_info?.head_line?.user_id).navigation()
}
mBinding!!.ivQuanQiang.setOnClickListener { v: View? ->
@@ -3556,7 +3559,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
is RoomTaskEvent -> {
if (taskId != null && taskId != "9" && taskId !="8") { //这是每日任务完成发送私聊信息的事件
if (taskId != null && taskId != "9" && taskId != "8") { //这是每日任务完成发送私聊信息的事件
RetrofitClient.getInstance()
.dailyTasksComplete(taskId, object : BaseObserver<RoomSingleton?>() {
override fun onSubscribe(d: Disposable) {

1
MainModule/src/main/java/com/xscm/modulemain/activity/room/adapter/RequestedSongsAdapter.java
View File

@@ -59,6 +59,7 @@ public class RequestedSongsAdapter extends BaseQuickAdapter<SongPlaylist.SongPla
// 根据位置显示不同的UI
if (helper.getLayoutPosition() == 0) {
// 第一个是正在播放
helper.getView(R.id.tv_request_status).setVisibility(View.VISIBLE);
helper.setText(R.id.tv_request_status, "正在播放");
helper.setTextColor(R.id.tv_request_status, 0xFF3ABC6D);
helper.setBackgroundRes(R.id.tv_request_status, android.graphics.Color.TRANSPARENT);

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestedSongsFragment.java
View File

@@ -189,7 +189,7 @@ public class RequestedSongsFragment extends BaseMvpFragment<RequestSongPresenter
// 只有当有新数据时才更新
if (!newSongs.isEmpty()) {
songList.addAll(newSongs);
adapter.addData(songList);
adapter.addData(newSongs);
mBinding.smartRefreshLayout.finishLoadMore(true);
} else {
// 没有新数据，但不算加载失败

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

@@ -133,7 +133,7 @@ class RelationshipActivity : BaseMvpActivity<UserHomepagePresenter?, ActivityRel
override fun setFriendListMore(data: List<RelationshipBean?>?) {
if (data != null && data.isNotEmpty()) {
mBinding.tvHeartbeat.text = data[0]?.relation_name
adapter?.setuserId(userId.toString())
adapter?.setNewData(data)
}
}

1
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ui/main/BosomFriendFragment.kt
View File

@@ -320,6 +320,7 @@ class BosomFriendFragment : BaseMvpFragment<UserHomepagePresenter?, FragmentBoso
// 更新适配器
adapter = mBinding.rvMyRelationship.adapter as BosomFriendAdapter
adapter?.userId = userId
if (isLoadMore) {
// 加载更多时追加数据
adapter?.addData(dataList)

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

@@ -150,6 +150,8 @@ public class CirleListFragment extends BaseMvpFragment<UserHomepagePresenter, Fr
@Override
public void setCircleList(List<CircleListBean> list) {
mBinding.smartRefreshLayout.finishRefresh();
mBinding.smartRefreshLayout.finishLoadMore();
cirleListAdapter.setNewData(list);
}

2
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFamilyFragment.kt
View File

@@ -66,7 +66,7 @@ class MyFamilyFragment(var data: MyFamilyBean) : BaseFragment<FragmentMyFamilyBi
intent.putExtra(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_GROUP)
startActivity(intent)
} else {
ToastUtils.showLong("没有家族请去签约别人的提示")
ToastUtils.showLong("当前未签约徒弟")
}
}

3
MainModule/src/main/java/com/xscm/modulemain/adapter/BosomFriendAdapter.kt
View File

@@ -19,7 +19,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
// 点击事件监听器
var onItemClickListener: OnItemClickListener? = null
var userId: String=""
interface OnItemClickListener {
fun onUserClick(userId: String)
fun onDeleteClick(relation: RelationshipBean)
@@ -28,6 +28,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
fun onDetailsClick(relationId: Int)
}
companion object {
// 类型常量
const val TYPE_NOCP_WITH_NAME = 3 // no_cp集合，relation_name不等于""，并且relation_list的大小是1

2
MainModule/src/main/res/layout/fragment_joined_family.xml
View File

@@ -165,7 +165,7 @@
android:paddingHorizontal="@dimen/dp_38"
android:paddingTop="@dimen/dp_12"
android:paddingBottom="@dimen/dp_7"
android:text="家族成员"
android:text="我加入的家族成员"
android:textColor="#ffffff"
android:textSize="@dimen/sp_14"
android:textStyle="bold" />