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

1：修改送礼中趣味的岁月之城和时空之巅，不需要选择人员就可以打开

Browse Source 
2：优化用在房间点击用户，点击抱麦出现的错误
3: 在岁月之城和时空之巅中查看记录的时候，进行判断，当返回的nickname是null的时候，就直接不展示赠与
4:修改任务UI，
5:添加房间暴币功能
6：修改房间暴币飘屏
7：添加启动页动画
8：修改房间的设置
This commit is contained in:
梁小江
2025-12-22 09:02:22 +08:00
parent f34a67c2e8
commit 53b9f0f034
54 changed files with 1016 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -1512,6 +1512,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
roomFragment?.handleRoomMessage(messageEvent)
} else if (msgType == EMMessageInfo.QXRoomMessageTypeSignTipText) {
roomFragment?.handleRoomMessage(messageEvent)
}else if (msgType == EMMessageInfo.QXRoomMessageTypeSignChat) {//暴币展示
QXGiftPlayerManager.getInstance(this).displayFullEffectView(messageEvent.text.play_image)
}
}

7
MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java
View File

@@ -4,8 +4,11 @@ import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.BlindBoxStatus;
import com.xscm.moduleutil.bean.room.RoomSettingBean;
import java.util.List;
public class RoomSettingContacts {
public interface View extends IView<Activity> {
void changeRoomSuccess(String s,int position,RoomSettingBean bean);
@@ -13,6 +16,8 @@ public class RoomSettingContacts {
void changeRoomType(String s);
void agreeSong(String s);
void blindBoxStatus(List<BlindBoxStatus> blindBoxStatus);
}
public interface IRoomPre extends IPresenter {
@@ -22,5 +27,7 @@ public class RoomSettingContacts {
void changeRoomType(String roomId,String type);//修改房间类型 type：1点唱、2拍卖、3男神、4女神
void agreeSong(String roomId, String type);
void blindBoxStatus();
}
}

11
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
View File

@@ -599,18 +599,16 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
case 1033:
case 1032:
case 1039:
case 1049:
postAndAddMessage(message);
break;
case 1038:
addSingleMessage(message);
break;
case 1049:
postAndAddMessage(message);
break;
case 1005:
case 1100:
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).roomInfoEvent(message);
}
@@ -651,6 +649,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
return new EMMessageInfo(message);
case 1005:
case 1100:
if (text.getText() != null) {
return new EMMessageInfo(message);
}
@@ -693,7 +692,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
if (isBottom && easeChatAdapter != null) {
int itemCount = easeChatAdapter.getItemCount();
if (itemCount > 0) {
mBinding.recycleViewPublic.smoothScrollToPosition(itemCount - 1);
mBinding.recycleViewPublic.smoothScrollToPosition(itemCount - 1);
}
} else {
count++;

21
MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomSettingPresenter.java
View File

@@ -3,12 +3,14 @@ package com.xscm.modulemain.activity.room.presenter;
import android.content.Context;
import com.xscm.modulemain.activity.room.contacts.RoomSettingContacts;
import com.xscm.moduleutil.bean.BlindBoxStatus;
import com.xscm.moduleutil.bean.room.RoomSettingBean;
import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.http.RetrofitClient;
import com.xscm.moduleutil.presenter.BasePresenter;
import java.lang.ref.WeakReference;
import java.util.List;
import io.reactivex.disposables.Disposable;
@@ -92,4 +94,23 @@ public class RoomSettingPresenter extends BasePresenter<RoomSettingContacts.View
});
}
@Override
public void blindBoxStatus() {
api.blindBoxStatus(new BaseObserver<List<BlindBoxStatus>>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
}
@Override
public void onNext(List<BlindBoxStatus> blindBoxStatus) {
if (MvpRef==null){
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().blindBoxStatus(blindBoxStatus);
}
});
}
}

11
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java
View File

@@ -99,6 +99,7 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
protected void initView() {
super.initView();
mBinding.topBar.setTitle("每日任务");
mBinding.topBar.setColor(getResources().getColor(R.color.white));
mBinding.topBar.setRightTxtVisible(true);
mBinding.topBar.setRightText("礼盒记录");
mBinding.topBar.setRightColor(ColorManager.getInstance().getPrimaryColorInt());
@@ -168,7 +169,7 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
TextView textView = customView.findViewById(R.id.tabText);
ImageView iconView = customView.findViewById(R.id.tabIcon);
iconView.setImageResource(R.mipmap.icon_task_select_lock);
textView.setTextColor(getResources().getColor(com.xscm.moduleutil.R.color.black));
textView.setTextColor(getResources().getColor(com.xscm.moduleutil.R.color.white));
}
mBinding.viewPager2.setCurrentItem(tab.getPosition());
}
@@ -180,7 +181,7 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
TextView textView = customView.findViewById(R.id.tabText);
ImageView iconView = customView.findViewById(R.id.tabIcon);
iconView.setImageResource(R.mipmap.icon_task_select_unlock);
textView.setTextColor(getResources().getColor(com.xscm.moduleutil.R.color.colorBlack45));
textView.setTextColor(getResources().getColor(com.xscm.moduleutil.R.color.colorWhite45));
}
}
@@ -226,8 +227,14 @@ public class DailyTasksActivity extends BaseMvpActivity<DailyTasksPresenter, Act
TextView textView = customView.findViewById(R.id.tabText);
ImageView iconView = customView.findViewById(R.id.tabIcon);
TextView tabCount = customView.findViewById(R.id.tabCount);
textView.setText(taskItem.getTask_type_name());
if (taskItem.getWait_reward_num()>0){
tabCount.setVisibility(View.VISIBLE);
}else {
tabCount.setVisibility(View.GONE);
}
if (taskItem.getIs_lock() == 1) {
if (i == 0) {
iconView.setImageResource(R.mipmap.icon_task_select_lock);

4
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
View File

@@ -83,6 +83,10 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
if (!hidden) {
// MvpPre.getMyInfo();
// MvpPre.getMemberList(SpUtils.getUserId(), 1);
MvpPre.getMyInfo();
MvpPre.wallet();
MvpPre.getBanners("6");
MvpPre.getTasksMessage();
}
}

19
MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/MePresenter.java
View File

@@ -18,6 +18,7 @@ import io.reactivex.disposables.Disposable;
public class MePresenter extends BasePresenter<MeConacts.View> implements MeConacts.IMePre {
MeConacts.View mView;
public MePresenter(MeConacts.View view, Context context) {
super(view, context);
mView = view;
@@ -33,6 +34,9 @@ public class MePresenter extends BasePresenter<MeConacts.View> implements MeCona
@Override
public void onNext(UserInfo userInfo) {
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().myInfoSuccess(userInfo);
}
});
@@ -182,6 +186,9 @@ public class MePresenter extends BasePresenter<MeConacts.View> implements MeCona
@Override
public void onNext(WalletBean walletBean) {
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().wallet(walletBean);
}
});
@@ -189,7 +196,7 @@ public class MePresenter extends BasePresenter<MeConacts.View> implements MeCona
@Override
public void getTasksMessage() {
api.getTasksMessage(new BaseObserver<TasksMessage> () {
api.getTasksMessage(new BaseObserver<TasksMessage>() {
@Override
public void onSubscribe(Disposable d) {
@@ -198,8 +205,8 @@ public class MePresenter extends BasePresenter<MeConacts.View> implements MeCona
@Override
public void onNext(TasksMessage s) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().getTasksMessage(s);
}
@@ -210,7 +217,7 @@ public class MePresenter extends BasePresenter<MeConacts.View> implements MeCona
// Type listType = new TypeToken<List<BannerModel>>() {}.getType();
// List<BannerModel> restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtils.getHomeBanner(), listType);
// MvpRef.get().setBanners(restoredRoomModels);
api.getBanners(s,new BaseObserver<List<BannerModel>>() {
api.getBanners(s, new BaseObserver<List<BannerModel>>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
@@ -218,8 +225,8 @@ public class MePresenter extends BasePresenter<MeConacts.View> implements MeCona
@Override
public void onNext(List<BannerModel> bannerModels) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().setBanners(bannerModels);
}