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

1:修改点唱房歌手头像转圈

Browse Source 
2：修改主题展示
3：修改动态详情
This commit is contained in:
梁小江
2025-12-30 18:43:00 +08:00
parent ab556d2519
commit aab29ea784
29 changed files with 887 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,16 +111,16 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
private AppUpdateDialog appUpdateDialog;
private boolean isMediaSelected = false;
private int unselectedMediaUrl ; // 从服务器获取
private int selectedMediaUrl ; // 从服务器获取
private int unselectedMediaUrl; // 从服务器获取
private int selectedMediaUrl; // 从服务器获取
// 添加其他 tab 的图标 URL
private int unselectedTrendUrl ;
private int selectedTrendUrl ;
private int unselectedNewsUrl ;
private int selectedNewsUrl ;
private int unselectedMeUrl ;
private int selectedMeUrl ;
private int unselectedTrendUrl;
private int selectedTrendUrl;
private int unselectedNewsUrl;
private int selectedNewsUrl;
private int unselectedMeUrl;
private int selectedMeUrl;
// 添加文字颜色变量
private int selectedTextColor = 0; // 选中文字颜色 (从服务器获取)
@@ -169,7 +169,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
@Override
public void onWindowFocusChanged(boolean hasFocus) {
super.onWindowFocusChanged(hasFocus);
LogUtils.e("MainActivity", "onWindowFocusChanged:"+hasFocus);
LogUtils.e("MainActivity", "onWindowFocusChanged:" + hasFocus);
}
@Override
@@ -207,7 +207,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
CommonAppContext.getInstance().upMqtt();
Application.Companion.getInstance().bgToForeground();
//delete downloaded old Apk
ApkUtil.Companion.deleteOldApk(this,getExternalCacheDir().getAbsolutePath() + "/yusheng.apk");
ApkUtil.Companion.deleteOldApk(this, getExternalCacheDir().getAbsolutePath() + "/yusheng.apk");
}
@Override
@@ -405,7 +405,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
} else if (id == R.id.riv) {
mBinding.coolWaitView.setVisibility(View.VISIBLE);
String roomId = CommonAppContext.getInstance().playId;
LogUtils.e("最小化进入房间："+roomId);
LogUtils.e("最小化进入房间：" + roomId);
if (!TextUtils.isEmpty(roomId)) {
RoomManager.getInstance().fetchRoomDataAndEnter(this, CommonAppContext.getInstance().playId, "", null);
singleTaskToActivity(RoomActivity.class);
@@ -537,7 +537,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
MvpPre.activitiesPermission();//获取悬浮框权限
if (manager != null && !manager.getDownloadState()){
if (manager != null && !manager.getDownloadState()) {
manager.download();
}
@@ -750,7 +750,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
@Override
public void downloading(int max, int progress) {
LogUtils.e("AppUpdate", "downloading："+progress);
LogUtils.e("AppUpdate", "downloading：" + progress);
}
@Override
@@ -859,6 +859,7 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
// }
// }
}
@Override
public void getThemeData(ThemeBean themeBean) {
if (themeBean != null) {
@@ -880,7 +881,11 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
// 获取文字颜色
try {
if (themeBean.getBtn_text_color() != null && !themeBean.getBtn_text_color().isEmpty()) {
selectedTextColor = Color.parseColor("#FF663B");
if (CommonAppContext.getInstance().is_open == 1){
selectedTextColor = Color.parseColor("#FF663B");
}else {
selectedTextColor = Color.parseColor(themeBean.getTheme_color());
}
}
unselectedTextColor = Color.parseColor("#898989");
} catch (Exception e) {
@@ -894,8 +899,8 @@ public class MainActivity extends BaseMvpActivity<HomePresenter, ActivityMainBin
// 更新 UI
updateAllTabUI();
// if (themeBean.getApp_bg() != null) {
BackgroundManager.getInstance().setBackgroundUrl(themeBean.getApp_bg());
loadNetworkBackground();
BackgroundManager.getInstance().setBackgroundUrl(themeBean.getApp_bg());
loadNetworkBackground();
// }
if (themeBean.getTheme_color() != null) {

19
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/PopularRoomActivity.java
View File

@@ -42,6 +42,11 @@ public class PopularRoomActivity extends BaseMvpActivity<VoiceCategoryPresenter,
protected void initView() {
super.initView();
mBinding.topBar.setColor(getResources().getColor(R.color.white));
if (CommonAppContext.getInstance().is_open == 1) {
mBinding.cl.setBackgroundResource(com.xscm.moduleutil.R.mipmap.bg_dark);
} else {
mBinding.cl.setBackgroundResource(com.xscm.moduleutil.R.mipmap.home_bj);
}
}
@Override
@@ -67,19 +72,19 @@ public class PopularRoomActivity extends BaseMvpActivity<VoiceCategoryPresenter,
@Override
public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
page++;
MvpPre.getCarousels(1, page, "20", "2", "");
MvpPre.getCarousels(1, page, "20", "2", "");
}
@Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
page = 1;
mAdapter.setNewData(new ArrayList<>());
MvpPre.getCarousels(1, page, "20", "2", "");
MvpPre.getCarousels(1, page, "20", "2", "");
}
});
mAdapter.setOnRoomClickListener((room, position) -> {
if ( ClickUtils.isFastDoubleClick(mBinding.rvPopularRoom)){
if (ClickUtils.isFastDoubleClick(mBinding.rvPopularRoom)) {
return;
}
@@ -88,10 +93,10 @@ public class PopularRoomActivity extends BaseMvpActivity<VoiceCategoryPresenter,
return;
}
TopRoom item = mAdapter.getItem(position);
if (item != null ) {
if (item != null) {
mBinding.coolWaitView.setVisibility(View.VISIBLE);
MessageListenerSingleton.getInstance().joinGroup(item.getRoom_id());
RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), item.getRoom_id(), "",null);
RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), item.getRoom_id(), "", null);
}
});
@@ -108,7 +113,7 @@ public class PopularRoomActivity extends BaseMvpActivity<VoiceCategoryPresenter,
@Override
protected void onResume() {
super.onResume();
page=1;
page = 1;
MvpPre.getCarousels(1, page, "10", "2", "");//顶部推荐
}
@@ -126,7 +131,7 @@ public class PopularRoomActivity extends BaseMvpActivity<VoiceCategoryPresenter,
public void finishRefreshLoadMore() {
mBinding.smartRefreshLayout.finishRefresh();
mBinding.smartRefreshLayout.finishLoadMore();
CommonAppContext.getInstance().isRoomJoininj=false;
CommonAppContext.getInstance().isRoomJoininj = false;
}
@Override

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

@@ -106,6 +106,7 @@ import com.xscm.moduleutil.base.CommonAppContext
import com.xscm.moduleutil.bean.GiftBean
import com.xscm.moduleutil.bean.HeadlineBean
import com.xscm.moduleutil.bean.MqttXlhEnd
import com.xscm.moduleutil.bean.RedPacketConfig
import com.xscm.moduleutil.bean.RedPacketInfo
import com.xscm.moduleutil.bean.RoomCharmRankBean
import com.xscm.moduleutil.bean.RoomGiftData
@@ -238,6 +239,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
//用户列表用
private var mOnlineBean: RoomOnline? = null
var redPacketConfig : RedPacketConfig= RedPacketConfig()
override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_DOWN) {
@@ -1083,7 +1085,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// TODO: 发红包
fun redDialogView() {
RedBagSendDialog(this, roomId).show()
RedBagSendDialog(this, roomId,redPacketConfig).show()
}
var redEnvelopesFragment: RedEnvelopesFragment? = null
@@ -3516,6 +3518,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
// .joinRoom(SpUtil.getRtmToken(), roomId, SpUtil.getUserId(), false, false);
// MvpPre?.postRoomInfo(roomId)
MvpPre?.getTasksMessage()
MvpPre?.getRedpacketConfig()
}
fun refreshRoomInfo(roomId: String) {
@@ -3821,6 +3824,11 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
}
override fun getRedpacketConfig(data: RedPacketConfig?) {
this.redPacketConfig= data!!
}
fun getTasksMessageService(number: Int) {
mBinding?.tvTaskMessage?.text = "+" + number
if (number == 0) {

5
MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java
View File

@@ -4,6 +4,7 @@ import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.RedPacketConfig;
import com.xscm.moduleutil.bean.RedPacketInfo;
import com.xscm.moduleutil.bean.RoomCharmRankBean;
import com.xscm.moduleutil.bean.TasksMessage;
@@ -55,6 +56,8 @@ public class RoomContacts {
void roomRedPackets(List<RedPacketInfo> list);
void getTasksMessage(TasksMessage data);
void getRedpacketConfig(RedPacketConfig data);
}
public interface IRoomPre extends IPresenter {
@@ -98,5 +101,7 @@ public class RoomContacts {
void roomRedPackets(String roomId);
void getTasksMessage();
void getRedpacketConfig();
}
}

3
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestSongFragment.java
View File

@@ -70,7 +70,8 @@ public class RequestSongFragment extends BaseMvpDialogFragment<RequestSongPresen
zcUserId= getArguments().getString("zcUserId");
// 创建适配器
pagerAdapter = new RequestSongPagerAdapter(zcUserId,getActivity());
// 禁用ViewPager2的滑动
mBinding.viewPager.setUserInputEnabled(false);
// 设置适配器
mBinding.viewPager.setAdapter(pagerAdapter);

40
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomAuctionFragment.java
View File

@@ -9,6 +9,7 @@ import android.app.AlertDialog;
import android.content.Context;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
@@ -105,6 +106,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
// 确保 overlay buttons 已初始化
initOverlayButtons();
}
public void upRoomInfoResp(RoomInfoResp roomInfoResp) {
this.roomInfoResp = roomInfoResp;
}
@@ -124,7 +126,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
((RoomActivity) getActivity()).setvisibTop(true);
}
if (!roomInfoResp.getRoom_info().getPit_list().isEmpty()){
if (!roomInfoResp.getRoom_info().getPit_list().isEmpty()) {
mBinding.roomMakeWheat.setData(roomInfoResp.getRoom_info().getPit_list().get(0));
}
@@ -217,7 +219,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
}
tzblChanged();//获取在线列表数据
RoomPitBean roomPitBean2 = wheatView.pitBean;
if (roomPitBean2 != null && roomPitBean2.getUser_id() != null && !roomPitBean2.getUser_id().equals("0")) {
@@ -413,7 +414,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (wheatView2.getUserId().equals("")) {
if ((wheatView.getUserId() != null && wheatView.getUserId().equals(SpUtil.getUserId() + "") || getHostUser() < 4)) {
if (getActivity() != null && getActivity() instanceof RoomActivity) {
((RoomActivity)getActivity()).showUserListDialog(roomInfoResp.getRoom_info().getRoom_id(), 888 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
((RoomActivity) getActivity()).showUserListDialog(roomInfoResp.getRoom_info().getRoom_id(), 888 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
}
}
} else {
@@ -583,7 +584,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
mBinding.tvRelation.setBackgroundResource(com.xscm.moduleutil.R.mipmap.za_maiw_b);
mBinding.btnGift.setImageResource(com.xscm.moduleutil.R.mipmap.za_l);
mBinding.tvGift.setTextColor(ContextCompat.getColor(requireContext(), com.xscm.moduleutil.R.color.color_white));
mBinding.tvGift.setBackgroundResource(com.xscm.moduleutil.R.mipmap.za_maiw_b);
mBinding.tvGift.setBackgroundResource(com.xscm.moduleutil.R.drawable.layer_drawable);
mBinding.btnTime.setImageResource(com.xscm.moduleutil.R.mipmap.za_sj);
mBinding.tvTimetg.setTextColor(ContextCompat.getColor(requireContext(), com.xscm.moduleutil.R.color.color_white));
mBinding.tvTimetg.setBackgroundResource(com.xscm.moduleutil.R.mipmap.za_maiw_b);
@@ -617,6 +618,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
mBinding.btnGift.setImageResource(com.xscm.moduleutil.R.mipmap.liwu);
mBinding.tvGift.setTextColor(ContextCompat.getColor(requireContext(), com.xscm.moduleutil.R.color.color_FF999999));
mBinding.tvGift.setBackgroundResource(0);
mBinding.tvGift.setCompoundDrawablesRelativeWithIntrinsicBounds(com.xscm.moduleutil.R.mipmap.jinb,0,0,0);
mBinding.btnTime.setImageResource(com.xscm.moduleutil.R.mipmap.shij);
mBinding.tvTimetg.setTextColor(ContextCompat.getColor(requireContext(), com.xscm.moduleutil.R.color.color_FF999999));
mBinding.tvTimetg.setBackgroundResource(0);
@@ -725,8 +727,24 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
private void gengv() {
if (auctionUserBean != null) {
mBinding.tvRelation.setText(auctionUserBean.getRelation_name());
mBinding.tvTimetg.setText(auctionUserBean.getTime_day() + "小时");
mBinding.tvGift.setText(auctionUserBean.getGift_name());
if (type == 1) {
mBinding.tvTimetg.setText(auctionUserBean.getTime_day() + "小时");
} else {
try {
String timeDay = auctionUserBean.getTime_day();
if (!TextUtils.isEmpty(timeDay)) {
int days = Integer.parseInt(timeDay) / 24;
mBinding.tvTimetg.setText(days + "天");
} else {
mBinding.tvTimetg.setText("0天");
}
} catch (NumberFormatException e) {
mBinding.tvTimetg.setText("0天");
}
}
// mBinding.tvTimetg.setText(auctionUserBean.getTime_day() + "小时");
mBinding.tvGift.setText(auctionUserBean.getGift_price());
ImageUtils.loadHeadCC(auctionUserBean.getBase_image(), mBinding.btnGift);
// auctionId=auctionUserBean.getAuction_id();
SpUtil.setAuctionId(auctionUserBean.getAuction_id());
@@ -913,10 +931,10 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
} else if (messageEvent.getText().getPit_number().equals("888")) {
wheatView2.setData(getPitBean2(messageEvent, "888"));
try {
if (dialogFragment != null){
if (dialogFragment != null) {
dialogFragment.dismiss();
}
}catch (Exception e){
} catch (Exception e) {
LogUtils.e("RoomAuctionFragment", "event1022: " + e.getMessage());
}
}
@@ -990,9 +1008,9 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
getvjs();
// imActionYs.setVisibility(GONE);
if (getActivity() instanceof RoomActivity) {
if (getHostUser() < 4){
if (getHostUser() < 4) {
((RoomActivity) getActivity()).upJs(true);
}else {
} else {
((RoomActivity) getActivity()).upJs(false);
}
}
@@ -1119,7 +1137,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
mBinding.tvDjTime.setVisibility(INVISIBLE);
mBinding.tvRelation.setText("关系");
mBinding.tvTimetg.setText("时间");
mBinding.tvGift.setText("礼物");
mBinding.tvGift.setText("金额");
mBinding.btnGift.setImageResource(com.xscm.moduleutil.R.mipmap.liwu);
closeCardRelationshipFragment();//这是当抱麦上的人没有选择关系后，主持有权利结束这个游戏，并且关闭弹框

6
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java
View File

@@ -26,6 +26,7 @@ import com.xscm.modulemain.databinding.FragmentRoomBinding;
import com.xscm.modulemain.dialog.WheatFeedingDialogFragment;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.RedPacketConfig;
import com.xscm.moduleutil.bean.RedPacketInfo;
import com.xscm.moduleutil.bean.RoomCharmRankBean;
import com.xscm.moduleutil.bean.RoomMessageEvent;
@@ -677,6 +678,11 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
}
@Override
public void getRedpacketConfig(RedPacketConfig data) {
}
public void getVoiceStatus(RoomAuction.AuctionUserBean auctionUserBean, List<RoomAuction.AuctionListBean> auctionListBeans, String user_id) {
boolean haveMe = false;

22
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java
View File

@@ -10,6 +10,9 @@ import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.view.animation.LinearInterpolator;
import android.widget.CompoundButton;
import android.widget.PopupWindow;
import android.widget.Switch;
@@ -397,6 +400,19 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
}
}
public void startRotateAnimation() {
Animation rotateAnimation = AnimationUtils.loadAnimation(getContext(), com.xscm.moduleutil.R.anim.image_rotate);
LinearInterpolator lin = new LinearInterpolator();
rotateAnimation.setInterpolator(lin);
mBinding.ciUserAva.setAnimation(rotateAnimation);
}
//关闭旋转
public void endRotateAnimation() {
mBinding.ciUserAva.clearAnimation();
mBinding.ciUserAva.setAnimation(null);
}
@Override
protected int getLayoutId() {
return R.layout.fragment_jukebox;
@@ -462,7 +478,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
ImageUtils.loadHeadCC(roomInfoResp.getSinger_info().getSong_info().getBoss_avatar(), mBinding.ciNetAva);
mBinding.tvNetName.setText("老板");
songId = roomInfoResp.getSinger_info().getSong_info().getId();
startRotateAnimation();
if (roomInfoResp.getSinger_info().getNext_song_info() != null) {
mBinding.guestContainer.setVisibility(View.VISIBLE);
ImageUtils.loadHeadCC(roomInfoResp.getSinger_info().getNext_song_info().getSinger_avatar(), mBinding.ciGsAva);
@@ -492,6 +508,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
mBinding.ciNetAva.setVisibility(GONE);
mBinding.tvSong.setText("演唱歌曲：无");
mBinding.imQg.setVisibility(GONE);
endRotateAnimation();
}
}
@@ -664,7 +681,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
ImageUtils.loadHead(messageEvent.getText().getSong_info().getSinger_avatar(), mBinding.ciUserAva);
mBinding.tvSong.setText("演唱歌曲：" + messageEvent.getText().getSong_info().getSong_name());
startRotateAnimation();
roomInfoResp.getSinger_info().setSong_info(messageEvent.getText().getSong_info());
ImageUtils.loadHead(messageEvent.getText().getSong_info().getBoss_avatar(), mBinding.ciNetAva);
mBinding.tvNetName.setText("老板");
@@ -692,6 +709,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
mBinding.tvNetName.setVisibility(GONE);
mBinding.ciNetAva.setVisibility(GONE);
mBinding.tvSong.setText("演唱歌曲：无");
endRotateAnimation();
}
}

6
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
View File

@@ -27,6 +27,7 @@ import com.xscm.modulemain.generated.callback.OnClickListener;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.MusicSongBean;
import com.xscm.moduleutil.bean.RedPacketConfig;
import com.xscm.moduleutil.bean.RedPacketInfo;
import com.xscm.moduleutil.bean.RoomCharmRankBean;
import com.xscm.moduleutil.bean.RoomMessageEvent;
@@ -1123,4 +1124,9 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
}
@Override
public void getRedpacketConfig(RedPacketConfig data) {
}
}

4
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomNoticeDialogFragment.java
View File

@@ -1,6 +1,7 @@
package com.xscm.modulemain.activity.room.fragment;
import android.content.Context;
import android.text.method.ScrollingMovementMethod;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
@@ -37,7 +38,7 @@ public class RoomNoticeDialogFragment extends BaseDialog {
tvTile=findViewById(R.id.tv_title);
tvContent=findViewById(R.id.tv_content);
ivClose=findViewById(R.id.iv_close);
tvContent.setMovementMethod(ScrollingMovementMethod.getInstance());
}
@Override
@@ -54,6 +55,7 @@ public class RoomNoticeDialogFragment extends BaseDialog {
public void setContent(String content) {
tvContent.setText(content);
}
public void setTitle(String title) {
tvTile.setText(title);

19
MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPresenter.java
View File

@@ -9,6 +9,7 @@ import com.blankj.utilcode.util.LogUtils;
import com.xscm.modulemain.activity.room.contacts.RoomContacts;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.BeforeJoinRoomCheckBean;
import com.xscm.moduleutil.bean.RedPacketConfig;
import com.xscm.moduleutil.bean.RedPacketInfo;
import com.xscm.moduleutil.bean.RoomCharmRankBean;
import com.xscm.moduleutil.bean.TasksMessage;
@@ -501,4 +502,22 @@ public class RoomPresenter extends BasePresenter<RoomContacts.View> implements R
}
});
}
@Override
public void getRedpacketConfig() {
api.getRedpacketConfig(new BaseObserver<RedPacketConfig>(){
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
}
@Override
public void onNext(RedPacketConfig redPacketConfig) {
if (MvpRef==null)
MvpRef=new WeakReference<>(mView);
MvpRef.get().getRedpacketConfig(redPacketConfig);
}
});
}
}

2
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/CreatedRoomActivity.java
View File

@@ -52,7 +52,7 @@ public class CreatedRoomActivity extends BaseMvpActivity<CreatedRoomPresenter, A
public String from;
private String roomUrl;
final int maxNum = 120;
final int maxNum = 500;
CustomPopWindow popupWindow;
private Handler handler = new Handler(Looper.getMainLooper());

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

@@ -170,6 +170,7 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
if (CommonAppContext.getInstance().is_open==1) {
mBinding.nestedVocal.setBackgroundResource(BackgroundManager.getInstance().getBackgroundUrl());
mBinding.imMeFamily.setImageResource(com.xscm.moduleutil.R.mipmap.icon_wdjz);
mBinding.imDan.setImageResource(com.xscm.moduleutil.R.mipmap.icon_dj);
mBinding.imPersonality.setImageResource(com.xscm.moduleutil.R.mipmap.icon_gxzb);
@@ -182,6 +183,7 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
mBinding.imMeSetting.setImageResource(com.xscm.moduleutil.R.mipmap.icon_sz);
}else {
mBinding.nestedVocal.setBackgroundResource(com.xscm.moduleutil.R.mipmap.home_bj);
mBinding.imMeFamily.setImageResource(R.mipmap.icon_me_family);
mBinding.imDan.setImageResource(com.xscm.moduleutil.R.mipmap.my_dan);
mBinding.imPersonality.setImageResource(com.xscm.moduleutil.R.mipmap.personality);
@@ -192,8 +194,8 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
mBinding.imMePlaylist.setImageResource(R.mipmap.but_me_playlist);
mBinding.imMeSetting.setImageResource(com.xscm.moduleutil.R.mipmap.me_setting);
mBinding.imMeInvitation.setImageResource(com.xscm.moduleutil.R.mipmap.me_invitation);
}
}

23
MainModule/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java
View File

@@ -20,6 +20,7 @@ import com.xscm.modulemain.R;
import com.xscm.modulemain.databinding.DialogRedBagSendBinding;
import com.hjq.toast.ToastUtils;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.RedPacketConfig;
import com.xscm.moduleutil.bean.WalletBean;
import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.http.RetrofitClient;
@@ -42,10 +43,12 @@ public class RedBagSendDialog extends BaseDialog<DialogRedBagSendBinding> {
private int redGold=1;//红包类型 0：金币红包 1：钻石红包
private int redCount;//条件 0：无 1：收藏房间 2：仅麦上用户
private String roomId;
private RedPacketConfig redPacketConfig;
public RedBagSendDialog(@NonNull @NotNull Context context, String roomId ) {
public RedBagSendDialog(@NonNull @NotNull Context context, String roomId,RedPacketConfig redPacketConfig) {
super(context, com.xscm.moduleutil.R.style.BaseDialogStyleH);
this.roomId = roomId;
this.redPacketConfig= redPacketConfig;
}
@Override
@@ -247,6 +250,8 @@ public class RedBagSendDialog extends BaseDialog<DialogRedBagSendBinding> {
mBinding.btMicUser.setSelected(!mBinding.btMicUser.isSelected());
}
});
}
private void sendRedPacket() {
// 获取输入值
@@ -270,6 +275,18 @@ public class RedBagSendDialog extends BaseDialog<DialogRedBagSendBinding> {
ToastUtils.show("请输入金额");
return;
}
try {
int textValue = Integer.parseInt(textStr);
if (textValue < redPacketConfig.getRed_packet_min_amount()) {
// 你的逻辑
diaj=false;
ToastUtils.show("金额不能小于10");
return;
}
} catch (NumberFormatException e) {
ToastUtils.show("请输入有效的数字");
return;
}
if (redType == 2 && TextUtils.isEmpty(kl)) {
diaj=false;
@@ -369,6 +386,7 @@ public class RedBagSendDialog extends BaseDialog<DialogRedBagSendBinding> {
mBinding.lBz.setVisibility(GONE);
mBinding.wvWeb.setVisibility(GONE);
mBinding.butSub.setVisibility(VISIBLE);
mBinding.tvZy.setVisibility(GONE);
mBinding.butSub.setText("下一步");
mBinding.imHelp.setImageResource(com.xscm.moduleutil.R.drawable.room_redbag_help);
stype = 1;
@@ -385,6 +403,7 @@ public class RedBagSendDialog extends BaseDialog<DialogRedBagSendBinding> {
mBinding.lBz.setVisibility(VISIBLE);
mBinding.wvWeb.setVisibility(GONE);
mBinding.butSub.setVisibility(VISIBLE);
mBinding.tvZy.setVisibility(VISIBLE);
mBinding.butSub.setText("发红包");
mBinding.imHelp.setImageResource(com.xscm.moduleutil.R.drawable.room_redbag_help);
stype = 2;
@@ -402,6 +421,7 @@ public class RedBagSendDialog extends BaseDialog<DialogRedBagSendBinding> {
mBinding.lBz.setVisibility(GONE);
mBinding.wvWeb.setVisibility(VISIBLE);
mBinding.butSub.setVisibility(GONE);
mBinding.tvZy.setVisibility(GONE);
mBinding.imHelp.setImageResource(com.xscm.moduleutil.R.drawable.room_redbag_back);
break;
default:
@@ -416,6 +436,7 @@ public class RedBagSendDialog extends BaseDialog<DialogRedBagSendBinding> {
}
private void setFRed() {
mBinding.tvZy.setText("注：发送红包，将固定收取 "+redPacketConfig.getRed_packet_fee()+"金币 作为手续费（用于系统处理、安全验证及服务维护");
if (redGold == 1) {
mBinding.tvJeTitle.setText(walletBean.getCoin() != null ? walletBean.getCoin() : "0" + "金币可用");
mBinding.tvJ.setText("金币");

1
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomAuctionWebViewDialog.java
View File

@@ -117,6 +117,7 @@ public class RoomAuctionWebViewDialog extends BaseDialog<DialogRoomAuctionWebvie
webSettings.setLoadWithOverviewMode(true);
webSettings.setJavaScriptEnabled(true);
webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE); //关闭webview中缓存
//增加JSBridge
mBinding.webView.addJavascriptInterface(new WebAppInterface(getContext()), "Android");
// mBinding.webView.addJavascriptInterface(new WebViewBridgeConfig(title), WebViewBridgeConfig.NAME);

6
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java
View File

@@ -19,6 +19,7 @@ import com.xscm.modulemain.activity.room.presenter.RoomPresenter;
import com.xscm.modulemain.adapter.RoomOnlineAdapter;
import com.xscm.modulemain.databinding.FragmentRoomOnlineDialogBinding;
import com.xscm.moduleutil.base.BaseMvpDialogFragment;
import com.xscm.moduleutil.bean.RedPacketConfig;
import com.xscm.moduleutil.bean.RedPacketInfo;
import com.xscm.moduleutil.bean.RoomCharmRankBean;
import com.xscm.moduleutil.bean.TasksMessage;
@@ -392,4 +393,9 @@ public class RoomOnlineDialogFragment extends BaseMvpDialogFragment<RoomPresente
}
@Override
public void getRedpacketConfig(RedPacketConfig data) {
}
}

4
MainModule/src/main/res/layout/activity_created_room.xml
View File

@@ -168,7 +168,7 @@
android:background="@android:color/transparent"
android:gravity="left|top"
android:hint="设置房间公告"
android:maxLength="120"
android:maxLength="500"
android:textColor="#333333"
android:textColorHint="@color/color_FF666666"
android:textSize="@dimen/sp_15" />
@@ -180,7 +180,7 @@
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="@dimen/dp_16"
android:text="0/20"
android:text="0/500"
android:textColor="@color/color_FF666666"
android:textSize="@dimen/sp_14" />
</RelativeLayout>

191
MainModule/src/main/res/layout/activity_dynamic_detail.xml
View File

@@ -19,109 +19,120 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- 主内容 RecyclerView -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycle_view"
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_6"
android:paddingRight="@dimen/dp_6"
android:paddingBottom="@dimen/dp_12"
tools:itemCount="1"
tools:listitem="@layout/item_cirle_list" />
<!-- 评论列表 ScrollView -->
<ScrollView
android:id="@+id/scroll_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@drawable/bg_r16_fff">
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- 全部评论标题 -->
<TextView
android:id="@+id/tv_num"
<!-- 主内容 RecyclerView -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycle_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_6"
android:paddingRight="@dimen/dp_6"
android:paddingBottom="@dimen/dp_12"
tools:itemCount="1"
tools:listitem="@layout/item_cirle_list" />
<!-- 评论列表 ScrollView -->
<!-- <ScrollView-->
<!-- android:id="@+id/scroll_view"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="0dp"-->
<!-- android:layout_weight="1"-->
<!-- android:background="@drawable/bg_r16_fff">-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:gravity="center|left"
android:text="全部评论(0)"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_16"
android:textStyle="bold" />
android:orientation="vertical">
<!-- 刷新控件包裹的评论 RecyclerView -->
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/srl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:srlEnableLoadMore="false"
app:srlEnableRefresh="false">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_comment"
<!-- 全部评论标题 -->
<TextView
android:id="@+id/tv_num"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:gravity="center|left"
android:text="全部评论(0)"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_16"
android:textStyle="bold" />
<!-- &lt;!&ndash; 分割线 &ndash;&gt;-->
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="@dimen/dp_0_5"-->
<!-- android:background="#ccc" />-->
<!-- 刷新控件包裹的评论 RecyclerView -->
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/srl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:srlEnableLoadMore="false"
app:srlEnableRefresh="false">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_comment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<!-- &lt;!&ndash; 分割线 &ndash;&gt;-->
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="@dimen/dp_0_5"-->
<!-- android:background="#ccc" />-->
</LinearLayout>
<!-- 输入区域，始终位于底部 -->
<LinearLayout
android:id="@+id/cl_input"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_70"
android:background="#ffffff"
android:orientation="horizontal"
android:paddingVertical="@dimen/dp_8">
<EditText
android:id="@+id/et_input"
android:layout_width="0dp"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_8"
android:layout_weight="1"
android:background="@drawable/bg_r80_hui"
android:gravity="center_vertical"
android:hint="就差你一个神评论~"
android:paddingStart="@dimen/dp_12"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_send"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_send"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_12"
android:background="@drawable/cs"
android:gravity="center"
android:text="发送"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
</ScrollView>
<!-- 输入区域，始终位于底部 -->
<LinearLayout
android:id="@+id/cl_input"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_70"
android:background="#ffffff"
android:orientation="horizontal"
android:paddingVertical="@dimen/dp_8">
<EditText
android:id="@+id/et_input"
android:layout_width="0dp"
android:layout_height="@dimen/dp_40"
android:layout_weight="1"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_8"
android:background="@drawable/bg_r80_hui"
android:gravity="center_vertical"
android:hint="就差你一个神评论~"
android:paddingStart="@dimen/dp_12"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toStartOf="@+id/tv_send"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
<TextView
android:id="@+id/tv_send"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_12"
android:background="@drawable/cs"
android:gravity="center"
android:text="发送"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>
</layout>

77
MainModule/src/main/res/layout/activity_popular_room.xml
View File

@@ -1,60 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main"
tools:context=".activity.PopularRoomActivity">
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".activity.PopularRoomActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/home_bj"
>
android:id="@+id/cl"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/home_bj">
<com.xscm.moduleutil.widget.CustomTopBar
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
app:TopBarTitle="热门房间"
android:clickable="true"
android:focusable="true"
app:layout_constraintTop_toTopOf="parent"/>
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:background="@color/transparent"
android:clickable="true"
android:focusable="true"
app:TopBarTitle="热门房间"
app:layout_constraintTop_toTopOf="parent" />
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/smart_refresh_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:srlEnableLoadMore="true"
app:srlEnableRefresh="true"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@+id/top_bar">
android:id="@+id/smart_refresh_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@+id/top_bar"
app:srlEnableLoadMore="true"
app:srlEnableRefresh="true">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_popular_room"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_6"
android:paddingRight="@dimen/dp_6"
android:paddingBottom="@dimen/dp_80"
tools:listitem="@layout/item_popular_room"/>
android:id="@+id/rv_popular_room"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_6"
android:paddingRight="@dimen/dp_6"
android:paddingBottom="@dimen/dp_80"
tools:listitem="@layout/item_popular_room" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<RelativeLayout
android:id="@+id/cool_wait_view"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:focusable="true"
app:layout_constraintTop_toTopOf="parent"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="match_parent"
android:layout_height="match_parent">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<app.dinus.com.loadingdrawable.LoadingView
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_100"

1039
MainModule/src/main/res/layout/dialog_red_bag_send.xml
View File

File diff suppressed because it is too large Load Diff

5
MainModule/src/main/res/layout/fragment_jukebox.xml
View File

@@ -64,8 +64,9 @@
<com.xscm.moduleutil.widget.CircularImage
android:id="@+id/ci_user_ava"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_70"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="@+id/im_performer"
app:layout_constraintEnd_toEndOf="@+id/im_performer"
app:layout_constraintStart_toStartOf="@+id/im_performer"

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

@@ -165,7 +165,7 @@
android:id="@+id/btn_relation"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_10"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:src="@mipmap/guanx"
@@ -192,7 +192,7 @@
android:id="@+id/btn_gift"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_15"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:src="@mipmap/liwu"
@@ -205,7 +205,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_1"
android:text="礼物"
android:text="金额"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12"
android:gravity="center"
@@ -218,7 +218,7 @@
android:id="@+id/btn_time"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_15"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:src="@mipmap/shij"

2
MainModule/src/main/res/layout/fragment_room_notice_dialog.xml
View File

@@ -44,10 +44,12 @@
android:id="@+id/tv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxHeight="@dimen/dp_150"
android:layout_marginStart="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_18"
android:layout_marginBottom="@dimen/dp_47"
android:scrollbars="vertical"
android:text="房间公告"
android:gravity="left|center"
android:textColor="@color/color_FF666666"

1
MainModule/src/main/res/layout/fragment_vocal_range.xml
View File

@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools">
<androidx.core.widget.NestedScrollView
android:id="@+id/nested_vocal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"