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

密码房完善1。

Browse Source
This commit is contained in:
骆召亮
2026-01-26 11:20:05 +08:00
parent 8d7de418bb
commit 8a587210cf
20 changed files with 119 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomSearchResp.java
View File

@@ -26,6 +26,8 @@ public class RoomSearchResp {
private int label_id;
private String today_hot_value;
private String room_password;

2
BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomBean.java
View File

@@ -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();

2
BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
View File

@@ -848,7 +848,7 @@ public interface ApiServer {
@FormUrlEncoded
@POST(Constants.POST_EDIT_ROOM)
Call<BaseModel<String>> 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<BaseModel<String>> 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)

4
BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
View File

@@ -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<String> observer) {
sApiServer.editRoom(room_id, room_name, room_cover, room_intro, room_background).enqueue(new Callback<BaseModel<String>>() {
public void editRoom(String room_id, String room_name, String room_cover, String room_intro, String room_background,String roomPwd, BaseObserver<String> observer) {
sApiServer.editRoom(room_id, room_name, room_cover, room_intro, room_background,roomPwd).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
onNextRetu(response, observer);

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomBackgroundContacts.java
View File

@@ -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);
}
}

8
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomBackgroundDialogFragment.java
View File

@@ -47,17 +47,18 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment<RoomBack
private MyAdapter mAdapter;
private String roomId;
private String roomId,roomPwd;
private String picture;
private boolean pictureChanged;
private List<RoomBgBean.RoomBg> publicBgList = new ArrayList<>();
private List<RoomBgBean.RoomBg> 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<RoomBack
"取消",
v -> {
// 点击“确认”按钮时执行删除操作
MvpPre.editRoom(roomId, "", "", "", item.getImage_url());
MvpPre.editRoom(roomId, "", "", "", item.getImage_url(),roomPwd);
},
v -> {
@@ -179,6 +180,7 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment<RoomBack
public void initArgs(Bundle arguments) {
super.initArgs(arguments);
roomId = arguments.getString("roomId");
roomPwd = arguments.getString("roomPwd");
picture = arguments.getString("picture");
}

4
MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomBackgroundPresenter.java
View File

@@ -90,8 +90,8 @@ public class RoomBackgroundPresenter extends BasePresenter<RoomBackgroundContact
}
@Override
public void editRoom(String room_id, String room_name, String room_cover, String room_intro, String room_background) {
RetrofitClient.getInstance().editRoom(room_id, room_name, room_cover, room_intro, room_background, new BaseObserver<String>() {
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<String>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);

26
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/CreatedRoomActivity.java
View File

@@ -149,6 +149,15 @@ public class CreatedRoomActivity extends BaseMvpActivity<CreatedRoomPresenter, A
roomUrl = roomInfoResp.getRoom_info().getRoom_cover();
mBinding.llSj.setVisibility(View.VISIBLE);
mBinding.tvSj.setText(roomInfoResp.getRoom_info().getStart_time() + "-" + roomInfoResp.getRoom_info().getEnd_time());
if (TextUtils.isEmpty(roomInfoResp.getRoom_info().getRoom_password())){
mBinding.switchShowPwd.setChecked(false);
mBinding.etRoomPwd.setText("");
}else {
mBinding.switchShowPwd.setChecked(true);
mBinding.etRoomPwd.setText(roomInfoResp.getRoom_info().getRoom_password());
}
} else {
if (handler != null) {
if (showPopupRunnable != null) {
@@ -162,7 +171,11 @@ public class CreatedRoomActivity extends BaseMvpActivity<CreatedRoomPresenter, A
@Override
protected void initView() {
super.initView();
mBinding.topBar.setTitle("创建房间");
if (roomInfoResp != null) {
mBinding.topBar.setTitle("修改房间信息");
}else {
mBinding.topBar.setTitle("创建房间");
}
mBinding.tvSave.setOnClickListener(this::onClick);
mBinding.ivTrendContent.setOnClickListener(this::onClick);
mBinding.tvSz.setText("0/" + maxNum);
@@ -263,13 +276,18 @@ public class CreatedRoomActivity extends BaseMvpActivity<CreatedRoomPresenter, A
}
String roomPwd = mBinding.etRoomPwd.getText().toString().trim();
if (mBinding.etRoomPwd.getVisibility() == View.VISIBLE) {
if (TextUtils.isEmpty(roomPwd))
if (TextUtils.isEmpty(roomPwd)) {
ToastUtils.show("请输入密码");
return;
return;
}
if (roomPwd.length() < 4) {
ToastUtils.show("密码长度不能小于4位");
return;
}
}
if (roomInfoResp != null) {
MvpPre.editRoom(roomInfoResp.getRoom_info().getRoom_id(), roomName, roomUrl, mBinding.etG.getText().toString(), "");
MvpPre.editRoom(roomInfoResp.getRoom_info().getRoom_id(), roomName, roomUrl, mBinding.etG.getText().toString(), "", roomPwd);
} else {
MvpPre.checkTxt(roomName, roomUrl, mBinding.etG.getText().toString());
}

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

@@ -35,6 +35,6 @@ public final class CreatedRoomConactos {
void roomName();
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);
}
}

4
MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/CreatedRoomPresenter.java
View File

@@ -137,8 +137,8 @@ public class CreatedRoomPresenter extends BasePresenter<CreatedRoomConactos.View
}
@Override
public void editRoom(String room_id, String room_name, String room_cover, String room_intro, String room_background_id) {
api.editRoom(room_id, room_name, room_cover, room_intro, room_background_id, new BaseObserver<String>() {
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<String>() {
@Override
public void onSubscribe(Disposable d) {

7
MainModule/src/main/java/com/xscm/modulemain/adapter/CarouselBannerAdapter.java
View File

@@ -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<TopRoom> {
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<TopRoom.UserList> user_list = data.getUser_list();
// if (user_list!= null && user_list.size() > 0) {
// RecyclerView recyclerView = holder.itemView.findViewById(R.id.rv_tags);

8
MainModule/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyFollowAdapter.java
View File

@@ -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<MyRoomBean, BaseVi
helper.setText(R.id.tv_name, item.getRoom_name());
helper.setText(R.id.tv_id, "ID: " + item.getRoom_id());
ImageUtils.loadRes(com.xscm.moduleutil.R.drawable.voice_play, helper.getView(R.id.iv_play));
if (TextUtils.isEmpty(item.getRoom_password())){
helper.getView(R.id.iv_lock).setVisibility(View.GONE);
}else {
helper.getView(R.id.iv_lock).setVisibility(View.VISIBLE);
}
}
public void setIndex(int index) {

8
MainModule/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyFootAdapter.java
View File

@@ -1,5 +1,7 @@
package com.xscm.modulemain.adapter;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -45,5 +47,11 @@ public class ChatRoomMyFootAdapter extends BaseQuickAdapter<MyFootResp, BaseView
ImageUtils.loadRes(com.xscm.moduleutil.R.drawable.voice_play, iv);
// helper.setVisible(R.id.rl_lock, item.getLocked() == 1);
// helper.setGone(R.id.tv_clean, false);
if (TextUtils.isEmpty(item.getRoom_password())){
helper.getView(R.id.iv_lock).setVisibility(View.GONE);
}else {
helper.getView(R.id.iv_lock).setVisibility(View.VISIBLE);
}
}
}

10
MainModule/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyManageAdapter.java
View File

@@ -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;
@@ -28,6 +31,13 @@ public class ChatRoomMyManageAdapter extends BaseQuickAdapter<MyRoomBean, BaseVi
// helper.setText(R.id.tv_num, item.get());
ImageUtils.loadRes(com.xscm.moduleutil.R.drawable.voice_play, helper.getView(R.id.iv_play));
// }
if (TextUtils.isEmpty(item.getRoom_password())){
helper.getView(R.id.iv_lock).setVisibility(View.GONE);
}else {
helper.getView(R.id.iv_lock).setVisibility(View.VISIBLE);
}
}
public void setIndex(int index) {

8
MainModule/src/main/java/com/xscm/modulemain/adapter/HotAdapter.java
View File

@@ -2,6 +2,7 @@ package com.xscm.modulemain.adapter;
import static android.view.View.GONE;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
@@ -50,6 +51,13 @@ public class HotAdapter extends BaseMultiItemQuickAdapter<TopRoom, BaseViewHolde
helper.setText(R.id.tv_num, formatHotValue(Integer.parseInt(item.getHot_value())));
ImageUtils.loadRoomItem(item.getLabel_icon(), helper.getView(R.id.iv_type));
if (TextUtils.isEmpty(item.getRoom_password())){
helper.getView(R.id.iv_lock).setVisibility(GONE);
}else {
helper.getView(R.id.iv_lock).setVisibility(View.VISIBLE);
}
helper.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

9
MainModule/src/main/java/com/xscm/modulemain/adapter/MyCreateAdapter.java
View File

@@ -461,7 +461,7 @@ public class MyCreateAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
static class GiftViewHolder extends RecyclerView.ViewHolder {
RoundedImageView iv_follow_bg;
ImageView iv_type, iv_play;
ImageView iv_type, iv_play,iv_lock;
TextView tv_name, tv_num;
ConstraintLayout rl_root;
@@ -475,6 +475,7 @@ public class MyCreateAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
iv_play = itemView.findViewById(R.id.iv_play);
tv_num = itemView.findViewById(R.id.tv_num);
rl_root = itemView.findViewById(R.id.rl_root);
iv_lock = itemView.findViewById(R.id.iv_lock);
}
void bind(MyFootResp item) {
@@ -483,7 +484,11 @@ public class MyCreateAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
tv_name.setText(item.getRoom_name());
tv_num.setText(item.getHot_value());
if (TextUtils.isEmpty(item.getRoom_password())){
iv_lock.setVisibility(View.GONE);
}else {
iv_lock.setVisibility(View.VISIBLE);
}
rl_root.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

8
MainModule/src/main/java/com/xscm/modulemain/adapter/SearchRoomResultAdapter.java
View File

@@ -2,6 +2,8 @@ package com.xscm.modulemain.adapter;
import static android.view.View.GONE;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -34,6 +36,12 @@ public class SearchRoomResultAdapter extends BaseQuickAdapter<RoomSearchResp, Ba
helper.setText(R.id.tv_num, formatHotValue(Integer.parseInt(item.getHot_value()!=null ? item.getHot_value() : "0")));
ImageUtils.loadHeadCC(item.getLabel_icon(), helper.getView(R.id.iv_type));
if (TextUtils.isEmpty(item.getRoom_password())){
helper.getView(R.id.iv_lock).setVisibility(GONE);
}else {
helper.getView(R.id.iv_lock).setVisibility(View.VISIBLE);
}
// helper.setOnClickListener(R.id.iv_play,new View.OnClickListener() {
// @Override
// public void onClick(View v) {

2
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
View File

@@ -353,7 +353,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomCompere) {//主持设置
RoomHostFragment.newInstance(roomId).show(getChildFragmentManager(), "RoomHostFragment");
} else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomBgImage) {//背景图片
RoomBackgroundDialogFragment.newInstance(roomId).show(getChildFragmentManager(), "RoomBackgroundDialogFragment");
RoomBackgroundDialogFragment.newInstance(roomId,roomInfoResp.getRoom_info().getRoom_password()).show(getChildFragmentManager(), "RoomBackgroundDialogFragment");
} else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomCloseEffects) {//关闭特效
if (effectOn) {
//关闭

11
MainModule/src/main/res/layout/index_item_carousel.xml
View File

@@ -80,4 +80,15 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll"
tools:text="标题" />
<ImageView
android:id="@+id/iv_lock"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_mima"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

11
MainModule/src/main/res/layout/index_item_search_room_result.xml
View File

@@ -108,4 +108,15 @@
android:textSize="@dimen/sp_12" />
</LinearLayout>
<ImageView
android:id="@+id/iv_lock"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_mima"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>