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 f6fefeec..e1364655 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -4660,9 +4660,10 @@ public class RetrofitClient { public void onResponse(Call> call, Response> response) { if (response.code() == 200) { BaseModel baseModel = response.body(); - if (baseModel.getCode() == 1) + if (baseModel.getCode() == 1) { ToastUtils.showLong(baseModel.getMsg()); - else if (baseModel.getCode() == 301) { + observer.onNext(""); + } else if (baseModel.getCode() == 301) { setCode301(baseModel.getMsg()); }else if (baseModel.getCode() == 0) { ToastUtils.showLong(baseModel.getMsg()); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/DoubleTimePickerBottomSheet.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/DoubleTimePickerBottomSheet.java index 3fb78432..8a2cf234 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/DoubleTimePickerBottomSheet.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/DoubleTimePickerBottomSheet.java @@ -20,6 +20,11 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; +/** + * @Author qx + * @Time 2026/1/21 8:59 + * @Description 时间选择器 + */ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment { private OnTimeRangeSelectedListener listener; @@ -52,6 +57,9 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment { private Calendar endCalendar; private View view; + private String start_time; + private String end_time; + public interface OnTimeRangeSelectedListener { void onTimeRangeSelected(Date startDate, Date endDate); } @@ -60,8 +68,22 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment { this.listener = listener; } + /** + * 开始时间 + * + * @param startTime + */ + public void setTvStartTime(String startTime) { + this.start_time = startTime; + } + + public void setTvEndTime(String endTime) { + this.end_time = endTime; + } + /** * 设置是否显示时分秒 + * * @param showTime true显示年月日时分秒，false只显示年月日 */ public void setShowTime(boolean showTime) { @@ -70,6 +92,7 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment { /** * 设置是否显示日期 + * * @param showDate true显示日期，false只显示时间 */ public void setShowDate(boolean showDate) { @@ -78,6 +101,7 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment { /** * 设置是否显示秒 + * * @param showSeconds true显示秒，false不显示秒 */ public void setShowSeconds(boolean showSeconds) { @@ -86,6 +110,7 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment { /** * 创建实例 + * * @param showTime true显示年月日时分秒，false只显示年月日 * @return DoubleTimePickerBottomSheet实例 */ @@ -97,6 +122,7 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment { /** * 创建实例 + * * @param showTime true显示年月日时分秒，false只显示年月日 * @param showDate true显示日期，false只显示时间 * @return DoubleTimePickerBottomSheet实例 @@ -108,6 +134,21 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment { return fragment; } + /** + * 创建实例 + * + * @param start_time 开始时间 + * @param end_time 结束时间 + * @return + */ + + public static DoubleTimePickerBottomSheet newInstance(String start_time, String end_time) { + DoubleTimePickerBottomSheet fragment = new DoubleTimePickerBottomSheet(); + fragment.setTvStartTime(start_time); + fragment.setTvEndTime(end_time); + return fragment; + } + @NonNull @Override public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { @@ -207,6 +248,8 @@ public class DoubleTimePickerBottomSheet extends BottomSheetDialogFragment { // 初始化显示文本 updateDisplayText(); + tvStartTime.setText(start_time); + tvEndTime.setText(end_time); } /** diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java index 3a3caafc..c8fb644d 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomDefaultWheatView.java @@ -135,16 +135,23 @@ public class RoomDefaultWheatView extends BaseWheatView { if (bean.is_pk()) { String userId = bean.getUser_id(); if (userId != null && !userId.equals("0") && !userId.isEmpty()) { - tv_time_pk.setVisibility(VISIBLE); + if (bean.getCharm().equals("0")){ + tv_time_pk.setVisibility(GONE); + }else { + tv_time_pk.setVisibility(VISIBLE); + } setSex(bean.getCharm(), false); - mCharmView.setVisibility(GONE); } else { tv_time_pk.setVisibility(GONE); } } else { tv_time_pk.setVisibility(GONE); if (isOn()) { - mCharmView.setVisibility(VISIBLE); + if (TextUtils.isEmpty(bean.getCharm())){ + mCharmView.setVisibility(GONE); + }else { + mCharmView.setVisibility(VISIBLE); + } }else { mCharmView.setVisibility(GONE); } @@ -167,8 +174,19 @@ public class RoomDefaultWheatView extends BaseWheatView { } } - public void setTv_time_pk(boolean show){ - tv_time_pk.setVisibility(show?VISIBLE:GONE); + public void setTv_time_pk(boolean show){ + String userId = pitBean.getUser_id(); + if (userId != null && !userId.equals("0") && !userId.isEmpty() && show) { + if (pitBean.getCharm().equals("0")){ + tv_time_pk.setVisibility(GONE); + }else { + tv_time_pk.setVisibility(VISIBLE); + } + setSex(pitBean.getCharm(), false); + } else { + tv_time_pk.setVisibility(GONE); + } +// tv_time_pk.setVisibility(show?VISIBLE:GONE); } private boolean showSexIcon = false; diff --git a/BaseModule/src/main/res/layout/tab_custom_view.xml b/BaseModule/src/main/res/layout/tab_custom_view.xml new file mode 100644 index 00000000..2f91da20 --- /dev/null +++ b/BaseModule/src/main/res/layout/tab_custom_view.xml @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index 3d0e5382..21eb6c0a 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -3053,6 +3053,10 @@ class RoomActivity : BaseMvpActivity(), dialog.show() } + fun setRoomTime(roomInfoResp: RoomInfoResp){ + this.mRoomInfoResp=roomInfoResp + } + /** * 设置是否打开麦克风 diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java index 3fa5a6d8..de994497 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java @@ -18,6 +18,8 @@ public class RoomSettingContacts { void agreeSong(String s); void blindBoxStatus(List blindBoxStatus); + + void setRoomBusinessTime(); } public interface IRoomPre extends IPresenter { diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java index abf2e559..b178c56d 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java @@ -629,6 +629,10 @@ public class ChatRoomFragment extends BaseMvpFragment(mView); + } + MvpRef.get().setRoomBusinessTime(); } }); } diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java index ffee3bba..bb5cea72 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java @@ -17,6 +17,7 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import com.alibaba.android.arouter.launcher.ARouter; +import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.GsonUtils; import com.blankj.utilcode.util.LogUtils; import com.chad.library.adapter.base.BaseQuickAdapter; @@ -514,12 +515,17 @@ public class RoomSettingFragment extends BaseMvpDialogFragment