MY_YULIAO/myyuliao-android
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1:修改页面的图标

Browse Source
This commit is contained in:
梁小江
2025-09-24 17:19:02 +08:00
parent e03ccb91dc
commit b4eb142c86
166 changed files with 3486 additions and 18295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,14 +250,14 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
// mRoomInfoResp = (RoomInfoResp) getIntent().getSerializableExtra("roomInfo");
if (roomId.equals(mRoomId) || TextUtils.isEmpty(mRoomId)) {
sDestroied = false;
if (mRoomInfoResp==null){
mRoomInfoResp=AppStateManager.getInstance().getRoomInfo();
if (mRoomInfoResp == null) {
mRoomInfoResp = AppStateManager.getInstance().getRoomInfo();
}
if (!isOnline) {
releaseRoom();
startActivity(intent);
finish();
}else {
} else {
MvpPre.postRoomInfo(roomId);
}
@@ -424,12 +424,17 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
// // 保持Activity alive，不调用finish()
// minimizeToBackground();
// }
if (mRoomInfoResp!=null) {
if (!mRoomInfoResp.getRoom_info().getType_id().equals("6")) {
// 只有在用户主动离开应用时才执行最小化操作
if (!userLeaving) {
// 保持Activity alive，不调用finish()
// 只有在用户主动离开应用时才执行最小化操作
if (!userLeaving) {
// 保持Activity alive，不调用finish()
minimizeToBackground();
userLeaving = false; // 重置标记
minimizeToBackground();
userLeaving = false; // 重置标记
}
}
userLeaving = true;
}
}
@@ -1368,10 +1373,31 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
} else if (msgType == 1024) {
handleMsgType1024(messageEvent, text);
} else if (msgType == 1025) {
if (roomFragment == null) {
roomFragment = RoomFragment.newInstance();
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.vp_room_pager, roomFragment)
.commitAllowingStateLoss();
}
roomFragment.handleAuctionMessageEvent(messageEvent);
} else if (msgType == 1026) {
if (roomFragment == null) {
roomFragment = RoomFragment.newInstance();
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.vp_room_pager, roomFragment)
.commitAllowingStateLoss();
}
roomFragment.handleAuctionMessageEvent(messageEvent);
} else if (msgType == 1027) {
if (roomFragment == null) {
roomFragment = RoomFragment.newInstance();
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.vp_room_pager, roomFragment)
.commitAllowingStateLoss();
}
roomFragment.handleAuctionMessageEvent(messageEvent);
} else if (msgType == 1020) {
handleMsgType1020(messageEvent, text);
@@ -1394,6 +1420,13 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
} else if (msgType == 1051) {
handleMsgType1051(messageEvent, text);
} else if (msgType == 1052) {
if (roomFragment == null) {
roomFragment = RoomFragment.newInstance();
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.vp_room_pager, roomFragment)
.commitAllowingStateLoss();
}
roomFragment.upCabinFragment(text.getTime_day());
} else if (msgType == 1053) {
handleMsgType1053(messageEvent, text);
@@ -1404,6 +1437,13 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
} else if (msgType == 1035) {
handleMsgType1035(messageEvent, text);
} else if (msgType == 1030 || msgType == 1031 || msgType == 1032 || msgType == 1033 || msgType == 1015 || msgType == 1037) {
if (roomFragment == null) {
roomFragment = RoomFragment.newInstance();
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.vp_room_pager, roomFragment)
.commitAllowingStateLoss();
}
roomFragment.SingSongEvent(messageEvent);
if (msgType == 1032 || msgType == 1033) {
setRoleType(3, -11);
@@ -1423,8 +1463,44 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
} else if (msgType == 1039) {
handleMsgType1039(messageEvent, text);
} else if (msgType == 1028) {
if (roomFragment == null) {
roomFragment = RoomFragment.newInstance();
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.vp_room_pager, roomFragment)
.commitAllowingStateLoss();
}
roomFragment.handleMsgType1028(messageEvent);
} else if (msgType == 1059 || msgType == 1058) {// 1059清除个人魅力 1058在离线
}else if ( msgType == 1058) {
if (roomFragment == null) {
roomFragment = RoomFragment.newInstance();
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.vp_room_pager, roomFragment)
.commitAllowingStateLoss();
}
if (mRoomInfoResp != null && mRoomInfoResp.getRoom_info() != null) {
if (mRoomInfoResp.getRoom_info().getType_id().equals("1") || mRoomInfoResp.getRoom_info().getType_id().equals("3") ||
mRoomInfoResp.getRoom_info().getType_id().equals("4") || mRoomInfoResp.getRoom_info().getType_id().equals("8")) {
if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) {
roomFragment.SingSongEvent(messageEvent);
} else {
roomFragment.KtvFragmentEvent(messageEvent);
}
} else if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {
roomFragment.handleAuctionMessageEvent(messageEvent);
} else if (mRoomInfoResp.getRoom_info().getType_id().equals("7")) {
roomFragment.friendshipRoomFragmentEvent(messageEvent);
}
}
} else if (msgType == 1059) {// 1059清除个人魅力 1058在离线
if (roomFragment == null) {
roomFragment = RoomFragment.newInstance();
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.vp_room_pager, roomFragment)
.commitAllowingStateLoss();
}
if (mRoomInfoResp != null && mRoomInfoResp.getRoom_info() != null) {
if (mRoomInfoResp.getRoom_info().getType_id().equals("1") || mRoomInfoResp.getRoom_info().getType_id().equals("3") ||
mRoomInfoResp.getRoom_info().getType_id().equals("4") || mRoomInfoResp.getRoom_info().getType_id().equals("8")) {
@@ -1702,6 +1778,13 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
private void handleMsgType1003(RoomMessageEvent messageEvent, RoomMessageEvent.T text) {
if (text == null || mRoomInfoResp == null || mRoomInfoResp.getRoom_info() == null) return;
if (roomFragment == null) {
roomFragment = RoomFragment.newInstance();
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.vp_room_pager, roomFragment)
.commitAllowingStateLoss();
}
UserInfo fromUserInfo = text.getFromUserInfo();
if (fromUserInfo == null) return;
@@ -2530,18 +2613,22 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
// 添加前后台状态检测
private boolean isAppInForeground() {
ActivityManager activityManager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
List<ActivityManager.RunningAppProcessInfo> appProcesses = activityManager.getRunningAppProcesses();
if (appProcesses == null) {
return false;
}
final String packageName = getPackageName();
for (ActivityManager.RunningAppProcessInfo appProcess : appProcesses) {
if (appProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
&& appProcess.processName.equals(packageName)) {
return true;
if (!mRoomInfoResp.getRoom_info().getLabel_id().equals("6")) {
ActivityManager activityManager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
List<ActivityManager.RunningAppProcessInfo> appProcesses = activityManager.getRunningAppProcesses();
if (appProcesses == null) {
return false;
}
final String packageName = getPackageName();
for (ActivityManager.RunningAppProcessInfo appProcess : appProcesses) {
if (appProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
&& appProcess.processName.equals(packageName)) {
return true;
}
}
}else {
return true ;
}
return false;
}
@@ -3641,7 +3728,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
private void resetFragment() {
String typeId = mRoomInfoResp.getRoom_info().getType_id();
String labelId = mRoomInfoResp.getRoom_info().getLabel_id();
CommonAppContext.getInstance().lable_id = typeId;
if (roomFragment == null) {
roomFragment = RoomFragment.newInstance();
getSupportFragmentManager()
@@ -3682,6 +3769,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
} else if ("6".equals(typeId)) {
changeBackground(com.xscm.moduleutil.R.mipmap.cabin_bj);
setvisibTop(false);
// sharedViewModel.setSeatViewType(QXRoomSeatViewType.CABIN);
roomFragment.refreshData(mRoomInfoResp, QXRoomSeatViewType.CABIN);
}

8
moduleroom/src/main/java/com/example/moduleroom/adapter/EaseChatAdapter.java
View File

@@ -192,8 +192,8 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
if (url.contains("http")) {
ImageView imageView = new ImageView(helper.itemView.getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_14)
helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
);
params.setMargins(0, 0, helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView.setLayoutParams(params);
@@ -224,8 +224,8 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
if (url.contains("http")) {
ImageView imageView = new ImageView(helper.itemView.getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_14)
helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
);
params.setMargins(0, 0, helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView.setLayoutParams(params);

4
moduleroom/src/main/java/com/example/moduleroom/adapter/RankingAutcionAdapter.java
View File

@@ -65,8 +65,8 @@ public class RankingAutcionAdapter extends BaseQuickAdapter<RoomAuction.AuctionL
if (url.contains("http")) {
ImageView imageView1 = new ImageView(getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView1.setLayoutParams(params);

7
moduleroom/src/main/java/com/example/moduleroom/adapter/RankingCharmListAdapter.java
View File

@@ -13,6 +13,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.example.moduleroom.R;
import com.xscm.moduleutil.bean.CharmRankingResp;
import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.StringUtil;
import com.xscm.moduleutil.utils.logger.Logger;
import java.util.List;
@@ -36,7 +37,7 @@ public class RankingCharmListAdapter extends BaseQuickAdapter<CharmRankingResp,
//数据绑定赋值
helper.setText(R.id.room_item_seq, String.valueOf(helper.getAdapterPosition() + 4));//从第四个开始设置值
helper.setText(R.id.room_item_name, item.getNickname());
helper.setText(R.id.room_item_pop, item.getTotal());
helper.setText(R.id.room_item_pop, StringUtil.toWan2(item.getTotal(),2));
// if (GG.equals(item.getSex())) {
// helper.setBackgroundRes(R.id.room_item_pop, R.mipmap.room_bg_wheat_charm_gg_sr);
// } else {
@@ -67,8 +68,8 @@ public class RankingCharmListAdapter extends BaseQuickAdapter<CharmRankingResp,
if (url.contains("http")) {
ImageView imageView1 = new ImageView(getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView1.setLayoutParams(params);

4
moduleroom/src/main/java/com/example/moduleroom/adapter/RoomCharmAdapter.java
View File

@@ -43,8 +43,8 @@ public class RoomCharmAdapter extends BaseQuickAdapter<RoomUserCharmListBean, Ba
if (url.contains("http")) {
ImageView imageView1 = new ImageView(getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView1.setLayoutParams(params);

4
moduleroom/src/main/java/com/example/moduleroom/adapter/RoomOnlineAdapter.java
View File

@@ -98,8 +98,8 @@ public class RoomOnlineAdapter extends BaseMultiItemQuickAdapter<RoomOnlineBean,
if (url.contains("http")) {
ImageView imageView1 = new ImageView(helper.itemView.getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)
helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
);
params.setMargins(0, 0, helper.itemView.getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView1.setLayoutParams(params);

12
moduleroom/src/main/java/com/example/moduleroom/dialog/BidListDialogFragment.java
View File

@@ -89,8 +89,8 @@ public class BidListDialogFragment extends BaseMvpDialogFragment<BidListPresente
if (url.contains("http")) {
ImageView imageView1 = new ImageView(getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView1.setLayoutParams(params);
@@ -119,8 +119,8 @@ public class BidListDialogFragment extends BaseMvpDialogFragment<BidListPresente
if (url.contains("http")) {
ImageView imageView1 = new ImageView(getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView1.setLayoutParams(params);
@@ -149,8 +149,8 @@ public class BidListDialogFragment extends BaseMvpDialogFragment<BidListPresente
if (url.contains("http")) {
ImageView imageView1 = new ImageView(getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView1.setLayoutParams(params);

4
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostAddFragment.java
View File

@@ -132,8 +132,8 @@ public class RoomHostAddFragment extends BaseMvpDialogFragment<RoomHostPresenter
if (url.contains("http")) {
ImageView imageView = new ImageView(getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView.setLayoutParams(params);

1
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java
View File

@@ -271,6 +271,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
// showContent = "点击 Item菜单6";
//TODO 举报功能
ARouter.getInstance().build(ARouteConstants.H5).withString("url",CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+ "/web/index.html#/pages/feedback/report?id="+SpUtil.getToken()+"&fromType=1&fromId="+user_id).withString("title", "举报").navigation();
dismiss();
} else if (id == R.id.action_blacklist) {
MvpPre.addBlackList(user_id);
}

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

@@ -25,6 +25,7 @@ import android.widget.Switch;
import android.widget.TextView;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.example.moduleroom.R;
import com.example.moduleroom.activity.RoomActivity;
import com.example.moduleroom.contacts.FriendshipRoomContacts;
@@ -222,9 +223,13 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
wheatView.setOnZhulClickListener(new RoomFriendshipWheatView.OnZhulClickListener() {
@Override
public void onZhulClick(RoomFriendshipWheatView view, RoomPitBean pitBean) {
if (ClickUtils.isFastDoubleClick()) {
return; // 快速重复点击，直接返回
}
// configPower(pitBean);
UserInfo userInfo = new UserInfo();
userInfo.setAvatar(pitBean.getAvatar());
userInfo.setNickname(pitBean.getNickname());
@@ -312,21 +317,28 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
public void upFriendList() {
mBinding.wheatView1.pitBean.setCharm("0");
mBinding.wheatView1.setData(mBinding.wheatView1.pitBean);
mBinding.wheatView1.setCharm("0");
mBinding.wheatView2.pitBean.setCharm("0");
mBinding.wheatView2.setData(mBinding.wheatView2.pitBean);
mBinding.wheatView2.setCharm("0");
// mBinding.wheatView2.setData(mBinding.wheatView2.pitBean);
mBinding.wheatView3.pitBean.setCharm("0");
mBinding.wheatView3.setData(mBinding.wheatView3.pitBean);
mBinding.wheatView3.setCharm("0");
// mBinding.wheatView3.setData(mBinding.wheatView3.pitBean);
mBinding.wheatView4.pitBean.setCharm("0");
mBinding.wheatView4.setData(mBinding.wheatView4.pitBean);
mBinding.wheatView4.setCharm("0");
// mBinding.wheatView4.setData(mBinding.wheatView4.pitBean);
mBinding.wheatView5.pitBean.setCharm("0");
mBinding.wheatView5.setData(mBinding.wheatView5.pitBean);
mBinding.wheatView5.setCharm("0");
// mBinding.wheatView5.setData(mBinding.wheatView5.pitBean);
mBinding.wheatView6.pitBean.setCharm("0");
mBinding.wheatView6.setData(mBinding.wheatView6.pitBean);
mBinding.wheatView6.setCharm("0");
// mBinding.wheatView6.setData(mBinding.wheatView6.pitBean);
mBinding.wheatView9.pitBean.setCharm("0");
mBinding.wheatView9.setData(mBinding.wheatView9.pitBean);
mBinding.wheatView9.setCharm("0");
// mBinding.wheatView9.setData(mBinding.wheatView9.pitBean);
mBinding.wheatView10.pitBean.setCharm("0");
mBinding.wheatView10.setData(mBinding.wheatView10.pitBean);
mBinding.wheatView10.setCharm("0");
// mBinding.wheatView10.setData(mBinding.wheatView10.pitBean);
}
/**
@@ -950,7 +962,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
roomInfoResp.getFriend_info().setHeart_list(heartLists);
}
configHeart();
// configPowerBtn();
configPowerBtn();
}
/**
@@ -1231,8 +1243,99 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
}
}
private void songGift(RoomPitBean pitBean){
UserInfo userInfo = new UserInfo();
userInfo.setAvatar(pitBean.getAvatar());
userInfo.setNickname(pitBean.getNickname());
userInfo.setUser_id(Integer.parseInt(pitBean.getUser_id()));
userInfo.setPit_number("0");
RoomGiftDialogFragment.show(null, userInfo, roomId, 0, pitBean.getHeartId() + "", getParentFragmentManager());
}
private void configPower(RoomPitBean pitBean) {
FriendInfo.HeartList md1 = null; //中心的集合
FriendInfo.HeartList md2 = null; //顶部的集合
FriendInfo.HeartList md3 = null; //底部的集合
if (roomInfoResp.getFriend_info().getHeart_list() != null && !roomInfoResp.getFriend_info().getHeart_list().isEmpty()) {
if (roomInfoResp.getFriend_info().getHeart_list().size() >= 3) {
md1 = roomInfoResp.getFriend_info().getHeart_list().get(0);
md2 = roomInfoResp.getFriend_info().getHeart_list().get(1);
md3 = roomInfoResp.getFriend_info().getHeart_list().get(2);
}
if (pitBean != null && pitBean.getUser_id() != null && pitBean.getUser_id().equals(SpUtil.getUserId() + "")){
ToastUtils.showShort("不能给自己助力哦");
return;
}
if (pitBean.getPit_number().equals("1")){
if (md2 != null && md2.getHeartNum() > 0 && mBinding.wheatView6.pitBean != null) {
// 弹出礼物视图
songGift(pitBean);
}else {
ToastUtils.showShort("暂未有心动连线，快去送TA礼物");
}
return;
}
if (pitBean.getPit_number().equals("2")){
if (md1 != null && md1.getHeartNum() > 0 && mBinding.wheatView5.pitBean != null) {
songGift(pitBean);
}else {
ToastUtils.showShort("暂未有心动连线，快去送TA礼物");
}
return;
}
if (pitBean.getPit_number().equals("3")){
if (md3 != null && md3.getHeartNum() > 0 && mBinding.wheatView4.pitBean != null) {
songGift(pitBean);
}else {
ToastUtils.showShort("暂未有心动连线，快去送TA礼物");
}
return;
}
if (pitBean.getPit_number().equals("4")){
if (md3 != null && md3.getHeartNum() > 0 && mBinding.wheatView3.pitBean != null) {
songGift(pitBean);
}else {
ToastUtils.showShort("暂未有心动连线，快去送TA礼物");
}
return;
}
if (pitBean.getPit_number().equals("5")){
if (md1 != null && md1.getHeartNum() > 0 && mBinding.wheatView2.pitBean != null) {
songGift(pitBean);
}else {
ToastUtils.showShort("暂未有心动连线，快去送TA礼物");
}
return;
}
if (pitBean.getPit_number().equals("6")){
if (md2 != null && md2.getHeartNum() > 0 && mBinding.wheatView1.pitBean != null) {
songGift(pitBean);
}else {
ToastUtils.showShort("暂未有心动连线，快去送TA礼物");
}
return;
}
}
}
private void setVisibilityZL(){
FriendInfo.HeartList md1 = null; //中心的集合
FriendInfo.HeartList md2 = null; //顶部的集合
FriendInfo.HeartList md3 = null; //底部的集合
if (roomInfoResp.getFriend_info().getHeart_list() != null && !roomInfoResp.getFriend_info().getHeart_list().isEmpty()) {
if (roomInfoResp.getFriend_info().getHeart_list().size() >= 3) {
md1 = roomInfoResp.getFriend_info().getHeart_list().get(0);
md2 = roomInfoResp.getFriend_info().getHeart_list().get(1);
md3 = roomInfoResp.getFriend_info().getHeart_list().get(2);
}
}
}
/// 设置中线展示
private void configPowerBtn() {
FriendInfo.HeartList md1 = null; //中心的集合
FriendInfo.HeartList md2 = null; //顶部的集合
FriendInfo.HeartList md3 = null; //底部的集合
@@ -1262,14 +1365,21 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
} else {
mBinding.wheatView5.setLockZl(true);
}
RoomPitBean pitBean2 = mBinding.wheatView2.pitBean;
pitBean2.setHeartNum(md1.getHeartNum());
pitBean2.setHeartId(md1.getHeartId());
mBinding.wheatView2.setData(pitBean2);
RoomPitBean pitBean5 = mBinding.wheatView5.pitBean;
pitBean5.setHeartNum(md1.getHeartNum());
pitBean5.setHeartId(md1.getHeartId());
mBinding.wheatView2.setData(pitBean5);
mBinding.wheatView2.pitBean.setHeartNum(md1.getHeartNum());
mBinding.wheatView2.pitBean.setHeartId(md1.getHeartId());
mBinding.wheatView5.pitBean.setHeartNum(md1.getHeartNum());
mBinding.wheatView5.pitBean.setHeartId(md1.getHeartId());
// RoomPitBean pitBean2 = mBinding.wheatView2.pitBean;
// pitBean2.setHeartNum(md1.getHeartNum());
// pitBean2.setHeartId(md1.getHeartId());
// mBinding.wheatView2.setData(pitBean2);
// RoomPitBean pitBean5 = mBinding.wheatView5.pitBean;
// pitBean5.setHeartNum(md1.getHeartNum());
// pitBean5.setHeartId(md1.getHeartId());
// mBinding.wheatView2.setData(pitBean5);
} else {
mBinding.wheatView2.setLockZl(false);
mBinding.wheatView5.setLockZl(false);
@@ -1286,14 +1396,20 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
} else {
mBinding.wheatView6.setLockZl(true);
}
RoomPitBean pitBean1 = mBinding.wheatView1.pitBean;
pitBean1.setHeartNum(md2.getHeartNum());
pitBean1.setHeartId(md2.getHeartId());
mBinding.wheatView1.setData(pitBean1);
RoomPitBean pitBean6 = mBinding.wheatView6.pitBean;
pitBean6.setHeartNum(md2.getHeartNum());
pitBean6.setHeartId(md2.getHeartId());
mBinding.wheatView6.setData(pitBean6);
mBinding.wheatView1.pitBean.setHeartNum(md2.getHeartNum());
mBinding.wheatView1.pitBean.setHeartId(md2.getHeartId());
mBinding.wheatView6.pitBean.setHeartNum(md2.getHeartNum());
mBinding.wheatView6.pitBean.setHeartId(md2.getHeartId());
// RoomPitBean pitBean1 = mBinding.wheatView1.pitBean;
// pitBean1.setHeartNum(md2.getHeartNum());
// pitBean1.setHeartId(md2.getHeartId());
// mBinding.wheatView1.setData(pitBean1);
// RoomPitBean pitBean6 = mBinding.wheatView6.pitBean;
// pitBean6.setHeartNum(md2.getHeartNum());
// pitBean6.setHeartId(md2.getHeartId());
// mBinding.wheatView6.setData(pitBean6);
} else {
mBinding.wheatView1.setLockZl(false);
mBinding.wheatView6.setLockZl(false);
@@ -1311,14 +1427,19 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
} else {
mBinding.wheatView4.setLockZl(true);
}
RoomPitBean pitBean4 = mBinding.wheatView4.pitBean;
pitBean4.setHeartNum(md3.getHeartNum());
pitBean4.setHeartId(md3.getHeartId());
mBinding.wheatView4.setData(pitBean4);
RoomPitBean pitBean3 = mBinding.wheatView3.pitBean;
pitBean3.setHeartNum(md3.getHeartNum());
pitBean3.setHeartId(md3.getHeartId());
mBinding.wheatView3.setData(pitBean3);
mBinding.wheatView3.pitBean.setHeartNum(md3.getHeartNum());
mBinding.wheatView3.pitBean.setHeartId(md3.getHeartId());
mBinding.wheatView4.pitBean.setHeartNum(md3.getHeartNum());
mBinding.wheatView4.pitBean.setHeartId(md3.getHeartId());
// RoomPitBean pitBean4 = mBinding.wheatView4.pitBean;
// pitBean4.setHeartNum(md3.getHeartNum());
// pitBean4.setHeartId(md3.getHeartId());
// mBinding.wheatView4.setData(pitBean4);
// RoomPitBean pitBean3 = mBinding.wheatView3.pitBean;
// pitBean3.setHeartNum(md3.getHeartNum());
// pitBean3.setHeartId(md3.getHeartId());
// mBinding.wheatView3.setData(pitBean3);
} else {
mBinding.wheatView3.setLockZl(false);
mBinding.wheatView4.setLockZl(false);

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

@@ -255,7 +255,7 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
*/
private void sendWelcomeMessage() {
RoomMessageEvent.T t = new RoomMessageEvent.T();
t.setText("秘地严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。");
t.setText("MY语聊严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。");
// 加入群组成功
handleRoomMessage(new RoomMessageEvent(1000, roomId, t));
}
@@ -302,7 +302,7 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
this.roomId = roomInfoResp.getRoom_info().getRoom_id();
RoomMessageEvent.T t = new RoomMessageEvent.T();
t.setText("秘地严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。");
t.setText("MY语聊严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。");
// 加入群组成功
handleRoomMessage(new RoomMessageEvent(1000, roomId, t));
onChatRoomViewCreation();

11
moduleroom/src/main/java/com/example/moduleroom/fragment/RankingChildFragment.java
View File

@@ -24,6 +24,7 @@ import com.xscm.moduleutil.bean.CharmRankingResp;
import com.xscm.moduleutil.bean.room.RoomInfoResp;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.StringUtil;
import com.xscm.moduleutil.widget.CommonEmptyView;
import java.util.List;
@@ -187,7 +188,7 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
public void setNo1(CharmRankingResp listsBean) {
ImageUtils.loadHeadCC(listsBean.getAvatar(), mBinding.roomRankTop1HeadIcon);
mBinding.roomTop1Name.setText(listsBean.getNickname());
mBinding.roomHeadTop1Label.setText(listsBean.getTotal());
mBinding.roomHeadTop1Label.setText(StringUtil.toWan2(listsBean.getTotal(), 2));
setview(listsBean.getIcon(), mBinding.llVip1);
mBinding.roomRankTop1HeadIcon.setOnClickListener(new View.OnClickListener() {
@Override
@@ -203,7 +204,7 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
public void setNo2(CharmRankingResp listsBean) {
ImageUtils.loadHeadCC(listsBean.getAvatar(), mBinding.roomRankTop2HeadIcon);
mBinding.roomTop2Name.setText(listsBean.getNickname());
mBinding.roomHeadTop2Label.setText(listsBean.getTotal());
mBinding.roomHeadTop2Label.setText(StringUtil.toWan2(listsBean.getTotal(), 2));
setview(listsBean.getIcon(), mBinding.llVip2);
mBinding.roomRankTop2HeadIcon.setOnClickListener(new View.OnClickListener() {
@Override
@@ -222,8 +223,8 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
if (url.contains("http")) {
ImageView imageView1 = new ImageView(getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView1.setLayoutParams(params);
@@ -241,7 +242,7 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
public void setNo3(CharmRankingResp listsBean) {
ImageUtils.loadHeadCC(listsBean.getAvatar(), mBinding.roomRankTop3HeadIcon);
mBinding.roomTop3Name.setText(listsBean.getNickname());
mBinding.roomHeadTop3Label.setText(listsBean.getTotal());
mBinding.roomHeadTop3Label.setText(StringUtil.toWan2(listsBean.getTotal(), 2));
setview(listsBean.getIcon(), mBinding.llVip3);
mBinding.roomRankTop3HeadIcon.setOnClickListener(new View.OnClickListener() {
@Override

137
moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
View File

@@ -53,6 +53,7 @@ import com.xscm.moduleutil.bean.room.RoomBean;
import com.xscm.moduleutil.bean.room.RoomInfoResp;
import com.xscm.moduleutil.bean.room.RoomPitBean;
import com.xscm.moduleutil.dialog.ConfirmDialog;
import com.xscm.moduleutil.dialog.RoomAuctionWebViewDialog;
import com.xscm.moduleutil.dialog.WebViewDialog;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.ClickUtils;
@@ -567,9 +568,18 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
// WebViewDialog dialog = new WebViewDialog(getActivity(), bundle);
// dialog.show();
if (type==1) {
ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=23").withString("title", "真爱拍规则").navigation();
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"api/Page/page_show?id=23");
RoomAuctionWebViewDialog dialog = new RoomAuctionWebViewDialog(getActivity(), bundle);
dialog.show();
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=23").withString("title", "真爱拍规则").navigation();
}else {
ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=22").withString("title", "亲密拍规则").navigation();
Bundle bundle = new Bundle();
bundle.putString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"api/Page/page_show?id=22");
RoomAuctionWebViewDialog dialog = new RoomAuctionWebViewDialog(getActivity(), bundle);
dialog.show();
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=22").withString("title", "亲密拍规则").navigation();
}
}
}
@@ -1030,35 +1040,45 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
// TODO: 2025/9/12 清除个人魅力
public void event1059(RoomMessageEvent messageEvent) {
RoomPitBean pitBean = wheatView.pitBean;
if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean.setCharm("");
wheatView.setData(pitBean);
return;
if (pitBean!=null) {
if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean.setCharm("");
wheatView.setCharm("0");
return;
}
}
RoomPitBean pitBean2 = wheatView2.pitBean;
if (pitBean2.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean2.setCharm("");
wheatView2.setData(pitBean2);
mBinding.tvPB.setText("0");
return;
if (pitBean2!=null) {
if (pitBean2.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean2.setCharm("");
wheatView2.setCharm("0");
mBinding.tvPB.setText("0");
return;
}
}
RoomPitBean pitBean3 = mBinding.ivAuction1.pitBean;
if (pitBean3!=null){
if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean3.setCharm("");
mBinding.ivAuction1.setData(pitBean3);
mBinding.ivAuction1.setCharm("0");
return;
}
}
RoomPitBean pitBean4 = mBinding.ivAuction2.pitBean;
if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean4.setCharm("");
mBinding.ivAuction2.setData(pitBean4);
return;
if (pitBean4!=null) {
if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean4.setCharm("");
mBinding.ivAuction2.setCharm("0");
return;
}
}
RoomPitBean pitBean5 = mBinding.ivAuction3.pitBean;
if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean5.setCharm("");
mBinding.ivAuction3.setData(pitBean5);
return;
if (pitBean5!=null) {
if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean5.setCharm("");
mBinding.ivAuction3.setCharm("0");
return;
}
}
}
@@ -1068,34 +1088,44 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
RoomPitBean pitBean = wheatView.pitBean;
if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean.setIs_online(type == 1 ? 1 : 2);
wheatView.setData(pitBean);
return;
if (pitBean!=null) {
if (pitBean.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean.setIs_online(type == 1 ? 1 : 2);
wheatView.setData(pitBean);
return;
}
}
RoomPitBean pitBean2 = wheatView2.pitBean;
if (pitBean2.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean2.setIs_online(type == 1 ? 1 : 2);
wheatView2.setData(pitBean2);
return;
if (pitBean2!=null) {
if (pitBean2.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean2.setIs_online(type == 1 ? 1 : 2);
wheatView2.setData(pitBean2);
return;
}
}
RoomPitBean pitBean3 = mBinding.ivAuction1.pitBean;
if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean3.setIs_online(type == 1 ? 1 : 2);
mBinding.ivAuction1.setData(pitBean3);
return;
if (pitBean3!=null) {
if (pitBean3.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean3.setIs_online(type == 1 ? 1 : 2);
mBinding.ivAuction1.setData(pitBean3);
return;
}
}
RoomPitBean pitBean4 = mBinding.ivAuction2.pitBean;
if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean4.setIs_online(type == 1 ? 1 : 2);
mBinding.ivAuction2.setData(pitBean4);
return;
if (pitBean4!=null) {
if (pitBean4.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean4.setIs_online(type == 1 ? 1 : 2);
mBinding.ivAuction2.setData(pitBean4);
return;
}
}
RoomPitBean pitBean5 = mBinding.ivAuction3.pitBean;
if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean5.setIs_online(type == 1 ? 1 : 2);
mBinding.ivAuction3.setData(pitBean5);
return;
if (pitBean5!=null) {
if (pitBean5.getUser_id().equals(messageEvent.getText().getUser_id())) {
pitBean5.setIs_online(type == 1 ? 1 : 2);
mBinding.ivAuction3.setData(pitBean5);
return;
}
}
if (auctionList != null && auctionList.size() > 0) {
for (int i = 0; i < auctionList.size(); i++) {
@@ -1199,17 +1229,17 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (mBinding.ivAuction1.pitBean != null) {
RoomPitBean pitBean3 = mBinding.ivAuction1.pitBean;
pitBean3.setCharm("");
mBinding.ivAuction1.setData(pitBean3);
mBinding.ivAuction1.setCharm("0");
}
if (mBinding.ivAuction2.pitBean != null) {
RoomPitBean pitBean4 = mBinding.ivAuction2.pitBean;
pitBean4.setCharm("");
mBinding.ivAuction2.setData(pitBean4);
mBinding.ivAuction2.setCharm("0");
}
if (mBinding.ivAuction3.pitBean != null) {
RoomPitBean pitBean5 = mBinding.ivAuction3.pitBean;
pitBean5.setCharm("");
mBinding.ivAuction3.setData(pitBean5);
mBinding.ivAuction3.setCharm("0");
}
}
@@ -1267,14 +1297,17 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
public void event1035(RoomMessageEvent messageEvent) {
RoomPitBean pitBean = mBinding.roomMakeWheat.pitBean;
if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
mBinding.roomMakeWheat.setData(pitBean);
if (pitBean!=null) {
if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
mBinding.roomMakeWheat.setData(pitBean);
}
}
RoomPitBean pitBean2 = mBinding.roomMakeWheat2.pitBean;
if (pitBean2 != null){
if (pitBean2.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
pitBean2.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
pitBean2.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
@@ -1282,6 +1315,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
pitBean2.setDress(messageEvent.getText().getFromUserInfo().getDress());
mBinding.roomMakeWheat2.setData(pitBean2);
}
}
if (auctionList != null && auctionList.size() > 0) {
for (int i = 0; i < auctionList.size(); i++) {
@@ -1349,7 +1383,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (wheatView2.getUserId().equals(userId)) {
mBinding.tvPB.setText(StringUtil.toWan2(charm, 1));
wheatView2.pitBean.setCharm(charm);
wheatView2.setData(wheatView2.pitBean);
wheatView2.setCharm(charm);
return;
}
@@ -1365,7 +1399,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
if (targetWheatView != null) {
targetWheatView.pitBean.setCharm(charm);
targetWheatView.setData(targetWheatView.pitBean);
targetWheatView.setCharm(charm);
}
}
@@ -1655,6 +1689,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
}
isButtonsInflated = false;
releaseCountDownTimer();
closeCardRelationshipFragment();
}
/**

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

@@ -41,6 +41,7 @@ import com.example.moduleroom.presenter.RoomCabinPresenter;
import com.hjq.toast.ToastUtils;
import com.orhanobut.logger.Logger;
import com.xscm.moduleutil.base.BaseRoomFragment;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.RoomMessageEvent;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.bean.room.RoomCpUserBean;
@@ -119,6 +120,13 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
// ((RoomActivity) getActivity()).changeBackground(com.xscm.moduleutil.R.mipmap.cabin_bj);
// ((RoomActivity) getActivity()).setvisibTop(false);
// }
if (CommonAppContext.getInstance().lable_id.equals("6") && CommonAppContext.getInstance().isMicPlace){
joinChannel();
isMicPlace = true;
mBinding.im3.setImageResource(com.xscm.moduleutil.R.mipmap.clogs_car);
}
}
private void enableNotifications() {
@@ -127,15 +135,15 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
return;
}
Log.d("RoomCabinFragment", "Notifications not enable!");
new AlertDialog.Builder(requireContext())
new AlertDialog.Builder(getActivity())
.setTitle("提示")
.setMessage("请打开通知权限，防止后台共享屏幕中断")
.setPositiveButton("设置", (dialog, which) -> {
Intent intent = new Intent();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
intent.putExtra(Settings.EXTRA_APP_PACKAGE, requireContext().getPackageName());
intent.putExtra(Settings.EXTRA_CHANNEL_ID, requireContext().getApplicationInfo().uid);
intent.putExtra(Settings.EXTRA_APP_PACKAGE, getActivity().getPackageName());
intent.putExtra(Settings.EXTRA_CHANNEL_ID, getActivity().getApplicationInfo().uid);
} else {
intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
}
@@ -155,6 +163,7 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
if (roomInfoResp == null) return;
}
private SharedViewModel sharedViewModel;
@Nullable
@@ -212,12 +221,14 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
joinChannel();
isMicPlace = true;
mBinding.im3.setImageResource(com.xscm.moduleutil.R.mipmap.clogs_car);
CommonAppContext.getInstance().isMicPlace = true;
} else {
isMicPlace = false;
ToastUtils.show("将停止屏幕共享");
AgoraManager.getInstance(getActivity()).stopScreenCapture();
mBinding.im3.setImageResource(com.xscm.moduleutil.R.mipmap.gongxiang);
CommonAppContext.getInstance().isMicPlace = false;
}
}
});
@@ -685,8 +696,8 @@ public class RoomCabinFragment extends BaseRoomFragment<RoomCabinPresenter, Room
private void joinChannel() {
AgoraManager.getInstance(getContext()).updateChannelMediaOptions();
AgoraManager.getInstance(getContext()).post();
AgoraManager.getInstance(getActivity()).updateChannelMediaOptions();
AgoraManager.getInstance(getActivity()).post();
}
/**

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

@@ -1,11 +1,6 @@
package com.example.moduleroom.fragment;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.media.metrics.Event;
import android.os.Bundle;
import androidx.annotation.NonNull;
@@ -13,25 +8,14 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.ViewModelProvider;
import android.os.CountDownTimer;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.TimeUtils;
@@ -39,20 +23,12 @@ import com.example.moduleroom.R;
import com.example.moduleroom.activity.RoomActivity;
import com.example.moduleroom.contacts.RoomContacts;
import com.example.moduleroom.databinding.FragmentRoomBinding;
import com.example.moduleroom.dialog.RequestDialogFragment;
import com.example.moduleroom.dialog.RoomGiftDialogFragment;
import com.example.moduleroom.dialog.RoomMessageDialogFragment;
import com.example.moduleroom.dialog.RoomPkDialogFragment;
import com.example.moduleroom.dialog.RoomSettingFragment;
import com.example.moduleroom.dialog.SoundEffectsDialogFragment;
import com.example.moduleroom.dialog.WheatFeedingDialogFragment;
import com.example.moduleroom.presenter.RoomPresenter;
import com.hjq.toast.ToastUtils;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.RoomCharmRankBean;
import com.xscm.moduleutil.bean.RoomInputEvent;
import com.xscm.moduleutil.bean.RoomMessageEvent;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.bean.UserOnlineStatusBean;
import com.xscm.moduleutil.bean.room.FriendInfo;
import com.xscm.moduleutil.bean.room.FriendUserBean;
@@ -63,20 +39,15 @@ import com.xscm.moduleutil.bean.room.RoomOnline;
import com.xscm.moduleutil.bean.room.RoomPitBean;
import com.xscm.moduleutil.dialog.ConfirmDialog;
import com.xscm.moduleutil.event.QXRoomSeatViewType;
import com.xscm.moduleutil.event.RoomWheatEvent;
import com.xscm.moduleutil.event.UnreadCountEvent;
import com.xscm.moduleutil.listener.MessageListenerSingleton;
import com.xscm.moduleutil.rtc.AgoraManager;
import com.xscm.moduleutil.utils.SpUtil;
import com.tencent.imsdk.v2.V2TIMManager;
import com.tencent.imsdk.v2.V2TIMValueCallback;
import com.xscm.moduleutil.widget.SharedViewModel;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;

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

@@ -1302,6 +1302,12 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
}
if (roomInfoRespPk == null || roomInfoRespPk.getPk_info() == null) {
if (pitBean!=null ){
if (pitBean.getUser_id() != null){
wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()));
return;
}
}
wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()));
} else {
wheatLayoutManager1.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()));

12
moduleroom/src/main/java/com/example/moduleroom/presenter/RoomAuctionPresenterTow.java
View File

@@ -9,13 +9,16 @@ 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;
public class RoomAuctionPresenterTow extends BasePresenter<RoomAuctionContacts.View> implements RoomAuctionContacts.IRoomDataListPre {
RoomAuctionContacts.View mView;
public RoomAuctionPresenterTow(RoomAuctionContacts.View view, Context context) {
super(view, context);
mView = view;
}
@Override
@@ -28,6 +31,9 @@ public class RoomAuctionPresenterTow extends BasePresenter<RoomAuctionContacts.V
@Override
public void onNext(String s) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
}
MvpRef.get().applyPit();
}
});
@@ -43,6 +49,9 @@ public class RoomAuctionPresenterTow extends BasePresenter<RoomAuctionContacts.V
@Override
public void onNext(AuctionBean auctionBean) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
}
MvpRef.get().roomAuction(auctionBean);
}
});
@@ -105,6 +114,9 @@ public class RoomAuctionPresenterTow extends BasePresenter<RoomAuctionContacts.V
@Override
public void onNext(List<UserOnlineStatusBean> userOnlineStatusBean) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
}
MvpRef.get().userOnlineStatus(userOnlineStatusBean);
}
});

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

@@ -192,7 +192,7 @@
android:textColor="@color/white"
android:textSize="@dimen/sp_9"
app:layout_constraintBottom_toBottomOf="@+id/view_top1"
app:layout_constraintTop_toBottomOf="@+id/room_top1_name"
app:layout_constraintTop_toBottomOf="@+id/ll_vip1"
app:layout_constraintEnd_toEndOf="@id/view_top1"
app:layout_constraintStart_toStartOf="@id/view_top1"
app:layout_constraintBottom_toTopOf="@+id/ll_vip1"
@@ -264,7 +264,7 @@
android:textColor="@color/white"
android:textSize="@dimen/sp_9"
app:layout_constraintBottom_toBottomOf="@+id/view_top3"
app:layout_constraintTop_toBottomOf="@+id/room_top3_name"
app:layout_constraintTop_toBottomOf="@+id/ll_vip3"
app:layout_constraintEnd_toEndOf="@id/view_top3"
app:layout_constraintStart_toStartOf="@id/view_top3"
tools:text="00000" />
@@ -272,7 +272,7 @@
<LinearLayout
android:id="@+id/ll_vip2"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_16"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="@id/view_top2"
@@ -326,7 +326,7 @@
<LinearLayout
android:id="@+id/ll_vip3"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_16"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="@id/view_top3"

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

@@ -91,7 +91,7 @@
<LinearLayout
android:id="@+id/bnv_rank_list_rich"
android:layout_width="0dp"
android:layout_height="@dimen/dp_16"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="5dp"
app:layout_constraintBottom_toBottomOf="@+id/room_item_head"