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

1:修改时间选择框，根据需要，展示时分秒和不显示时分秒

Browse Source 
2:修改展示设备id，在头部信息中，使用第三方的获取设备唯一id
3：优化群聊成员列表展示
4：修改房间封面，上传图片的时候，需要裁剪
5：添加营业时间展示
6:pk修改开始的时候，选择时间去掉1分钟
7：修改声网，添加声卡开关
This commit is contained in:
梁小江
2026-01-20 19:20:06 +08:00
parent bf609a3964
commit 163340a691
41 changed files with 919 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package com.xscm.modulemain.dialog;
import static com.xscm.moduleutil.bean.room.RoomSettingBean.QXRoomSettingTypeRoomBusinessTime;
import static com.xscm.moduleutil.bean.room.RoomSettingBean.QXRoomSettingTypeRoomOrderMic;
import static com.xscm.moduleutil.bean.room.RoomSettingBean.QXRoomSettingTypeRoomTimeRedSound;
import static com.xscm.moduleutil.bean.room.RoomSettingBean.QXRoomSettingTypeRoomTimeSpace;
@@ -44,14 +45,18 @@ import com.xscm.moduleutil.bean.room.RoomInfoResp;
import com.xscm.moduleutil.bean.room.RoomSettingBean;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.widget.DoubleTimePickerBottomSheet;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
/**
@@ -174,6 +179,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
toolsChildren.add(new RoomSettingBean("排麦模式", "ic_order_mic", null, null, QXRoomSettingTypeRoomOrderMic, read, isSelected, false, roomInfoResp.getRoom_info().getRoom_up_pit_type().equals("1")));
toolsChildren.add(new RoomSettingBean("背景音乐", "ic_bg_music", null, null, RoomSettingBean.QXRoomSettingTypeRoomBgMusic, read, isSelected, false, false));
toolsChildren.add(new RoomSettingBean("背景图片", "ic_bg_image", null, null, RoomSettingBean.QXRoomSettingTypeRoomBgImage, read, isSelected, false, false));
toolsChildren.add(new RoomSettingBean("营业时间", "ic_bg_image", null, null, QXRoomSettingTypeRoomBusinessTime, read, isSelected, false, false));
toolsParent.setChildren(toolsChildren);
parentList.add(toolsParent);
@@ -397,10 +403,9 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
// }
else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNCONTRACT) {
queren("10");
}else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypePUBROOM) {
} else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypePUBROOM) {
queren("11");
}
else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomSetting) {
} else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomSetting) {
if (roomInfoResp != null) {
ARouter.getInstance().build(ARouteConstants.CREATED_ROOM).withSerializable("roomInfoResp", roomInfoResp).navigation();
} else {
@@ -486,6 +491,36 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
bean.setSelect(true);
}
itemAdapter.notifyItemChanged(itemPos);
} else if (bean.getType() == QXRoomSettingTypeRoomBusinessTime) {//营业时间
DoubleTimePickerBottomSheet dialog = new DoubleTimePickerBottomSheet();
dialog.setOnTimeRangeSelectedListener((startDate, endDate) -> {
// 处理选择的时间范围
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss", Locale.getDefault());
// 获取开始时间的Calendar实例
Calendar startCalendar = Calendar.getInstance();
startCalendar.setTime(startDate);
// 将秒设置为00
startCalendar.set(Calendar.SECOND, 0);
// 获取结束时间的Calendar实例
Calendar endCalendar = Calendar.getInstance();
endCalendar.setTime(endDate);
// 将秒设置为59
endCalendar.set(Calendar.SECOND, 59);
// 格式化时间
String startTime = sdf.format(startCalendar.getTime());
String endTime = sdf.format(endCalendar.getTime());
Log.d("SelectedTime", "开始时间：" + startTime);
Log.d("SelectedTime", "结束时间：" + endTime);
MvpPre.setRoomBusinessTime(roomId, startTime, endTime);
// MvpPre.getCharmList(roomId, stime, etime, currentPage + "", type);
});
dialog.setShowDate(false);
dialog.setShowTime(true);
dialog.setShowSeconds(false);
dialog.show(getChildFragmentManager(), "DoubleTimePicker");
}
}
@@ -725,7 +760,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
type == RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy || type == RoomSettingBean.QXRoomSettingTypeRoomSetting ||
type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy || type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ||
type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG || type == RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNCONTRACT ||
type == RoomSettingBean.QXRoomSettingTypeRoomTypePUBROOM ||
type == RoomSettingBean.QXRoomSettingTypeRoomTypePUBROOM || type == QXRoomSettingTypeRoomBusinessTime ||
type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen
|| type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) {