From 8a587210cf7b31a8f929023b62916d1e278a79d5 Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Mon, 26 Jan 2026 11:20:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=88=BF=E5=AE=8C=E5=96=841?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xscm/moduleutil/bean/RoomSearchResp.java | 2 ++ .../xscm/moduleutil/bean/room/RoomBean.java | 2 ++ .../com/xscm/moduleutil/http/ApiServer.java | 2 +- .../xscm/moduleutil/http/RetrofitClient.java | 4 +-- .../room/contacts/RoomBackgroundContacts.java | 2 +- .../RoomBackgroundDialogFragment.java | 8 +++--- .../presenter/RoomBackgroundPresenter.java | 4 +-- .../user/activity/CreatedRoomActivity.java | 26 ++++++++++++++++--- .../user/conacts/CreatedRoomConactos.java | 2 +- .../user/presenter/CreatedRoomPresenter.java | 4 +-- .../adapter/CarouselBannerAdapter.java | 7 +++++ .../adapter/ChatRoomMyFollowAdapter.java | 8 ++++++ .../adapter/ChatRoomMyFootAdapter.java | 8 ++++++ .../adapter/ChatRoomMyManageAdapter.java | 10 +++++++ .../xscm/modulemain/adapter/HotAdapter.java | 8 ++++++ .../modulemain/adapter/MyCreateAdapter.java | 9 +++++-- .../adapter/SearchRoomResultAdapter.java | 8 ++++++ .../dialog/RoomSettingFragment.java | 2 +- .../main/res/layout/index_item_carousel.xml | 11 ++++++++ .../layout/index_item_search_room_result.xml | 11 ++++++++ 20 files changed, 119 insertions(+), 19 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomSearchResp.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomSearchResp.java index 33b2b6a9..b125d727 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomSearchResp.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomSearchResp.java @@ -26,6 +26,8 @@ public class RoomSearchResp { private int label_id; private String today_hot_value; + private String room_password; + diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomBean.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomBean.java index 26e45946..725a8612 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomBean.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomBean.java @@ -132,6 +132,8 @@ public class RoomBean implements Serializable { private String start_time="";//营业时间的开始时间 private String end_time="";//营业时间的结束时间 + private String room_password = "";//房间密码 + public int getSceneId() { if (sound_effect != null) { return sound_effect.getId(); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java index aaa14eba..8b08a6c0 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java @@ -848,7 +848,7 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.POST_EDIT_ROOM) - Call> editRoom(@Field("room_id") String room_id, @Field("room_name") String room_name, @Field("room_cover") String room_cover, @Field("room_intro") String room_intro, @Field("room_background") String room_background); + Call> editRoom(@Field("room_id") String room_id, @Field("room_name") String room_name, @Field("room_cover") String room_cover, @Field("room_intro") String room_intro, @Field("room_background") String room_background,@Field("room_password")String room_password); @FormUrlEncoded @POST(Constants.POST_KICK_OUT_ROOM) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index 13c1429f..fe00d57c 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -4118,8 +4118,8 @@ public class RetrofitClient { } - public void editRoom(String room_id, String room_name, String room_cover, String room_intro, String room_background, BaseObserver observer) { - sApiServer.editRoom(room_id, room_name, room_cover, room_intro, room_background).enqueue(new Callback>() { + public void editRoom(String room_id, String room_name, String room_cover, String room_intro, String room_background,String roomPwd, BaseObserver observer) { + sApiServer.editRoom(room_id, room_name, room_cover, room_intro, room_background,roomPwd).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { onNextRetu(response, observer); diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomBackgroundContacts.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomBackgroundContacts.java index ab2c477e..aa643d77 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomBackgroundContacts.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomBackgroundContacts.java @@ -23,6 +23,6 @@ public class RoomBackgroundContacts { void uploadBgImage(String id, String image_url); - void editRoom(String room_id, String room_name, String room_cover, String room_intro,String room_background_id); + void editRoom(String room_id, String room_name, String room_cover, String room_intro,String room_background_id,String roomPwd); } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomBackgroundDialogFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomBackgroundDialogFragment.java index 0087b1ef..1b442cfb 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomBackgroundDialogFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomBackgroundDialogFragment.java @@ -47,17 +47,18 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment publicBgList = new ArrayList<>(); private List myBgList = new ArrayList<>(); - public static RoomBackgroundDialogFragment newInstance(String roomId) { + public static RoomBackgroundDialogFragment newInstance(String roomId,String roomPwd) { RoomBackgroundDialogFragment fragment = new RoomBackgroundDialogFragment(); Bundle bundle = new Bundle(); bundle.putString("roomId", roomId); + bundle.putString("roomPwd", roomPwd); fragment.setArguments(bundle); return fragment; } @@ -92,7 +93,7 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment { // 点击“确认”按钮时执行删除操作 - MvpPre.editRoom(roomId, "", "", "", item.getImage_url()); + MvpPre.editRoom(roomId, "", "", "", item.getImage_url(),roomPwd); }, v -> { @@ -179,6 +180,7 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment() { + public void editRoom(String room_id, String room_name, String room_cover, String room_intro, String room_background,String roomPwd) { + RetrofitClient.getInstance().editRoom(room_id, room_name, room_cover, room_intro, room_background,roomPwd, new BaseObserver() { @Override public void onSubscribe(Disposable d) { addDisposable(d); diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/CreatedRoomActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/CreatedRoomActivity.java index a1a93396..074fdbd6 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/CreatedRoomActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/CreatedRoomActivity.java @@ -149,6 +149,15 @@ public class CreatedRoomActivity extends BaseMvpActivity() { + public void editRoom(String room_id, String room_name, String room_cover, String room_intro, String room_background_id,String roomPwd) { + api.editRoom(room_id, room_name, room_cover, room_intro, room_background_id,roomPwd, new BaseObserver() { @Override public void onSubscribe(Disposable d) { diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/CarouselBannerAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/CarouselBannerAdapter.java index 1ea23728..845b77c3 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/CarouselBannerAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/CarouselBannerAdapter.java @@ -1,5 +1,6 @@ package com.xscm.modulemain.adapter; +import android.text.TextUtils; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -27,6 +28,12 @@ public class CarouselBannerAdapter extends BaseBannerAdapter { textView2.setText(data.getRoom_name()); ImageView iv = holder.itemView.findViewById(R.id.iv_play); ImageUtils.loadRes(com.xscm.moduleutil.R.drawable.voice_play, iv); + if (TextUtils.isEmpty(data.getRoom_password())){ + holder.itemView.findViewById(R.id.iv_lock).setVisibility(View.GONE); + }else { + holder.itemView.findViewById(R.id.iv_lock).setVisibility(View.VISIBLE); + } + // List user_list = data.getUser_list(); // if (user_list!= null && user_list.size() > 0) { // RecyclerView recyclerView = holder.itemView.findViewById(R.id.rv_tags); diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyFollowAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyFollowAdapter.java index b61845dc..f10feabf 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyFollowAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyFollowAdapter.java @@ -1,5 +1,8 @@ package com.xscm.modulemain.adapter; +import android.text.TextUtils; +import android.view.View; + import androidx.annotation.Nullable; import com.chad.library.adapter.base.BaseQuickAdapter; @@ -25,6 +28,11 @@ public class ChatRoomMyFollowAdapter extends BaseQuickAdapter + + \ No newline at end of file diff --git a/MainModule/src/main/res/layout/index_item_search_room_result.xml b/MainModule/src/main/res/layout/index_item_search_room_result.xml index 8aee7921..382104d2 100644 --- a/MainModule/src/main/res/layout/index_item_search_room_result.xml +++ b/MainModule/src/main/res/layout/index_item_search_room_result.xml @@ -108,4 +108,15 @@ android:textSize="@dimen/sp_12" /> + + \ No newline at end of file