MIDI/midi-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1：添加首页支付等功能，红包功能

Browse Source
This commit is contained in:
梁小江
2025-10-13 15:21:46 +08:00
parent 88930b3b74
commit 9ce10b1a66
22 changed files with 382 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -28,8 +28,8 @@ isBuildModule=false
#org.gradle.deamon=false #org.gradle.deamon=false
android.injected.testOnly=false android.injected.testOnly=false
APP_VERSION_NAME=1.2.9 APP_VERSION_NAME=1.2.8
APP_VERSION_CODE=184 APP_VERSION_CODE=182
org.gradle.jvm.toolchain.useLegacyAdapters=false org.gradle.jvm.toolchain.useLegacyAdapters=false
#org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15

18
moduleUtil/src/main/java/com/xscm/moduleutil/adapter/GiftAdapter.java
View File

@@ -26,15 +26,15 @@ public class GiftAdapter extends BaseQuickAdapter<HeavenGiftBean, BaseViewHolder
protected void convert(BaseViewHolder helper, HeavenGiftBean item) { protected void convert(BaseViewHolder helper, HeavenGiftBean item) {
ImageUtils.loadHeadCC(item.getPicture(), helper.getView(R.id.iv_head)); ImageUtils.loadHeadCC(item.getPicture(), helper.getView(R.id.iv_head));
helper.getView(R.id.im_jb).setVisibility(View.VISIBLE); helper.getView(R.id.im_jb).setVisibility(View.VISIBLE);
if (item.getType() == COIN_TYPE) { // if (item.getType() == COIN_TYPE) {
helper.setText(R.id.tv_gift_time, String.format("%s", item.getGold())); // helper.setText(R.id.tv_gift_time, String.format("%s", item.getGold()));
} else if (item.getType() == GIFT_TYPE) { // } else if (item.getType() == GIFT_TYPE) {
helper.getView(R.id.im_jb).setVisibility(View.GONE); // helper.getView(R.id.im_jb).setVisibility(View.GONE);
helper.setText(R.id.tv_gift_time, String.format("*%s", item.getQuantity())); // helper.setText(R.id.tv_gift_time, String.format("*%s", item.getQuantity()));
} else { // } else {
helper.getView(R.id.im_jb).setVisibility(View.GONE); // helper.getView(R.id.im_jb).setVisibility(View.GONE);
helper.setText(R.id.tv_gift_time, String.format("%s天", item.getDays())); // helper.setText(R.id.tv_gift_time, String.format("%s天", item.getDays()));
} // }
helper.setText(R.id.tv_head_name, item.getTitle()); helper.setText(R.id.tv_head_name, item.getTitle());
ViewGroup.LayoutParams layoutParams = helper.itemView.getLayoutParams(); ViewGroup.LayoutParams layoutParams = helper.itemView.getLayoutParams();
layoutParams.width = ((ScreenUtils.getScreenWidth() - ConvertUtils.dp2px(140)) / 4); layoutParams.width = ((ScreenUtils.getScreenWidth() - ConvertUtils.dp2px(140)) / 4);

18
moduleUtil/src/main/java/com/xscm/moduleutil/bean/HeavenGiftBean.java
View File

@@ -12,27 +12,13 @@ public class HeavenGiftBean {
private String gold; private String gold;
private String days; private String days;
private int gift_bag_id;
private String name; //活动名称 private String name; //活动名称
private String bag_name;//礼包名称 private String bag_name;//礼包名称
private String effective_time;//倒计时时间 秒 private String effective_time;//倒计时时间 秒
private String rule;//规则地址 private String rule;//规则地址
private Counter counter;//礼包说明
private List<GiftList> gift_list;
private int type;
private String icon;
@Data
public static class Counter{
private String counter; private String counter;
private String money; private String money;
private String diamond; private String diamond;
} private List<RoonGiftModel> gift_list;
@Data
public static class GiftList{
private String name;
private String num;
private String gold;
}
} }

15
moduleUtil/src/main/java/com/xscm/moduleutil/dialog/FirstChargeDialog.java
View File

@@ -14,14 +14,12 @@ import androidx.annotation.NonNull;
import com.blankj.utilcode.util.ScreenUtils; import com.blankj.utilcode.util.ScreenUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xscm.moduleutil.R; import com.xscm.moduleutil.R;
import com.xscm.moduleutil.adapter.GiftAdapter;
import com.xscm.moduleutil.adapter.HeavenGiftAdapter; import com.xscm.moduleutil.adapter.HeavenGiftAdapter;
import com.xscm.moduleutil.bean.BaseListData; import com.xscm.moduleutil.bean.BaseListData;
import com.xscm.moduleutil.bean.FirstChargeGiftBean; import com.xscm.moduleutil.bean.FirstChargeGiftBean;
import com.xscm.moduleutil.bean.RoonGiftModel; import com.xscm.moduleutil.bean.RoonGiftModel;
import com.xscm.moduleutil.color.ThemeableDrawableUtils; import com.xscm.moduleutil.color.ThemeableDrawableUtils;
import com.xscm.moduleutil.databinding.DialogFirstChargeBinding; import com.xscm.moduleutil.databinding.DialogFirstChargeBinding;
import com.xscm.moduleutil.databinding.DialogHeavenGiftBinding;
import com.xscm.moduleutil.http.BaseObserver; import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.http.RetrofitClient; import com.xscm.moduleutil.http.RetrofitClient;
import com.xscm.moduleutil.utils.ColorManager; import com.xscm.moduleutil.utils.ColorManager;
@@ -42,7 +40,6 @@ import io.reactivex.disposables.Disposable;
*/ */
public class FirstChargeDialog extends BaseDialog<DialogFirstChargeBinding> { public class FirstChargeDialog extends BaseDialog<DialogFirstChargeBinding> {
GiftAdapter giftAdapter;
HeavenGiftAdapter heavenGiftAdapter; HeavenGiftAdapter heavenGiftAdapter;
FirstChargeGiftBean firstChargeGiftBean; FirstChargeGiftBean firstChargeGiftBean;
private int type; private int type;
@@ -190,15 +187,15 @@ public class FirstChargeDialog extends BaseDialog<DialogFirstChargeBinding> {
if (firstChargeGiftBean.getGift_bag().size() > 0) { if (firstChargeGiftBean.getGift_bag().size() > 0) {
type=1; type=1;
List<RoonGiftModel> list = new ArrayList<>(); List<RoonGiftModel> list = new ArrayList<>();
mBinding.tvTitle1.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle1()); // mBinding.tvTitle1.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle1());
mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle2()); // mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle2());
mBinding.btn0.setText(firstChargeGiftBean.getGift_bag().get(0).getName()); // mBinding.btn0.setText(firstChargeGiftBean.getGift_bag().get(0).getName());
list.addAll(firstChargeGiftBean.getGift_bag().get(0).getGift_list()); list.addAll(firstChargeGiftBean.getGift_bag().get(0).getGift_list());
// mBinding.tvTitle22.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle2()); mBinding.tvTitle22.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle2());
mBinding.bannerViewPager.create(baseListData(list, 4)); mBinding.bannerViewPager.create(baseListData(list, 4));
mBinding.btn1.setText(firstChargeGiftBean.getGift_bag().get(1).getName()); // mBinding.btn1.setText(firstChargeGiftBean.getGift_bag().get(1).getName());
mBinding.btn2.setText(firstChargeGiftBean.getGift_bag().get(2).getName()); // mBinding.btn2.setText(firstChargeGiftBean.getGift_bag().get(2).getName());
} else if (firstChargeGiftBean.getGift_bag().size() == 2) { } else if (firstChargeGiftBean.getGift_bag().size() == 2) {
// mBinding.rg.check(R.id.btn_0); // mBinding.rg.check(R.id.btn_0);
// mBinding.btn1.setVisibility(View.VISIBLE); // mBinding.btn1.setVisibility(View.VISIBLE);

17
moduleUtil/src/main/java/com/xscm/moduleutil/dialog/HeavenGiftDialog.java
View File

@@ -12,11 +12,10 @@ import androidx.annotation.NonNull;
import com.blankj.utilcode.util.ScreenUtils; import com.blankj.utilcode.util.ScreenUtils;
import com.xscm.moduleutil.R; import com.xscm.moduleutil.R;
import com.xscm.moduleutil.adapter.GiftAdapter;
import com.xscm.moduleutil.adapter.HeavenGiftAdapter; import com.xscm.moduleutil.adapter.HeavenGiftAdapter;
import com.xscm.moduleutil.bean.BaseListData; import com.xscm.moduleutil.bean.BaseListData;
import com.xscm.moduleutil.bean.FirstChargeGiftBean;
import com.xscm.moduleutil.bean.HeavenGiftBean; import com.xscm.moduleutil.bean.HeavenGiftBean;
import com.xscm.moduleutil.bean.RoonGiftModel;
import com.xscm.moduleutil.color.ThemeableDrawableUtils; import com.xscm.moduleutil.color.ThemeableDrawableUtils;
import com.xscm.moduleutil.databinding.DialogHeavenGiftBinding; import com.xscm.moduleutil.databinding.DialogHeavenGiftBinding;
import com.xscm.moduleutil.http.BaseObserver; import com.xscm.moduleutil.http.BaseObserver;
@@ -37,7 +36,6 @@ import java.util.List;
*/ */
public class HeavenGiftDialog extends BaseDialog<DialogHeavenGiftBinding> { public class HeavenGiftDialog extends BaseDialog<DialogHeavenGiftBinding> {
GiftAdapter giftAdapter;
HeavenGiftAdapter heavenGiftAdapter; HeavenGiftAdapter heavenGiftAdapter;
private CountDownTimer countDownTimer; private CountDownTimer countDownTimer;
@@ -90,10 +88,11 @@ public class HeavenGiftDialog extends BaseDialog<DialogHeavenGiftBinding> {
@Override @Override
public void onNext(HeavenGiftBean heavenGiftBean) { public void onNext(HeavenGiftBean heavenGiftBean) {
if (heavenGiftBean != null){ if (heavenGiftBean != null){
mBinding.tvTitle.setText(heavenGiftBean.getCounter().getCounter()); mBinding.tvTitle.setText(heavenGiftBean.getCounter());
// 示例：假设从 HeavenGiftBean 中获取倒计时时间（单位：秒） // 示例：假设从 HeavenGiftBean 中获取倒计时时间（单位：秒）
long countdownTime =Integer.parseInt(heavenGiftBean.getEffective_time()) * 1000L; // 转换为毫秒 // long countdownTime =Integer.parseInt(heavenGiftBean.getEffective_time()) * 1000L; // 转换为毫秒
startCountdown(countdownTime); // startCountdown(countdownTime);
mBinding.tvSj.setText("截止时间:"+heavenGiftBean.getEffective_time());
mBinding.bannerViewPager.create(baseListData(heavenGiftBean.getGift_list(),4)); mBinding.bannerViewPager.create(baseListData(heavenGiftBean.getGift_list(),4));
} }
} }
@@ -150,10 +149,10 @@ public class HeavenGiftDialog extends BaseDialog<DialogHeavenGiftBinding> {
countDownTimer = null; countDownTimer = null;
} }
} }
private List<BaseListData<HeavenGiftBean.GiftList>> baseListData(List<HeavenGiftBean.GiftList> list, int chunkSize){ private List<BaseListData<RoonGiftModel>> baseListData(List<RoonGiftModel> list, int chunkSize) {
List<BaseListData<HeavenGiftBean.GiftList>> baseListData = new ArrayList<>(); List<BaseListData<RoonGiftModel>> baseListData = new ArrayList<>();
for (int i = 0; i < list.size(); i += chunkSize) { for (int i = 0; i < list.size(); i += chunkSize) {
BaseListData<HeavenGiftBean.GiftList> baseListData1 = new BaseListData<>(); BaseListData<RoonGiftModel> baseListData1 = new BaseListData<>();
baseListData1.setData(list.subList(i, Math.min(i + chunkSize, list.size()))); baseListData1.setData(list.subList(i, Math.min(i + chunkSize, list.size())));
baseListData.add(baseListData1); baseListData.add(baseListData1);
} }

23
moduleUtil/src/main/java/com/xscm/moduleutil/dialog/NewPeopleDialog.java
View File

@@ -11,15 +11,12 @@ import androidx.annotation.NonNull;
import com.blankj.utilcode.util.ScreenUtils; import com.blankj.utilcode.util.ScreenUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xscm.moduleutil.R; import com.xscm.moduleutil.R;
import com.xscm.moduleutil.adapter.GiftAdapter;
import com.xscm.moduleutil.adapter.HeavenGiftAdapter; import com.xscm.moduleutil.adapter.HeavenGiftAdapter;
import com.xscm.moduleutil.bean.BaseListData; import com.xscm.moduleutil.bean.BaseListData;
import com.xscm.moduleutil.bean.FirstChargeGiftBean; import com.xscm.moduleutil.bean.FirstChargeGiftBean;
import com.xscm.moduleutil.bean.RoonGiftModel; import com.xscm.moduleutil.bean.RoonGiftModel;
import com.xscm.moduleutil.color.ThemeableDrawableUtils; import com.xscm.moduleutil.color.ThemeableDrawableUtils;
import com.xscm.moduleutil.databinding.DialogFirstChargeBinding;
import com.xscm.moduleutil.databinding.DialogNewPeopleBinding; import com.xscm.moduleutil.databinding.DialogNewPeopleBinding;
import com.xscm.moduleutil.databinding.DialogNewPeopleBindingImpl;
import com.xscm.moduleutil.http.BaseObserver; import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.http.RetrofitClient; import com.xscm.moduleutil.http.RetrofitClient;
import com.xscm.moduleutil.utils.ColorManager; import com.xscm.moduleutil.utils.ColorManager;
@@ -39,7 +36,6 @@ import java.util.List;
*/ */
public class NewPeopleDialog extends BaseDialog<DialogNewPeopleBinding> { public class NewPeopleDialog extends BaseDialog<DialogNewPeopleBinding> {
GiftAdapter giftAdapter;
HeavenGiftAdapter heavenGiftAdapter; HeavenGiftAdapter heavenGiftAdapter;
FirstChargeGiftBean firstChargeGiftBean; FirstChargeGiftBean firstChargeGiftBean;
private int type; private int type;
@@ -60,7 +56,7 @@ public class NewPeopleDialog extends BaseDialog<DialogNewPeopleBinding> {
Window window = getWindow(); Window window = getWindow();
window.setLayout((int) (ScreenUtils.getScreenWidth() * 375.f / 375), WindowManager.LayoutParams.WRAP_CONTENT); window.setLayout((int) (ScreenUtils.getScreenWidth() * 375.f / 375), WindowManager.LayoutParams.WRAP_CONTENT);
mBinding.ivClose.setOnClickListener(v -> dismiss()); mBinding.ivClose.setOnClickListener(v -> dismiss());
mBinding.tvTitle2.setPaintFlags(Paint.STRIKE_THRU_TEXT_FLAG);
heavenGiftAdapter = new HeavenGiftAdapter(); heavenGiftAdapter = new HeavenGiftAdapter();
mBinding.bannerViewPager mBinding.bannerViewPager
.setPageMargin(15) .setPageMargin(15)
@@ -85,6 +81,7 @@ public class NewPeopleDialog extends BaseDialog<DialogNewPeopleBinding> {
if (firstChargeGiftBean.getGift_bag().size() > 1) { if (firstChargeGiftBean.getGift_bag().size() > 1) {
mBinding.tvTitle1.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle1()); mBinding.tvTitle1.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle1());
mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle2()); mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(0).getTitle2());
mBinding.tvTitle2.setPaintFlags(Paint.STRIKE_THRU_TEXT_FLAG);
mBinding.btn0.setText(firstChargeGiftBean.getGift_bag().get(0).getName()); mBinding.btn0.setText(firstChargeGiftBean.getGift_bag().get(0).getName());
list.addAll(firstChargeGiftBean.getGift_bag().get(0).getGift_list()); list.addAll(firstChargeGiftBean.getGift_bag().get(0).getGift_list());
mBinding.bannerViewPager.create(baseListData(list, 4)); mBinding.bannerViewPager.create(baseListData(list, 4));
@@ -95,6 +92,7 @@ public class NewPeopleDialog extends BaseDialog<DialogNewPeopleBinding> {
if (firstChargeGiftBean.getGift_bag().size() > 2) { if (firstChargeGiftBean.getGift_bag().size() > 2) {
mBinding.tvTitle1.setText(firstChargeGiftBean.getGift_bag().get(1).getTitle1()); mBinding.tvTitle1.setText(firstChargeGiftBean.getGift_bag().get(1).getTitle1());
mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(1).getTitle2()); mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(1).getTitle2());
mBinding.tvTitle2.setPaintFlags(Paint.STRIKE_THRU_TEXT_FLAG);
mBinding.btn1.setText(firstChargeGiftBean.getGift_bag().get(1).getName()); mBinding.btn1.setText(firstChargeGiftBean.getGift_bag().get(1).getName());
list.addAll(firstChargeGiftBean.getGift_bag().get(1).getGift_list()); list.addAll(firstChargeGiftBean.getGift_bag().get(1).getGift_list());
mBinding.bannerViewPager.create(baseListData(list, 4)); mBinding.bannerViewPager.create(baseListData(list, 4));
@@ -102,17 +100,28 @@ public class NewPeopleDialog extends BaseDialog<DialogNewPeopleBinding> {
type=2; type=2;
} else if (i == R.id.btn_2) { } else if (i == R.id.btn_2) {
List<RoonGiftModel> list = new ArrayList<>(); List<RoonGiftModel> list = new ArrayList<>();
if (firstChargeGiftBean.getGift_bag().size() == 3) { if (firstChargeGiftBean.getGift_bag().size() > 3) {
if (firstChargeGiftBean.getGift_bag().get(2)!=null) { if (firstChargeGiftBean.getGift_bag().get(2)!=null) {
mBinding.tvTitle1.setText(firstChargeGiftBean.getGift_bag().get(2).getTitle1()); mBinding.tvTitle1.setText(firstChargeGiftBean.getGift_bag().get(2).getTitle1());
mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(2).getTitle2()); mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(2).getTitle2());
mBinding.tvTitle2.setPaintFlags(Paint.STRIKE_THRU_TEXT_FLAG);
mBinding.btn2.setText(firstChargeGiftBean.getGift_bag().get(2).getName()); mBinding.btn2.setText(firstChargeGiftBean.getGift_bag().get(2).getName());
list.addAll(firstChargeGiftBean.getGift_bag().get(2).getGift_list()); list.addAll(firstChargeGiftBean.getGift_bag().get(2).getGift_list());
mBinding.bannerViewPager.create(baseListData(list, 4)); mBinding.bannerViewPager.create(baseListData(list, 4));
type = 3; type = 3;
} }
} }
}else if (i == R.id.btn_3){
List<RoonGiftModel> list = new ArrayList<>();
if (firstChargeGiftBean.getGift_bag().size() >= 4) {
mBinding.tvTitle1.setText(firstChargeGiftBean.getGift_bag().get(3).getTitle1());
mBinding.tvTitle2.setText(firstChargeGiftBean.getGift_bag().get(3).getTitle2());
mBinding.btn3.setText(firstChargeGiftBean.getGift_bag().get(3).getName());
mBinding.tvTitle2.setPaintFlags(0); // 清除所有绘制标志
list.addAll(firstChargeGiftBean.getGift_bag().get(3).getGift_list());
mBinding.bannerViewPager.create(baseListData(list, 4));
type = 4;
}
} }
} }

10
moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/PrizePoolDialog.java
View File

@@ -1,25 +1,15 @@
package com.xscm.moduleutil.dialog.giftLottery; package com.xscm.moduleutil.dialog.giftLottery;
import android.content.Context; import android.content.Context;
import android.os.Bundle;
import android.view.WindowManager;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import com.xscm.moduleutil.R; import com.xscm.moduleutil.R;
import com.xscm.moduleutil.adapter.GiftAdapter;
import com.xscm.moduleutil.adapter.OneImageYuanJiaoAdapter;
import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.base.BaseRoomContacts;
import com.xscm.moduleutil.bean.GiftBean; import com.xscm.moduleutil.bean.GiftBean;
import com.xscm.moduleutil.databinding.DialogPrizePoolBinding; import com.xscm.moduleutil.databinding.DialogPrizePoolBinding;
import com.xscm.moduleutil.widget.MyGridView;
import com.xscm.moduleutil.widget.dialog.BaseDialog; import com.xscm.moduleutil.widget.dialog.BaseDialog;
import com.xscm.moduleutil.widget.pagerecyclerview.PagerGridLayoutManager;
import com.xscm.moduleutil.widget.pagerecyclerview.PagerGridSnapHelper;
import java.io.Serializable;
import java.util.List; import java.util.List;
/** /**

2
moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
View File

@@ -866,7 +866,7 @@ public class AgoraManager {
VD_1280x720, VD_1280x720,
FRAME_RATE_FPS_15, FRAME_RATE_FPS_15,
STANDARD_BITRATE, STANDARD_BITRATE,
ORIENTATION_MODE_ADAPTIVE ORIENTATION_MODE_FIXED_LANDSCAPE
)); ));
rtcEngine.startScreenCapture(screenCaptureParameters); rtcEngine.startScreenCapture(screenCaptureParameters);

7
moduleUtil/src/main/res/drawable/rd_btn_new_p.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 选中状态 -->
<item android:drawable="@mipmap/xr_ykj_xz" android:state_checked="true" />
<!-- 未选中状态 -->
<item android:drawable="@mipmap/xr_ykj" />
</selector>

38
moduleUtil/src/main/res/layout/dialog_first_charge.xml
View File

@@ -25,7 +25,7 @@
<RelativeLayout <RelativeLayout
android:id="@+id/rl_t" android:id="@+id/rl_t"
android:layout_width="@dimen/dp_276" android:layout_width="@dimen/dp_276"
android:layout_height="@dimen/dp_338" android:layout_height="@dimen/dp_350"
android:background="@mipmap/firsh_bj" android:background="@mipmap/firsh_bj"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@@ -38,7 +38,8 @@
android:layout_height="@dimen/dp_20" android:layout_height="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_98" android:layout_marginTop="@dimen/dp_98"
android:gravity="center|right" android:gravity="center|right"
android:orientation="horizontal"> android:orientation="horizontal"
android:visibility="gone">
<TextView <TextView
android:id="@+id/tv_title1" android:id="@+id/tv_title1"
@@ -69,7 +70,8 @@
android:layout_marginStart="@dimen/dp_24" android:layout_marginStart="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_122" android:layout_marginTop="@dimen/dp_122"
android:layout_marginEnd="@dimen/dp_30" android:layout_marginEnd="@dimen/dp_30"
android:orientation="horizontal"> android:orientation="horizontal"
android:visibility="gone">
<RadioButton <RadioButton
android:id="@+id/btn_0" android:id="@+id/btn_0"
@@ -112,12 +114,12 @@
<RelativeLayout <RelativeLayout
android:id="@+id/rl_rc" android:id="@+id/rl_rc"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_112" android:layout_height="@dimen/dp_100"
android:layout_below="@+id/rg" android:layout_marginStart="@dimen/dp_21"
android:layout_marginStart="@dimen/dp_12" android:layout_marginTop="@dimen/dp_144"
android:layout_marginTop="@dimen/dp_12" android:layout_marginEnd="@dimen/dp_21"
android:layout_marginEnd="@dimen/dp_12" android:background="@mipmap/tk_bj"
android:background="@mipmap/tk_bj"> >
<!-- <androidx.recyclerview.widget.RecyclerView--> <!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_head"--> <!-- android:id="@+id/rv_head"-->
@@ -129,17 +131,31 @@
android:id="@+id/banner_view_pager" android:id="@+id/banner_view_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_10" android:paddingTop="@dimen/dp_12"
android:paddingStart="@dimen/dp_12"
android:paddingEnd="@dimen/dp_12"
app:bvp_indicator_visibility="visible" app:bvp_indicator_visibility="visible"
/> />
</RelativeLayout> </RelativeLayout>
<TextView
android:id="@+id/tv_title22"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/rl_rc"
tools:text="充值6元即可获得总价值888金币的道具或装扮"
android:textColor="#333"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_30"
android:gravity="center|left"
android:textSize="@dimen/sp_12"/>
<TextView <TextView
android:id="@+id/tv_invite" android:id="@+id/tv_invite"
android:layout_width="@dimen/dp_178" android:layout_width="@dimen/dp_178"
android:layout_height="@dimen/dp_42" android:layout_height="@dimen/dp_42"
android:layout_below="@+id/rl_rc" android:layout_below="@+id/tv_title22"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginTop="@dimen/dp_12" android:layout_marginTop="@dimen/dp_12"
android:gravity="center" android:gravity="center"

15
moduleUtil/src/main/res/layout/dialog_heaven_gift.xml
View File

@@ -45,13 +45,16 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_9" android:layout_marginStart="@dimen/dp_9"
android:background="@mipmap/heave_b" /> android:background="@mipmap/heave_b"
android:textSize="@dimen/sp_12"
android:textColor="#666"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:background="@mipmap/heave_g" /> android:background="@mipmap/heave_g"
android:visibility="gone"/>
</RelativeLayout> </RelativeLayout>
@@ -70,7 +73,7 @@
<RelativeLayout <RelativeLayout
android:id="@+id/rl_rc" android:id="@+id/rl_rc"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_122" android:layout_height="@dimen/dp_100"
android:layout_marginTop="@dimen/dp_148" android:layout_marginTop="@dimen/dp_148"
android:layout_marginStart="@dimen/dp_12" android:layout_marginStart="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_12"> android:layout_marginEnd="@dimen/dp_12">
@@ -93,20 +96,20 @@
android:layout_marginEnd="@dimen/dp_12" android:layout_marginEnd="@dimen/dp_12"
android:paddingStart="@dimen/dp_12" android:paddingStart="@dimen/dp_12"
android:paddingEnd="@dimen/dp_12" android:paddingEnd="@dimen/dp_12"
android:text="充值6元即可获得总价值888金币的道具或装扮" tools:text="充值6元即可获得总价值888金币的道具或装扮"
android:textColor="@color/color_FF333333" android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_12"/> android:textSize="@dimen/sp_12"/>
<TextView <TextView
android:id="@+id/tv_invite" android:id="@+id/tv_invite"
android:layout_width="wrap_content" android:layout_width="@dimen/dp_178"
android:layout_height="@dimen/dp_42" android:layout_height="@dimen/dp_42"
android:layout_below="@+id/tv_title" android:layout_below="@+id/tv_title"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginTop="@dimen/dp_5" android:layout_marginTop="@dimen/dp_5"
android:background="@mipmap/invite_k" android:background="@mipmap/invite_k"
android:gravity="center" android:gravity="center"
android:text="立即领取" android:text="立即充值"
android:textColor="@color/color_FF333333" android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_14"/> android:textSize="@dimen/sp_14"/>
</RelativeLayout> </RelativeLayout>

8
moduleUtil/src/main/res/layout/dialog_new_people.xml
View File

@@ -69,6 +69,8 @@
android:layout_marginStart="@dimen/dp_24" android:layout_marginStart="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_122" android:layout_marginTop="@dimen/dp_122"
android:layout_marginEnd="@dimen/dp_30" android:layout_marginEnd="@dimen/dp_30"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:orientation="horizontal"> android:orientation="horizontal">
<RadioButton <RadioButton
@@ -112,12 +114,12 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_weight="1" android:layout_weight="1.1"
android:background="@mipmap/xr_ykj" android:background="@drawable/rd_btn_new_p"
android:button="@null" android:button="@null"
android:gravity="center" android:gravity="center"
android:textColor="@color/color_FF333333" android:textColor="@color/color_FF333333"
android:textSize="14sp" /> android:textSize="12sp" />
</RadioGroup> </RadioGroup>

7
moduleUtil/src/main/res/layout/item_comment.xml
View File

@@ -6,6 +6,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_17" android:layout_marginStart="@dimen/dp_17"
android:layout_marginEnd="@dimen/dp_15"
android:orientation="horizontal"> android:orientation="horizontal">
<!-- 用户头像 --> <!-- 用户头像 -->
@@ -22,7 +23,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_16" android:layout_height="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_7" android:layout_marginStart="@dimen/dp_7"
android:text="昵称ssss" tools:text="昵称ssss"
android:textColor="@color/_000000" android:textColor="@color/_000000"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintStart_toEndOf="@+id/iv_avatar" app:layout_constraintStart_toEndOf="@+id/iv_avatar"
@@ -34,7 +35,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_7" android:layout_marginStart="@dimen/dp_7"
android:layout_marginTop="@dimen/dp_7" android:layout_marginTop="@dimen/dp_7"
android:text="我是评论" tools:text="我是评论"
android:textColor="@color/color_FF333333" android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_14" android:textSize="@dimen/sp_14"
app:layout_constraintStart_toEndOf="@+id/iv_avatar" app:layout_constraintStart_toEndOf="@+id/iv_avatar"
@@ -46,7 +47,7 @@
android:layout_height="@dimen/dp_16" android:layout_height="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_7" android:layout_marginStart="@dimen/dp_7"
android:layout_marginTop="@dimen/dp_5" android:layout_marginTop="@dimen/dp_5"
android:text="2天" tools:text="2天"
android:textColor="@color/color_FF999999" android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintStart_toStartOf="@+id/tv_content" app:layout_constraintStart_toStartOf="@+id/tv_content"

4
moduleUtil/src/main/res/layout/item_reply.xml
View File

@@ -17,10 +17,12 @@
<TextView <TextView
android:id="@+id/tv_reply" android:id="@+id/tv_reply"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12" android:layout_marginStart="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_12"
app:layout_constraintStart_toEndOf="@+id/tv_name" app:layout_constraintStart_toEndOf="@+id/tv_name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_name" app:layout_constraintTop_toTopOf="@+id/tv_name"
tools:text="回复" /> tools:text="回复" />

BIN
moduleUtil/src/main/res/mipmap-xxxhdpi/firsh_bj.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 828 KiB

BIN
moduleUtil/src/main/res/mipmap-xxxhdpi/xr_ykj_xz.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

193
modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java
View File

@@ -48,6 +48,7 @@ import com.xscm.moduleutil.bean.*;
import com.xscm.moduleutil.bean.room.RoomOnline; import com.xscm.moduleutil.bean.room.RoomOnline;
import com.xscm.moduleutil.bean.room.RoomOnlineBean; import com.xscm.moduleutil.bean.room.RoomOnlineBean;
import com.xscm.moduleutil.dialog.FirstChargeDialog; import com.xscm.moduleutil.dialog.FirstChargeDialog;
import com.xscm.moduleutil.dialog.HeavenGiftDialog;
import com.xscm.moduleutil.dialog.NewPeopleDialog; import com.xscm.moduleutil.dialog.NewPeopleDialog;
import com.xscm.moduleutil.dialog.RechargeDialogFragment; import com.xscm.moduleutil.dialog.RechargeDialogFragment;
import com.xscm.moduleutil.event.RoomOutEvent; import com.xscm.moduleutil.event.RoomOutEvent;
@@ -318,7 +319,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
mBinding.rlMe.setOnClickListener(this); mBinding.rlMe.setOnClickListener(this);
mBinding.ivGuanbi.setOnClickListener(this); mBinding.ivGuanbi.setOnClickListener(this);
mBinding.riv.setOnClickListener(this); mBinding.riv.setOnClickListener(this);
mBinding.ivShouchl.setOnClickListener( this); // mBinding.ivShouchl.setOnClickListener( this);
requestGpsPermissions(); requestGpsPermissions();
} }
@@ -393,43 +394,43 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", roomId).navigation(); // ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", roomId).navigation();
// } // }
} }
else if (id == R.id.iv_shouchl) {//首充 // else if (id == R.id.iv_shouchl) {//首充
FirstChargeDialog firstChargeDialog = new FirstChargeDialog(this); // FirstChargeDialog firstChargeDialog = new FirstChargeDialog(this);
firstChargeDialog.show(); // firstChargeDialog.show();
firstChargeDialog.setOnDismissListener(new DialogInterface.OnDismissListener() { // firstChargeDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override // @Override
public void onDismiss(DialogInterface dialog) { // public void onDismiss(DialogInterface dialog) {
//首充弹窗关闭后，弹首充 // //首充弹窗关闭后，弹首充
dialog.dismiss(); // dialog.dismiss();
} // }
}); // });
//
firstChargeDialog.setOnFirstChargeListener(new FirstChargeDialog.OnFirstChargeListener() { // firstChargeDialog.setOnFirstChargeListener(new FirstChargeDialog.OnFirstChargeListener() {
@Override // @Override
public void onFirstChargeConfirmed(FirstChargeGiftBean giftBean, int type) { // public void onFirstChargeConfirmed(FirstChargeGiftBean giftBean, int type) {
String s = null; // String s = null;
if (type == 1) { // if (type == 1) {
s = giftBean.getGift_bag().get(0).getMoney(); // s = giftBean.getGift_bag().get(0).getMoney();
//
} else if (type == 2) { // } else if (type == 2) {
s = giftBean.getGift_bag().get(1).getMoney(); // s = giftBean.getGift_bag().get(1).getMoney();
} else if (type == 3) { // } else if (type == 3) {
s = giftBean.getGift_bag().get(2).getMoney(); // s = giftBean.getGift_bag().get(2).getMoney();
} // }
if (s == null) { // if (s == null) {
ToastUtils.showShort("暂无礼物"); // ToastUtils.showShort("暂无礼物");
return; // return;
} // }
//
RechargeDialogFragment.show(null, s, getSupportFragmentManager()); // RechargeDialogFragment.show(null, s, getSupportFragmentManager());
} // }
//
@Override // @Override
public void onFirstChargeCancelled() { // public void onFirstChargeCancelled() {
//
} // }
}); // });
} // }
} }
@Override @Override
@@ -547,16 +548,9 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
} }
MvpPre.getMyInfo(SpUtil.getUserId() + "");//获取首充是否需要展示 // MvpPre.getMyInfo(SpUtil.getUserId() + "");//获取首充是否需要展示
// MvpPre.activitiesPermission(); MvpPre.activitiesPermission();//获取悬浮框权限
// mBinding.ivShouchl.setVisibility(View.VISIBLE);
// 请求GPS相关权限（精确位置+可选的后台权限）
//
} }
@@ -712,13 +706,13 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
@Override @Override
public void myInfoSuccess(FirstChargeBean data) { public void myInfoSuccess(FirstChargeBean data) {
if (data != null) { // if (data != null) {
if (data.getPermission() == 1) { // if (data.getPermission() == 1) {
mBinding.ivShouchl.setVisibility(View.VISIBLE); // mBinding.ivShouchl.setVisibility(View.VISIBLE);
} else { // } else {
mBinding.ivShouchl.setVisibility(View.GONE); // mBinding.ivShouchl.setVisibility(View.GONE);
} // }
} // }
} }
@Override @Override
@@ -828,38 +822,79 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
// list.add(ResourcesCompat.getDrawable(getResources(), com.xscm.moduleutil.R.mipmap.xinrhl, null)); // list.add(ResourcesCompat.getDrawable(getResources(), com.xscm.moduleutil.R.mipmap.xinrhl, null));
} }
// mBinding.banner.setBannerData(list); mBinding.banner.setBannerData(list);
//
// mBinding.banner.loadImage(new XBanner.XBannerAdapter() { mBinding.banner.loadImage(new XBanner.XBannerAdapter() {
//
// @Override @Override
// public void loadBanner(XBanner banner, Object model, View view, int position) { public void loadBanner(XBanner banner, Object model, View view, int position) {
// PermissionPicBean permissionPicBean = (PermissionPicBean) model; PermissionPicBean permissionPicBean = (PermissionPicBean) model;
// ImageView imageView = (ImageView) view; ImageView imageView = (ImageView) view;
// imageView.setImageResource(permissionPicBean.getPicId()); imageView.setImageResource(permissionPicBean.getPicId());
// } }
// }); });
// mBinding.banner.setOnItemClickListener(new XBanner.OnItemClickListener() { mBinding.banner.setOnItemClickListener(new XBanner.OnItemClickListener() {
//
// @Override @Override
// public void onItemClick(XBanner banner, Object model, View view, int position) { public void onItemClick(XBanner banner, Object model, View view, int position) {
// PermissionPicBean bannerModel = (PermissionPicBean) model; PermissionPicBean bannerModel = (PermissionPicBean) model;
// if (bannerModel.getType() == 1){//首充 if (bannerModel.getType() == 1){//首充
// firstCharge(); firstCharge();
// }else if (bannerModel.getType() == 2){//天降 }else if (bannerModel.getType() == 2){//天降
// heavenGiftDialog();
// }else if (bannerModel.getType() == 3){//新人 }else if (bannerModel.getType() == 3){//新人
// newPeople(); newPeople();
// } }
// } }
// }); });
} }
} }
// TODO: 2025/10/12 天降好礼
private void heavenGiftDialog(){
HeavenGiftDialog heavenGiftDialog = new HeavenGiftDialog(this);
heavenGiftDialog.show();
}
// TODO: 2025/10/12 新人好礼
private void newPeople(){ private void newPeople(){
NewPeopleDialog newPeopleDialog = new NewPeopleDialog(this); NewPeopleDialog newPeopleDialog = new NewPeopleDialog(this);
newPeopleDialog.show(); newPeopleDialog.show();
newPeopleDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
//新人弹窗关闭后，弹首充
dialog.dismiss();
}
});
newPeopleDialog.setOnFirstChargeListener(new NewPeopleDialog.OnFirstChargeListener() {
@Override
public void onFirstChargeConfirmed(FirstChargeGiftBean giftBean, int type) {
String s = null;
if (type == 1) {
s = giftBean.getGift_bag().get(0).getMoney();
} else if (type == 2) {
s = giftBean.getGift_bag().get(1).getMoney();
} else if (type == 3) {
s = giftBean.getGift_bag().get(2).getMoney();
}else if (type==4){
s = giftBean.getGift_bag().get(3).getMoney();
}
if (s == null) {
ToastUtils.showShort("暂无礼物");
return;
}
RechargeDialogFragment.show(null, s, getSupportFragmentManager());
}
@Override
public void onFirstChargeCancelled() {
}
});
} }

52
modulemain/src/main/res/layout/activity_main.xml
View File

@@ -220,36 +220,36 @@
android:src="@mipmap/icon_guanbi"/> android:src="@mipmap/icon_guanbi"/>
</com.xscm.moduleutil.widget.DropView> </com.xscm.moduleutil.widget.DropView>
<ImageView <!-- <ImageView-->
android:id="@+id/iv_shouchl" <!-- android:id="@+id/iv_shouchl"-->
android:layout_width="@dimen/dp_57" <!-- android:layout_width="@dimen/dp_57"-->
android:layout_height="@dimen/dp_57" <!-- android:layout_height="@dimen/dp_57"-->
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_100"
android:src="@mipmap/shouchl"/>
<!-- <com.stx.xhb.xbanner.XBanner-->
<!-- android:id="@+id/banner"-->
<!-- android:layout_width="@dimen/dp_75"-->
<!-- android:layout_height="@dimen/dp_85"-->
<!-- android:scaleType="fitCenter"-->
<!-- app:AutoPlayTime="3000"-->
<!-- android:layout_alignParentBottom="true"--> <!-- android:layout_alignParentBottom="true"-->
<!-- android:layout_alignParentEnd="true"--> <!-- android:layout_alignParentEnd="true"-->
<!-- app:pageChangeDuration="3000"-->
<!-- app:pointContainerPosition="BOTTOM"-->
<!-- app:pointNormal="@mipmap/room_ic_banner_point_normal"-->
<!-- app:pointSelect="@mipmap/room_ic_banner_point_select"-->
<!-- app:pointTopBottomPadding="@dimen/dp_2"-->
<!-- android:layout_marginEnd="@dimen/dp_20"--> <!-- android:layout_marginEnd="@dimen/dp_20"-->
<!-- android:layout_marginBottom="@dimen/dp_100"--> <!-- android:layout_marginBottom="@dimen/dp_100"-->
<!-- app:pointsPosition="CENTER"--> <!-- android:src="@mipmap/shouchl"/>-->
<!-- app:pointsVisibility="true"-->
<!-- android:clickable="true"--> <com.stx.xhb.xbanner.XBanner
<!-- android:focusable="true"--> android:id="@+id/banner"
<!-- />--> android:layout_width="@dimen/dp_75"
android:layout_height="@dimen/dp_85"
android:scaleType="fitCenter"
app:AutoPlayTime="3000"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
app:pageChangeDuration="3000"
app:pointContainerPosition="BOTTOM"
app:pointNormal="@mipmap/room_ic_banner_point_normal"
app:pointSelect="@mipmap/room_ic_banner_point_select"
app:pointTopBottomPadding="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_100"
app:pointsPosition="CENTER"
app:pointsVisibility="true"
android:clickable="true"
android:focusable="true"
/>
</RelativeLayout> </RelativeLayout>
</layout> </layout>

25
moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
View File

@@ -343,6 +343,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
LogUtils.e("RoomActivity", "onPause") LogUtils.e("RoomActivity", "onPause")
if (mRoomInfoResp != null) { if (mRoomInfoResp != null) {
if (mRoomInfoResp!!.room_info.type_id != "6") { if (mRoomInfoResp!!.room_info.type_id != "6") {
// 只有在用户主动离开应用时才执行最小化操作 // 只有在用户主动离开应用时才执行最小化操作
@@ -350,6 +351,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// 保持Activity alive，不调用finish() // 保持Activity alive，不调用finish()
minimizeToBackground() minimizeToBackground()
userLeaving = false // 重置标记 userLeaving = false // 重置标记
} }
} }
@@ -488,6 +490,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
supportFragmentManager.findFragmentById(R.id.vp_room_pager) // 替换为你实际的容器 ID supportFragmentManager.findFragmentById(R.id.vp_room_pager) // 替换为你实际的容器 ID
if (currentFragment is RoomCabinFragment) { if (currentFragment is RoomCabinFragment) {
currentFragment.onConfigurationChanged(newConfig) currentFragment.onConfigurationChanged(newConfig)
initPublicScreenFragment()
} }
} }
@@ -1083,6 +1086,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
} }
} }
private fun enterLandscapeMode() { private fun enterLandscapeMode() {
isFullScreen = true isFullScreen = true
@@ -1195,6 +1201,15 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// 隐藏退出按钮 // 隐藏退出按钮
ivExitFullscreen!!.visibility = View.GONE ivExitFullscreen!!.visibility = View.GONE
// upHeight()
// initPublicScreenFragment()
// if (!isFinishing && !isDestroyed) {
// resetFragment()
// upHeight()
// } else {
// Log.e("Fragment", "Fragment transaction skipped due to state loss.")
// }
// isFullScreen = false; // isFullScreen = false;
@@ -3768,6 +3783,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// 恢复房间状态 // 恢复房间状态
resumeRoomState() resumeRoomState()
setupEffectView() setupEffectView()
MvpPre!!.postRoomInfo(CommonAppContext.getInstance().playId) MvpPre!!.postRoomInfo(CommonAppContext.getInstance().playId)
// resetFragment() // resetFragment()
} }
@@ -3943,6 +3959,15 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
val roomBean = resp.room_info val roomBean = resp.room_info
if (roomBean!!.type_id.equals("6")){ if (roomBean!!.type_id.equals("6")){
// upHeight()
initPublicScreenFragment()
if (!isFinishing && !isDestroyed) {
resetFragment()
upHeight()
} else {
Log.e("Fragment", "Fragment transaction skipped due to state loss.")
}
return return
} }
this.mRoomBean = roomBean this.mRoomBean = roomBean

59
moduleroom/src/main/res/layout/activity_room.xml
View File

@@ -553,34 +553,6 @@
</com.xscm.moduleutil.widget.DropViewRoom> </com.xscm.moduleutil.widget.DropViewRoom>
<com.xscm.moduleutil.widget.floatingView.Floa
android:id="@+id/flaoat"
android:layout_width="@dimen/dp_240"
android:layout_height="@dimen/dp_135"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible">
<FrameLayout
android:id="@+id/fl_screenshare"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<ImageView
android:id="@+id/iv_quan"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_gravity="end|bottom"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_5"
android:src="@mipmap/quan"
android:translationZ="10dp"/>
<!-- 自定义内容 -->
</com.xscm.moduleutil.widget.floatingView.Floa>
<com.xscm.moduleutil.widget.floatingView.Floa <com.xscm.moduleutil.widget.floatingView.Floa
android:id="@+id/flaoat_zuoji" android:id="@+id/flaoat_zuoji"
@@ -724,5 +696,36 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"/>
<com.xscm.moduleutil.widget.floatingView.Floa
android:id="@+id/flaoat"
android:layout_width="@dimen/dp_240"
android:layout_height="@dimen/dp_135"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:translationZ="1000dp"
tools:visibility="visible">
<FrameLayout
android:id="@+id/fl_screenshare"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<ImageView
android:id="@+id/iv_quan"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_gravity="end|bottom"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_5"
android:src="@mipmap/quan"
android:translationZ="10dp"/>
<!-- 自定义内容 -->
</com.xscm.moduleutil.widget.floatingView.Floa>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</layout> </layout>

8
moduleroom/src/main/res/layout/fragment_room_auction.xml
View File

@@ -150,7 +150,6 @@
app:room_make_pic="@mipmap/za_p" app:room_make_pic="@mipmap/za_p"
app:room_make_wheat_number="888"/> app:room_make_wheat_number="888"/>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -173,11 +172,11 @@
<TextView <TextView
android:id="@+id/tv_relation" android:id="@+id/tv_relation"
android:gravity="center"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18" android:layout_height="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_1" android:layout_marginTop="@dimen/dp_1"
android:text="关系" android:text="关系"
android:gravity="center"
android:textColor="@color/color_FF999999" android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="@+id/btn_relation" app:layout_constraintEnd_toEndOf="@+id/btn_relation"
@@ -199,7 +198,6 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:gravity="center"
android:id="@+id/tv_gift" android:id="@+id/tv_gift"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18" android:layout_height="@dimen/dp_18"
@@ -207,6 +205,7 @@
android:text="礼物" android:text="礼物"
android:textColor="@color/color_FF999999" android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
android:gravity="center"
app:layout_constraintEnd_toEndOf="@+id/btn_gift" app:layout_constraintEnd_toEndOf="@+id/btn_gift"
app:layout_constraintStart_toStartOf="@id/btn_gift" app:layout_constraintStart_toStartOf="@id/btn_gift"
app:layout_constraintTop_toBottomOf="@id/btn_gift" /> app:layout_constraintTop_toBottomOf="@id/btn_gift" />
@@ -286,6 +285,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="一号麦" android:text="一号麦"
android:singleLine="true"
android:textColor="@color/color_FF999999" android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@@ -328,6 +328,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="二号麦" android:text="二号麦"
android:singleLine="true"
android:textColor="@color/color_FF999999" android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@@ -371,6 +372,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="三号麦" android:text="三号麦"
android:singleLine="true"
android:textColor="@color/color_FF999999" android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"

2
moduleroom/src/main/res/layout/room_cabin_fragment.xml
View File

@@ -137,7 +137,7 @@
app:layout_constraintEnd_toStartOf="@+id/room_make_wheat2" app:layout_constraintEnd_toStartOf="@+id/room_make_wheat2"
app:layout_constraintStart_toEndOf="@+id/room_make_wheat1" app:layout_constraintStart_toEndOf="@+id/room_make_wheat1"
app:layout_constraintTop_toTopOf="@+id/room_make_wheat1" app:layout_constraintTop_toTopOf="@+id/room_make_wheat1"
tools:visibility="visible"> >
<!-- <ImageView--> <!-- <ImageView-->
<!-- android:layout_width="match_parent"--> <!-- android:layout_width="match_parent"-->