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-09-16 00:56:58 +08:00
parent e87a368862
commit 72802ef7be
26 changed files with 321 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -1,8 +1,8 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
}
}
android {
namespace 'com.xscm.midi'
compileSdk 35

4
app/src/main/java/com/xscm/midi/PasswordLoginActivity.java
View File

@@ -307,12 +307,14 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
bundle.putSerializable("userBean", userBean);
intent.putExtras(bundle);
startActivity(intent);
finish();
} else {
EventBus.getDefault().post(userBean);
startActivity(new Intent(this, MainActivity.class));
}
finish();
}
// finish();
}
}
private void doOnePass() {

4
gradle.properties
View File

@@ -29,8 +29,8 @@ isBuildModule=false
#org.gradle.deamon=false
android.injected.testOnly=false
APP_VERSION_NAME=1.0.0
APP_VERSION_CODE=129
APP_VERSION_NAME=1.0.1
APP_VERSION_CODE=130
org.gradle.jvm.toolchain.useLegacyAdapters=false
#org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15

2
gradle/libs.versions.toml
View File

@@ -21,6 +21,7 @@ githubRealtimeblurviewVersion = "1.2.1"
githubShadowlayout = "3.3.1"
gradle = "8.8.0"
#gradle = "8.5.0-alpha04"
greendaoGradlePlugin = "3.3.0"
junit = "4.13.2"
junitVersion = "1.1.5"
espressoCore = "3.5.1"
@@ -97,6 +98,7 @@ github-photoview = { module = "com.github.chrisbanes:PhotoView", version.ref = "
github-shadowlayout = { module = "com.github.lihangleo2:ShadowLayout", version.ref = "githubShadowlayout" }
#glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "githubGlide" }
gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
greendao-gradle-plugin = { module = "org.greenrobot:greendao-gradle-plugin", version.ref = "greendaoGradlePlugin" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }

40
moduleUtil/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java
View File

@@ -12,6 +12,7 @@ import com.xscm.moduleutil.R;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.GiftLabelBean;
import com.xscm.moduleutil.bean.GiftPackBean;
import com.xscm.moduleutil.bean.GiftPackListCount;
import com.xscm.moduleutil.bean.RewardUserBean;
import com.xscm.moduleutil.bean.RoonGiftModel;
import com.xscm.moduleutil.bean.WalletBean;
@@ -101,16 +102,16 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
@Override
protected void initData() {
if (id.equals("0")) {
MvpPre.giftPack();
} else {
if (type == 0) {
MvpPre.getGiftList("0", type, roomId);
} else {
MvpPre.getGiftList(id, type, roomId);
}
}
// if (id.equals("0")) {
// MvpPre.giftPack();
// } else {
// if (type == 0) {
// MvpPre.getGiftList("0", type, roomId);
// } else {
// MvpPre.getGiftList(id, type, roomId);
// }
//
// }
}
@Override
@@ -183,6 +184,9 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
@Override
public void giftPack(List<GiftPackBean> giftPackBean) {
giftPackList = new ArrayList<>();
if (giftPackBean != null && giftPackBean.size() > 0) {
if (bdgiftId != null) {
for (GiftPackBean item : giftPackBean) {
if (item.getGift_id().equals(bdgiftId)) {
@@ -190,8 +194,6 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
}
}
}
giftPackList.addAll(giftPackBean);
pageCount = (int) Math.ceil(giftPackBean.size() * 1.0 / pageSize);
for (int j = 0; j < pageCount; j++) {
@@ -200,6 +202,15 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
packAdapter = new GiftPackAdapter(getActivity(), giftPackBean, j, "0");
mBinding.rvGift.setAdapter(packAdapter);
}
} else {
giftPackBean = new ArrayList<>();
pageCount = (int) Math.ceil(giftPackBean.size() * 1.0 / pageSize);
packAdapter = new GiftPackAdapter(getActivity(), giftPackBean, 0, "0");
mBinding.rvGift.setAdapter(packAdapter);
}
}
@Override
@@ -207,6 +218,11 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
}
@Override
public void getGiftPackListCount(GiftPackListCount giftPackListCount) {
}
@Override
public void getRewardList(List<RewardUserBean> rewardUserBeanList) {

13
moduleUtil/src/main/java/com/xscm/moduleutil/bean/GiftPackListCount.java Normal file
View File

@@ -0,0 +1,13 @@
package com.xscm.moduleutil.bean;
import lombok.Data;
/**
*@author qx
*@data 2025/9/15
*@description: 背包礼物总价值
*/
@Data
public class GiftPackListCount {
private String count;
}

8
moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java
View File

@@ -18,6 +18,7 @@ import com.xscm.moduleutil.bean.GiftBoxRecordBean;
import com.xscm.moduleutil.bean.GiftLabelBean;
import com.xscm.moduleutil.bean.GiftName;
import com.xscm.moduleutil.bean.GiftPackBean;
import com.xscm.moduleutil.bean.GiftPackListCount;
import com.xscm.moduleutil.bean.GiftUserWallBean;
import com.xscm.moduleutil.bean.HeadlineBean;
import com.xscm.moduleutil.bean.HeatedBean;
@@ -193,7 +194,7 @@ public interface ApiServer {
Observable<BaseModel<List<MyBagDataBean>>> packOutcome(@Query("page") String page, @Query("page_limit") String page_size);
@GET(Constants.GET_GIFT_PACK)
Observable<BaseModel<List<GiftPackBean>>> giftPack();
Call<BaseModel<List<GiftPackBean>>> giftPack();
@FormUrlEncoded
@POST(Constants.ADD_BLACK_LIST)
@@ -767,10 +768,13 @@ public interface ApiServer {
@FormUrlEncoded
@POST(Constants.POST_GIFT_ALL_CLEAR)
Call<BaseModel<String>> getGiftPack(@Field("room_id") String roomId,@Field("to_uid") String user_id,@Field("heart_id") String heart_id);
Call<BaseModel<String>> getGiftPack(@Field("room_id") String roomId,@Field("to_uid") String user_id,@Field("heart_id") String heart_id,@Field("auction_id") String auction_id);
@FormUrlEncoded
@POST(Constants.POST_ROOM_USER_CHARM_LIST)
Call<BaseModel<List<RoomUserCharmListBean>>> roomUserCharmList(@Field("room_id") String roomId,@Field("user_id") String user_id);
@GET(Constants.GET_GIFT_PACK_LIST_COUNT)
Call<BaseModel<GiftPackListCount>> getGiftPackListCount();
}

44
moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
View File

@@ -33,6 +33,7 @@ import com.xscm.moduleutil.bean.GiftBoxRecordBean;
import com.xscm.moduleutil.bean.GiftLabelBean;
import com.xscm.moduleutil.bean.GiftName;
import com.xscm.moduleutil.bean.GiftPackBean;
import com.xscm.moduleutil.bean.GiftPackListCount;
import com.xscm.moduleutil.bean.GiftUserWallBean;
import com.xscm.moduleutil.bean.HeadlineBean;
import com.xscm.moduleutil.bean.HeatedBean;
@@ -455,11 +456,29 @@ public class RetrofitClient {
}
public void giftPack(BaseObserver<List<GiftPackBean>> observer) {
sApiServer.giftPack().compose(new DefaultTransformer<>()).subscribe(observer);
sApiServer.giftPack().enqueue(new Callback<BaseModel<List<GiftPackBean>>>() {
@Override
public void onResponse(Call<BaseModel<List<GiftPackBean>>> call, Response<BaseModel<List<GiftPackBean>>> response) {
if (response.code() == 200){
BaseModel<List<GiftPackBean>> baseModel = response.body();
if (baseModel.getCode() == 1) {
observer.onNext(baseModel.getData());
} else {
observer.onNext(null);
}
}
}
public void getGiftPack(String roomId, String userId, String heart_id,BaseObserver<String> observer){
sApiServer.getGiftPack(roomId,userId,heart_id).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onFailure(Call<BaseModel<List<GiftPackBean>>> call, Throwable t) {
t.printStackTrace();
}
});
}
public void getGiftPack(String roomId, String userId, String heart_id,String auction_id,BaseObserver<String> observer){
sApiServer.getGiftPack(roomId,userId,heart_id,auction_id).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
if (response.code() == 200){
@@ -479,6 +498,25 @@ public class RetrofitClient {
});
}
public void getGiftPackListCount(BaseObserver<GiftPackListCount> observer){
sApiServer.getGiftPackListCount().enqueue(new Callback<BaseModel<GiftPackListCount>>() {
@Override
public void onResponse(Call<BaseModel<GiftPackListCount>> call, Response<BaseModel<GiftPackListCount>> response) {
if (response.code() == 200){
BaseModel<GiftPackListCount> baseModel = response.body();
if (baseModel.getCode() == 1){
observer.onNext(baseModel.getData());
}
}
}
@Override
public void onFailure(Call<BaseModel<GiftPackListCount>> call, Throwable t) {
t.printStackTrace();
}
});
}
public void tasksLihen(BaseObserver<GiftBoxBean> observer) {
sApiServer.tasksLihen().enqueue(new Callback<ResponseBody>() {
@Override

7
moduleUtil/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java
View File

@@ -6,6 +6,7 @@ import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.GiftLabelBean;
import com.xscm.moduleutil.bean.GiftPackBean;
import com.xscm.moduleutil.bean.GiftPackListCount;
import com.xscm.moduleutil.bean.RewardUserBean;
import com.xscm.moduleutil.bean.RoonGiftModel;
import com.xscm.moduleutil.bean.WalletBean;
@@ -29,6 +30,8 @@ public class RewardGiftContacts {
void giftPack(List<GiftPackBean> giftPackBean);
void getGiftPack(String s);
void getGiftPackListCount(GiftPackListCount giftPackListCount);
}
public interface IIndexPre extends IPresenter {
@@ -51,6 +54,8 @@ public class RewardGiftContacts {
void roomAuctionJoin(String auction_id,String user_id, String gift_id, String num,String type);
void giftPack();
void getGiftPack(String roomId,String userId,String heart_id);
void getGiftPack(String roomId,String userId,String heart_id,String auction_id );
void getGiftPackListCount();
}
}

24
moduleUtil/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java
View File

@@ -4,6 +4,7 @@ import android.content.Context;
import com.xscm.moduleutil.bean.GiftLabelBean;
import com.xscm.moduleutil.bean.GiftPackBean;
import com.xscm.moduleutil.bean.GiftPackListCount;
import com.xscm.moduleutil.bean.RewardUserBean;
import com.xscm.moduleutil.bean.RoonGiftModel;
import com.xscm.moduleutil.bean.WalletBean;
@@ -17,6 +18,7 @@ import io.reactivex.disposables.Disposable;
public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View> implements RewardGiftContacts.IIndexPre {
RewardGiftContacts.View mView;
public RewardGiftPresenter(RewardGiftContacts.View view, Context context) {
super(view, context);
mView = view;
@@ -210,8 +212,8 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
}
@Override
public void getGiftPack(String roomId,String userId,String heart_id) {
api.getGiftPack(roomId,userId,heart_id, new BaseObserver<String>() {
public void getGiftPack(String roomId, String userId, String heart_id, String auction_id) {
api.getGiftPack(roomId, userId, heart_id, auction_id, new BaseObserver<String>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
@@ -230,4 +232,22 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
}
});
}
@Override
public void getGiftPackListCount() {
api.getGiftPackListCount(new BaseObserver<GiftPackListCount>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
}
@Override
public void onNext(GiftPackListCount giftPackListCount) {
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().getGiftPackListCount(giftPackListCount);
}
});
}
}

1
moduleUtil/src/main/java/com/xscm/moduleutil/widget/Constants.java
View File

@@ -386,6 +386,7 @@ public class Constants {
public static final String GET_XLH_MY_RECORD = "/api/BlindBoxTurntable/get_xlh_my_record";///巡乐会记录
public static final String POST_GIFT_ALL_CLEAR = "/api/Room/room_gift_all_clear";///背包礼物全清
public static final String POST_ROOM_USER_CHARM_LIST = "/api/Room/room_user_charm_list";///房间用户当前魅力值列表
public static final String GET_GIFT_PACK_LIST_COUNT = "/api/UserGiftPack/get_gift_pack_list_count";///背包礼物总价值

6
moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/RewardDialogFragment.java
View File

@@ -19,6 +19,7 @@ import com.xscm.moduleutil.R;
import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.bean.GiftLabelBean;
import com.xscm.moduleutil.bean.GiftPackBean;
import com.xscm.moduleutil.bean.GiftPackListCount;
import com.xscm.moduleutil.bean.RewardUserBean;
import com.xscm.moduleutil.bean.RoonGiftModel;
import com.xscm.moduleutil.bean.WalletBean;
@@ -196,4 +197,9 @@ public class RewardDialogFragment extends BaseMvpDialogFragment<RewardGiftPresen
public void getGiftPack(String s) {
}
@Override
public void getGiftPackListCount(GiftPackListCount giftPackListCount) {
}
}

6
moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java
View File

@@ -25,6 +25,7 @@ import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.bean.GiftLabelBean;
import com.xscm.moduleutil.bean.GiftNumBean;
import com.xscm.moduleutil.bean.GiftPackBean;
import com.xscm.moduleutil.bean.GiftPackListCount;
import com.xscm.moduleutil.bean.RewardUserBean;
import com.xscm.moduleutil.bean.RoonGiftModel;
import com.xscm.moduleutil.bean.WalletBean;
@@ -292,6 +293,11 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
}
@Override
public void getGiftPackListCount(GiftPackListCount giftPackListCount) {
}
private static class MyFragmentPagerAdapter extends FragmentStatePagerAdapter {
private List<GiftLabelBean> list;

24
moduleUtil/src/main/res/layout/room_view_sing_wheat.xml
View File

@@ -29,18 +29,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- <com.xscm.moduleutil.widget.AvatarFrameView-->
<!-- android:id="@+id/iv_ripple"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="0dp"-->
<!-- android:layout_marginTop="@dimen/dp_8"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintHeight_percent="0.99"-->
<!-- app:layout_constraintWidth_percent="0.99"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- />-->
<com.xscm.moduleutil.widget.AvatarFrameView
android:id="@+id/iv_frame"
@@ -50,13 +38,11 @@
android:scaleType="fitCenter"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_percent="0.95"
android:layout_marginTop="@dimen/dp_5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.95" />
app:layout_constraintBottom_toBottomOf="@id/riv"
app:layout_constraintEnd_toEndOf="@id/riv"
app:layout_constraintStart_toStartOf="@id/riv"
app:layout_constraintTop_toTopOf="@id/riv"
android:layout_margin="-5dp"/>
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/iv_ripple"

1
modulemain/src/main/AndroidManifest.xml
View File

@@ -10,7 +10,6 @@
<activity
android:name=".activity.MainActivity"
android:launchMode="singleInstance"
android:exported="true"
/>
</application>

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

@@ -455,7 +455,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
CommonAppContext.getInstance().isShow = false;
ARouter.getInstance().build(ARouteConstants.ME)
.withFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.withFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
.navigation();
// moveTaskToBack(true);
@@ -1012,11 +1012,8 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
if (msgType == 1005) {
LogUtils.e("@@@@" + "EventBusnujm2" + "playQueue.size()====" + messageEvent.getText().getGiftInfo());
// synchronized (roomMessageLock) {
// roomMessageEventQueue.add(messageEvent.getText().getGiftInfo().getPlay_image());
// }
QXGiftPlayerManager.getInstance(this).displayFullEffectView(messageEvent.getText().getGiftInfo());
// handleMsgType1005(messageEvent, text);
hand1005(messageEvent, text);
} else if (msgType == 123) {
EventBus.getDefault().post(new RoomSettingEvent());
@@ -1222,7 +1219,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
if (fromUserId != null && fromUserId.equals(currentUserId)) {
try {
mRoomInfoResp.getUser_info().setPit_number(Integer.parseInt(toBean.getPit_number()));
mRoomInfoResp.getUser_info().setPit_number(Integer.parseInt(fromBean.getPit_number()));
} catch (NumberFormatException e) {
LogUtils.e("Invalid pit number: " + toBean.getPit_number());
}
@@ -1230,7 +1227,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
try {
mRoomInfoResp.getUser_info().setPit_number(Integer.parseInt(fromBean.getPit_number()));
} catch (NumberFormatException e) {
LogUtils.e("Invalid pit number: " + fromBean.getPit_number());
LogUtils.e("Invalid pit number: " + toBean.getPit_number());
}
}
}
@@ -1255,6 +1252,10 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
} else if ("7".equals(typeId)) {
roomFragment.friendshipRoomFragmentEvent(messageEvent);
}
if (mRoomInfoResp.getUser_info().getPit_number()==9){
mBinding.roomTop.rl.setVisibility(View.VISIBLE);
ivSoundEffects(true);
}
}
@@ -1443,6 +1444,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
if ("9".equals(pitNumber) && userId == currentUserId) {
mBinding.roomTop.rl.setVisibility(View.VISIBLE);
ivSoundEffects(true);
}
if (userId == currentUserId) {
@@ -1456,11 +1458,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
switchMic(2);
}
if (pitNumber.equals("9")) {
ivSoundEffects(true);
} else {
ivSoundEffects(false);
}
String typeId = mRoomInfoResp.getRoom_info().getType_id();
if ("2".equals(typeId)) {
@@ -1488,6 +1486,12 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
} else {
roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
}
// if (pitNumber.equals("9") && mRoomInfoResp.getUser_info().getUser_id().equals(SpUtil.getUserId()+"")) {
// ivSoundEffects(true);
// } else {
// ivSoundEffects(false);
// }
}
private void handleMsgType1004(RoomMessageEvent messageEvent, RoomMessageEvent.T text) {
@@ -1522,6 +1526,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
isMusic = false;
}
mBinding.roomTop.rl.setVisibility(GONE);
ivSoundEffects(false);
}
String typeId = mRoomInfoResp.getRoom_info().getType_id();
@@ -1739,6 +1744,9 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
}
pendingRoomId = text.getRoom_id();
if (pendingRoomId == null){
return;
}
LogUtils.e("需要加入的房间id：pendingRoomId: " + pendingRoomId);
roomSwitchRunnable = () -> {
if (!isFinishing() && !isDestroyed()) {
@@ -2480,18 +2488,14 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
default:
break;
}
// 类型房间规则覆盖
if ("2".equals(typeId)) {
rl_misc.setVisibility(View.GONE);
rl_more.setVisibility(View.GONE);
} else if (roleType != 5) {
if (roleType != 5) {
rl_misc.setVisibility(View.VISIBLE);
if (userPitNumber == 9) {
rl_more.setVisibility(GONE);
}
}
// label_id 和 type_id 联合判断
if (Arrays.asList("1", "3", "4").contains(typeId) && "2".equals(labelId)) {
rl_more.setVisibility(View.GONE);
@@ -2514,7 +2518,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
}
}
if ("7".equals(typeId)) {
if ("7".equals(typeId) || "2".equals(typeId)) {
rl_more.setVisibility(View.GONE);
rl_misc.setVisibility(View.GONE);
}
@@ -2667,8 +2671,10 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
this.mRoomInfoResp = resp;
if (mRoomInfoResp.getUser_info().getPit_number() == 9 && mRoomInfoResp.getUser_info().getUser_id().equals(SpUtil.getUserId() + "")) {
mBinding.roomTop.rl.setVisibility(View.VISIBLE);
ivSoundEffects(true);
} else {
mBinding.roomTop.rl.setVisibility(View.GONE);
ivSoundEffects(false);
}
}
@@ -2771,8 +2777,10 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
if (mRoomInfoResp.getUser_info().getPit_number() == 9 && mRoomInfoResp.getUser_info().getUser_id().equals(SpUtil.getUserId() + "")) {
mBinding.roomTop.rl.setVisibility(View.VISIBLE);
ivSoundEffects(true);
} else {
mBinding.roomTop.rl.setVisibility(View.GONE);
ivSoundEffects(false);
}
setupEffectView();
@@ -3269,7 +3277,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2") || mRoomInfoResp.getRoom_info().getType_id().equals("7")) {
mBinding.rlMore.setVisibility(GONE);
mBinding.rlMisc.setVisibility(GONE);
// mBinding.rlMisc.setVisibility(GONE);
} else if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1") || mRoomInfoResp.getRoom_info().getType_id().equals("3") || mRoomInfoResp.getRoom_info().getType_id().equals("4")) {
mBinding.rlMore.setVisibility(GONE);
mBinding.rlMisc.setVisibility(VISIBLE);

56
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java
View File

@@ -41,6 +41,7 @@ import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.bean.GiftLabelBean;
import com.xscm.moduleutil.bean.GiftNumBean;
import com.xscm.moduleutil.bean.GiftPackBean;
import com.xscm.moduleutil.bean.GiftPackListCount;
import com.xscm.moduleutil.bean.RewardUserBean;
import com.xscm.moduleutil.bean.RoomTypeModel;
import com.xscm.moduleutil.bean.RoonGiftModel;
@@ -99,7 +100,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
private final List<String> oldSelectedIds = new LinkedList<>();
private int jingp;//1:是点击的竞拍，2：是点击的送礼物
private String heart_id = "";//交友房中，点击助力需要发送heart_id
private String auction_id;
@Override
protected RewardGiftPresenter bindPresenter() {
@@ -408,7 +409,14 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
ToastUtils.show("一键全送只能选择一个用户");
return;
}
MvpPre.getGiftPack(roomId,gifyuseradapter.getUserIdToString(),heart_id);
if (userInfo != null) {
if (userInfo.getAuction_id() != null) {
auction_id =userInfo.getAuction_id();
} else {
auction_id = "";
}
}
MvpPre.getGiftPack(roomId, gifyuseradapter.getUserIdToString(), heart_id, auction_id);
}
}
@@ -648,6 +656,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
mBinding.viewPager.setOffscreenPageLimit(0);
mBinding.slidingTabLayout.setViewPager(mBinding.viewPager);
mBinding.slidingTabLayout.setCurrentTab(1);
refreshCurrentGiftFragment(giftLabelBeans.get(1).getId(),1,roomId);
mBinding.viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
@@ -658,6 +667,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
public void onPageSelected(int position) {
// 当页面切换时，控制 tv_bb_qs 按钮的显示
updateTvBbQsVisibility(position);
refreshCurrentGiftFragment(giftLabelBeans.get(position).getId(),1,roomId);
}
@Override
@@ -668,6 +678,35 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
// 初始化时设置按钮可见性
updateTvBbQsVisibility(1);
}
// 调用示例
private void refreshCurrentGiftFragment(String id,int type,String roomId) {
// int currentPosition = mBinding.viewPager.getCurrentItem();
// if (currentPosition >= 0 && currentPosition < fragmentList.size()) {
// Fragment fragment = fragmentList.get(currentPosition);
// if (fragment instanceof GiftTwoDetailsFragment && fragment.isAdded()) {
// GiftTwoDetailsFragment giftFragment = (GiftTwoDetailsFragment) fragment;
// // 调用 fragment 的公共方法
// giftFragment.loadDataIfNeeded(id,type,roomId); // 假设 GiftTwoDetailsFragment 有这个方法
// }
// }
if (getCurrentGiftFragment()!=null){
getCurrentGiftFragment().loadDataIfNeeded(id,type,roomId);
}
}
private GiftTwoDetailsFragment getCurrentGiftFragment() {
int currentPosition = mBinding.viewPager.getCurrentItem();
// 使用 ViewPager 的 adapter 获取当前 fragment
MyFragmentPagerAdapter adapter = (MyFragmentPagerAdapter) mBinding.viewPager.getAdapter();
if (adapter != null) {
// 直接从 adapter 获取 fragment
Fragment fragment = adapter.getItem(currentPosition);
if (fragment instanceof GiftTwoDetailsFragment) {
return (GiftTwoDetailsFragment) fragment;
}
}
return null;
}
// 控制 tv_bb_qs 按钮显示的方法
private void updateTvBbQsVisibility(int currentPosition) {
@@ -676,11 +715,15 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
// 显示按钮
if (mBinding.tvBbQs != null) {
mBinding.tvBbQs.setVisibility(View.VISIBLE);
mBinding.cz.setVisibility(View.GONE);
MvpPre.getGiftPackListCount();
}
} else {
// 隐藏按钮
if (mBinding.tvBbQs != null) {
mBinding.tvBbQs.setVisibility(View.GONE);
mBinding.cz.setVisibility(View.VISIBLE);
MvpPre.wallet();
}
}
}
@@ -695,7 +738,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
// dismiss();
if (mBinding.viewPager.getCurrentItem() == 0) {
MvpPre.wallet();
MvpPre.getGiftPackListCount();
EventBus.getDefault().post(beibaoId);
return;
}
@@ -747,6 +790,13 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
}
}
@Override
public void getGiftPackListCount(GiftPackListCount giftPackListCount) {
if (giftPackListCount != null){
mBinding.tvRewardGift.setText(giftPackListCount.getCount());
}
}
private class MyFragmentPagerAdapter extends FragmentStatePagerAdapter {
private List<GiftLabelBean> list;

6
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomWheatGiftSettingFragment.java
View File

@@ -21,6 +21,7 @@ import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.bean.GiftLabelBean;
import com.xscm.moduleutil.bean.GiftNumBean;
import com.xscm.moduleutil.bean.GiftPackBean;
import com.xscm.moduleutil.bean.GiftPackListCount;
import com.xscm.moduleutil.bean.RewardUserBean;
import com.xscm.moduleutil.bean.RoomWheatEvent;
import com.xscm.moduleutil.bean.RoonGiftModel;
@@ -220,6 +221,11 @@ public class RoomWheatGiftSettingFragment extends BaseMvpDialogFragment<RewardGi
}
@Override
public void getGiftPackListCount(GiftPackListCount giftPackListCount) {
}
private static class MyFragmentPagerAdapter extends FragmentStatePagerAdapter {
private List<Fragment> fragmentList;

6
moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java
View File

@@ -411,6 +411,9 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
if (userId==SpUtil.getUserId() && pitNumber.equals("9")){
myPitNumber=9;
configGameOptionBtn();
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).ivSoundEffects(true);
// }
}
for (int i = 0; i < mWheatViews.size(); i++){
if (i==Integer.parseInt(pitNumber) - 1){
@@ -443,6 +446,9 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
if (pitNumber.equals("9")){
myPitNumber=0;
configGameOptionBtn();
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).ivSoundEffects(false);
// }
}
for (int i = 0; i < mWheatViews.size(); i++){
if (i==Integer.parseInt(pitNumber) - 1){

4
moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
View File

@@ -836,9 +836,9 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
break;
case 1049:
if (text != null && text.getStep() != 3) {
// if (text != null && text.getStep() != 3) {
postAndAddMessage(message);
}
// }
break;
case 1005:

3
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomCabinFragment.java
View File

@@ -161,6 +161,7 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
public void onClick(View v) {
if (!isShow) {
switchMic(2);
isMute(1);
} else {
switchMic(1);
}
@@ -319,7 +320,7 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
AgoraManager.getInstance(getActivity()).muteLocalAudioStream(true);
AgoraManager.getInstance(getActivity()).setLocalAudioEnabled(false,SpUtil.getUserId()+"");
isShow = true;
isMute(1);
}
}

1
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
View File

@@ -1344,6 +1344,7 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
break;
case 1021:
ktvFragment.event1021(messageEvent);
break;
case 1005:
ktvFragment.event1005(messageEvent);
break;

15
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java
View File

@@ -373,10 +373,13 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
}
};
mBinding.recyclerView.setAdapter(adapter);
// if (mBinding.llBz.getVisibility()== View.VISIBLE){
// AgoraManager.getInstance(getActivity()).selectAudioTrack(1);
// mBinding.imBz.setImageResource(com.xscm.moduleutil.R.mipmap.accompany_off);
// mBinding.tvBz.setText("伴奏");
// }
AgoraManager.getInstance(getActivity()).selectAudioTrack(1);
isRotate = true;
isRotate = false;
RoomKtvWheatView muYc = mBinding.muYc;
muYc.setOnClickListener(new View.OnClickListener() {
@Override
@@ -746,6 +749,9 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
if (pitBean.getPit_number().equals("9")) {
RoomKtvWheatView roomDefaultWheatView = mBinding.muZc;
roomDefaultWheatView.setData(pitBean);
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).ivSoundEffects(true);
// }
} else if (pitBean.getPit_number().equals("10")) {
RoomKtvWheatView roomDefaultWheatView = mBinding.muJb;
roomDefaultWheatView.setData(pitBean);
@@ -788,6 +794,9 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
if (pitBean.getPit_number().equals("9")) {
RoomKtvWheatView roomDefaultWheatView = mBinding.muZc;
roomDefaultWheatView.setData(pitBean);
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).ivSoundEffects(false);
// }
} else if (pitBean.getPit_number().equals("10")) {
RoomKtvWheatView roomDefaultWheatView = mBinding.muJb;
roomDefaultWheatView.setData(pitBean);

20
moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
View File

@@ -1340,8 +1340,18 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
pitBean.setDress(message.getText().getFromUserInfo().getDress());
roomInfoResp.getRoom_info().getPit_list().set(Integer.parseInt(message.getText().getPit_number()) - 1, pitBean);
if (roomInfoRespPk == null || roomInfoRespPk.getPk_info() == null) {
// if (pitBean.getPit_number().equals("9")){
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).ivSoundEffects(true);
// }
// }
wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(message.getText().getPit_number()));
} else {
// if (pitBean.getPit_number().equals("9")){
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).ivSoundEffects(true);
// }
// }
wheatLayoutManager1.updateSingleWheat(pitBean, Integer.parseInt(message.getText().getPit_number()));
}
// 通知父 Fragment
@@ -1369,8 +1379,18 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
pitBean.setDress("");
roomInfoResp.getRoom_info().getPit_list().set(Integer.parseInt(message.getText().getPit_number()) - 1, pitBean);
if (roomInfoRespPk == null || roomInfoRespPk.getPk_info() == null) {
// if (pitBean.getPit_number().equals("9")){
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).ivSoundEffects(false);
// }
// }
wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(message.getText().getPit_number()));
} else {
// if (pitBean.getPit_number().equals("9")){
// if (getActivity() instanceof RoomActivity) {
// ((RoomActivity) getActivity()).ivSoundEffects(false);
// }
// }
wheatLayoutManager1.updateSingleWheat(pitBean, Integer.parseInt(message.getText().getPit_number()));
}
if (SpUtil.getUserId() == message.getText().getFromUserInfo().getUser_id()) {

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

@@ -286,7 +286,7 @@
<RelativeLayout
android:id="@+id/rl_misc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="20dp"
android:layout_marginEnd="@dimen/dp_5"
android:layout_weight="0.3">
@@ -492,7 +492,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible">
<FrameLayout
android:id="@+id/fl_screenshare"
@@ -506,6 +507,7 @@
android:layout_gravity="end|bottom"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_5"
android:translationZ="10dp"
android:src="@mipmap/quan" />
<!-- 自定义内容 -->
</com.xscm.moduleutil.widget.floatingView.Floa>

4
moduleroom/src/main/res/layout/fragment_room_ktv.xml
View File

@@ -195,7 +195,7 @@
android:layout_width="@dimen/dp_13"
android:layout_height="@dimen/dp_16"
android:layout_gravity="center"
android:src="@mipmap/accompany_off" />
android:src="@mipmap/accompany_on" />
<TextView
android:id="@+id/tv_bz"
@@ -203,7 +203,7 @@
android:layout_height="@dimen/dp_14"
android:layout_gravity="center"
android:gravity="center"
android:text="伴奏"
android:text="原唱"
android:textColor="@color/color_white"
android:textSize="@dimen/sp_10" />
</LinearLayout>