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

1:修改礼物背包送礼异常

Browse Source 
2：修改添加照片出现错乱问题
3：修改头像框不显示的问题
4：修改我的背包显示不正确的问题
5:修改明细、收支时间问题
This commit is contained in:
梁小江
2025-09-08 17:22:58 +08:00
parent 77b801cca6
commit 54014fe0f6
27 changed files with 497 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -30,7 +30,7 @@ isBuildModule=false
android.injected.testOnly=false android.injected.testOnly=false
APP_VERSION_NAME=1.0.0 APP_VERSION_NAME=1.0.0
APP_VERSION_CODE=115 APP_VERSION_CODE=117
org.gradle.jvm.toolchain.useLegacyAdapters=false org.gradle.jvm.toolchain.useLegacyAdapters=false
#org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15

5
moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java
View File

@@ -218,6 +218,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
mBinding.mirroeSky.tvJc.setOnClickListener(this::onClisk); mBinding.mirroeSky.tvJc.setOnClickListener(this::onClisk);
mBinding.mirroeSky.tvJl.setOnClickListener(this::onClisk); mBinding.mirroeSky.tvJl.setOnClickListener(this::onClisk);
mBinding.mirroeSky.tvStart.setOnClickListener(this::onClisk); mBinding.mirroeSky.tvStart.setOnClickListener(this::onClisk);
mBinding.mirroeSky.exchangeLayout.setOnClickListener(this::onClisk);
init(0); init(0);
mBinding.mirroeSky.swLockYx.setChecked(true); mBinding.mirroeSky.swLockYx.setChecked(true);
mBinding.mirroeSky.swTex.setChecked(true); mBinding.mirroeSky.swTex.setChecked(true);
@@ -256,6 +257,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
mBinding.cityTime.tvJc.setOnClickListener(this::onClisk); mBinding.cityTime.tvJc.setOnClickListener(this::onClisk);
mBinding.cityTime.tvJl.setOnClickListener(this::onClisk); mBinding.cityTime.tvJl.setOnClickListener(this::onClisk);
mBinding.cityTime.tvStart.setOnClickListener(this::onClisk); mBinding.cityTime.tvStart.setOnClickListener(this::onClisk);
mBinding.cityTime.exchangeLayout.setOnClickListener(this::onClisk);
init2(0); init2(0);
mBinding.cityTime.swLockYx.setChecked(true); mBinding.cityTime.swLockYx.setChecked(true);
mBinding.cityTime.swTex.setChecked(true); mBinding.cityTime.swTex.setChecked(true);
@@ -293,6 +295,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
mBinding.pinnacleTime.tvJc.setOnClickListener(this::onClisk); mBinding.pinnacleTime.tvJc.setOnClickListener(this::onClisk);
mBinding.pinnacleTime.tvJl.setOnClickListener(this::onClisk); mBinding.pinnacleTime.tvJl.setOnClickListener(this::onClisk);
mBinding.pinnacleTime.tvStart.setOnClickListener(this::onClisk); mBinding.pinnacleTime.tvStart.setOnClickListener(this::onClisk);
mBinding.pinnacleTime.exchangeLayout.setOnClickListener(this::onClisk);
init3(0); init3(0);
mBinding.pinnacleTime.swLockYx.setChecked(true); mBinding.pinnacleTime.swLockYx.setChecked(true);
mBinding.pinnacleTime.swTex.setChecked(true); mBinding.pinnacleTime.swTex.setChecked(true);
@@ -375,6 +378,8 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
this.dismissAllowingStateLoss(); this.dismissAllowingStateLoss();
} }
} }
}else if (id == R.id.exchange_layout){
ARouter.getInstance().build(ARouteConstants.CURRENCY).navigation();
} }
} }

96
moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
View File

@@ -23,6 +23,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.LinearSnapHelper; import androidx.recyclerview.widget.LinearSnapHelper;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.blankj.utilcode.util.TimeUtils; import com.blankj.utilcode.util.TimeUtils;
import com.xscm.moduleutil.R; import com.xscm.moduleutil.R;
import com.xscm.moduleutil.base.BaseMvpDialogFragment; import com.xscm.moduleutil.base.BaseMvpDialogFragment;
@@ -34,6 +35,7 @@ import com.xscm.moduleutil.bean.blindboxwheel.BlindReslutBean;
import com.xscm.moduleutil.bean.blindboxwheel.XlhDrawBean; import com.xscm.moduleutil.bean.blindboxwheel.XlhDrawBean;
import com.xscm.moduleutil.databinding.FragmentTourClubDialogBinding; import com.xscm.moduleutil.databinding.FragmentTourClubDialogBinding;
import com.xscm.moduleutil.dialog.WebViewDialog; import com.xscm.moduleutil.dialog.WebViewDialog;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.ImageUtils; import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.widget.CenterScrollHelper; import com.xscm.moduleutil.widget.CenterScrollHelper;
import com.xscm.moduleutil.widget.EqualSpaceItemDecoration; import com.xscm.moduleutil.widget.EqualSpaceItemDecoration;
@@ -71,6 +73,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
private int totalScrollTime = 5000; // 总滚动时间，单位：毫秒 private int totalScrollTime = 5000; // 总滚动时间，单位：毫秒
private int targetPosition; private int targetPosition;
private boolean isDrawing;//是否正在抽奖
@Override @Override
protected GiftLotteryPresenter bindPresenter() { protected GiftLotteryPresenter bindPresenter() {
@@ -142,10 +145,10 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
mBinding.tvGz.setOnClickListener(this::onClick); mBinding.tvGz.setOnClickListener(this::onClick);
mBinding.tvBd.setOnClickListener(this::onClick); mBinding.tvBd.setOnClickListener(this::onClick);
mBinding.tvJl.setOnClickListener(this::onClick); mBinding.tvJl.setOnClickListener(this::onClick);
mBinding.exchangeLayout.setOnClickListener(this::onClick);
giftXlhChouAdapter = new GiftXlhChouAdapter();
giftXlhChouAdapter=new GiftXlhChouAdapter();
// 使用 LinearLayoutManager 横向滚动 // 使用 LinearLayoutManager 横向滚动
LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false); LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false);
mBinding.recycleView.setLayoutManager(layoutManager); mBinding.recycleView.setLayoutManager(layoutManager);
@@ -185,27 +188,42 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
com.hjq.toast.ToastUtils.show("奖池数据加载中，请稍后再试"); com.hjq.toast.ToastUtils.show("奖池数据加载中，请稍后再试");
} }
} else if (id == R.id.ll_one) { } else if (id == R.id.ll_one) {
prepareForNewLottery(); if (!isDrawing) {
num="1"; isDrawing = true;
MvpPre.xlhChou(roomId,num); prepareForNewLottery();
num = "1";
MvpPre.xlhChou(roomId, num);
} else {
com.hjq.toast.ToastUtils.show("正在抽奖中...");
}
} else if (id == R.id.ll_ten) { } else if (id == R.id.ll_ten) {
prepareForNewLottery(); if (!isDrawing) {
num="10"; isDrawing = true;
MvpPre.xlhChou(roomId,num); prepareForNewLottery();
num = "10";
MvpPre.xlhChou(roomId, num);
} else {
com.hjq.toast.ToastUtils.show("正在抽奖中...");
}
} else if (id == R.id.ll_hundred) { } else if (id == R.id.ll_hundred) {
prepareForNewLottery(); if (!isDrawing) {
num="100"; isDrawing = true;
MvpPre.xlhChou(roomId,num); prepareForNewLottery();
num = "100";
MvpPre.xlhChou(roomId, num);
} else {
com.hjq.toast.ToastUtils.show("正在抽奖中...");
}
}else if (id == R.id.tv_gz){ } else if (id == R.id.tv_gz) {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("url", getRule_url); bundle.putString("url", getRule_url);
bundle.putInt("type", 13); bundle.putInt("type", 13);
WebViewDialog dialog = new WebViewDialog(getActivity(), bundle); WebViewDialog dialog = new WebViewDialog(getActivity(), bundle);
dialog.show(); dialog.show();
}else if (id == R.id.tv_bd){ } else if (id == R.id.tv_bd) {
// 如果当前dialog存在且正在显示，先关闭 // 如果当前dialog存在且正在显示，先关闭
if (xlhRankingDialog != null && xlhRankingDialog.isVisible()) { if (xlhRankingDialog != null && xlhRankingDialog.isVisible()) {
xlhRankingDialog.dismiss(); xlhRankingDialog.dismiss();
@@ -213,7 +231,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
xlhRankingDialog = XlhRankingDialog.newInstance(roomId); xlhRankingDialog = XlhRankingDialog.newInstance(roomId);
xlhRankingDialog.show(getChildFragmentManager(), "XlhRankingDialog"); xlhRankingDialog.show(getChildFragmentManager(), "XlhRankingDialog");
}else if (id == R.id.tv_jl){ } else if (id == R.id.tv_jl) {
// 如果当前dialog存在且正在显示，先关闭 // 如果当前dialog存在且正在显示，先关闭
if (xlhRecordDialog != null && xlhRecordDialog.isVisible()) { if (xlhRecordDialog != null && xlhRecordDialog.isVisible()) {
xlhRecordDialog.dismiss(); xlhRecordDialog.dismiss();
@@ -221,8 +239,11 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
xlhRecordDialog = XlhRecordDialog.newInstance(roomId); xlhRecordDialog = XlhRecordDialog.newInstance(roomId);
xlhRecordDialog.show(getChildFragmentManager(), "XlhRecordDialog"); xlhRecordDialog.show(getChildFragmentManager(), "XlhRecordDialog");
} else if (id == R.id.exchange_layout) {//钻石兑换
ARouter.getInstance().build(ARouteConstants.CURRENCY).navigation();
} }
} }
@Override @Override
protected int getLayoutId() { protected int getLayoutId() {
return R.layout.fragment_tour_club_dialog; return R.layout.fragment_tour_club_dialog;
@@ -231,7 +252,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
@Override @Override
public void getGiftListSuccess(BlindBoxBean blindBoxBean) { public void getGiftListSuccess(BlindBoxBean blindBoxBean) {
if (blindBoxBean != null) { if (blindBoxBean != null) {
getRule_url=blindBoxBean.getRule_url(); getRule_url = blindBoxBean.getRule_url();
upTitle(blindBoxBean.getBox_price()); upTitle(blindBoxBean.getBox_price());
giftLists = blindBoxBean.getGift_list(); giftLists = blindBoxBean.getGift_list();
// 初始滚动到中间位置，避免边界问题 // 初始滚动到中间位置，避免边界问题
@@ -254,14 +275,14 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
if (blindBoxBean.getGive_homeowner_gift() != null) { if (blindBoxBean.getGive_homeowner_gift() != null) {
ImageUtils.loadHeadCC(blindBoxBean.getGive_homeowner_gift().getBase_image(), mBinding.giveIm); ImageUtils.loadHeadCC(blindBoxBean.getGive_homeowner_gift().getBase_image(), mBinding.giveIm);
} }
if (blindBoxBean.getLocking_gift()!=null){ if (blindBoxBean.getLocking_gift() != null) {
ImageUtils.loadHeadCC(blindBoxBean.getLocking_gift().getBase_image(), mBinding.giftImg); ImageUtils.loadHeadCC(blindBoxBean.getLocking_gift().getBase_image(), mBinding.giftImg);
mBinding.tvGiftName.setText(blindBoxBean.getLocking_gift().getGift_name()); mBinding.tvGiftName.setText(blindBoxBean.getLocking_gift().getGift_name());
mBinding.tvGiftPrice.setText(blindBoxBean.getLocking_gift().getGift_price()); mBinding.tvGiftPrice.setText(blindBoxBean.getLocking_gift().getGift_price());
mBinding.tvGiftCount.setText(blindBoxBean.getLocking_gift().getGift_num()); mBinding.tvGiftCount.setText(blindBoxBean.getLocking_gift().getGift_num());
} }
if (blindBoxBean.getXlh_user()!=null){ if (blindBoxBean.getXlh_user() != null) {
ImageUtils.loadHeadCC(blindBoxBean.getXlh_user().getAvatar(), mBinding.userPic); ImageUtils.loadHeadCC(blindBoxBean.getXlh_user().getAvatar(), mBinding.userPic);
mBinding.userName.setText(blindBoxBean.getXlh_user().getNickname()); mBinding.userName.setText(blindBoxBean.getXlh_user().getNickname());
} }
@@ -272,24 +293,25 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
} }
// TODO: 2025/9/4 设置底部按钮文字 // TODO: 2025/9/4 设置底部按钮文字
private void upTitle(int boxPrice){ private void upTitle(int boxPrice) {
mBinding.tvOne.setText(boxPrice+"币一次"); mBinding.tvOne.setText(boxPrice + "币一次");
mBinding.tvTen.setText((boxPrice*10)+"币十次"); mBinding.tvTen.setText((boxPrice * 10) + "币十次");
mBinding.tvHundred.setText((boxPrice*100)+"币百次"); mBinding.tvHundred.setText((boxPrice * 100) + "币百次");
} }
// TODO: 2025/8/29 接收im推送过来的消息 // TODO: 2025/8/29 接收im推送过来的消息
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onMusicPlay(RoomMessageEvent message) { public void onMusicPlay(RoomMessageEvent message) {
if (message.getMsgType() == 1057){ if (message.getMsgType() == 1057) {
// UpView(message.getText().getXlh_data()); // UpView(message.getText().getXlh_data());
endTime=Long.parseLong(message.getText().getEnd_time()); endTime = Long.parseLong(message.getText().getEnd_time());
startCountdown(); startCountdown();
mBinding.tvGiftCount.setText(message.getText().getGift_num()); mBinding.tvGiftCount.setText(message.getText().getGift_num());
mBinding.userName.setText(message.getText().getFromUserInfo().getNickname()); mBinding.userName.setText(message.getText().getFromUserInfo().getNickname());
ImageUtils.loadHeadCC(message.getText().getFromUserInfo().getAvatar(), mBinding.userPic); ImageUtils.loadHeadCC(message.getText().getFromUserInfo().getAvatar(), mBinding.userPic);
} }
} }
/** /**
* 启动倒计时 * 启动倒计时
*/ */
@@ -330,6 +352,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
/** /**
* 更新倒计时显示 * 更新倒计时显示
*
* @param minutes 分钟数 * @param minutes 分钟数
* @param seconds 秒数 * @param seconds 秒数
*/ */
@@ -357,6 +380,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
// 或者如果是一个整体的显示： // 或者如果是一个整体的显示：
// mBinding.tvCountdown.setText(String.format("%02d:%02d", minutes, seconds)); // mBinding.tvCountdown.setText(String.format("%02d:%02d", minutes, seconds));
} }
/** /**
* 释放倒计时器资源 * 释放倒计时器资源
*/ */
@@ -409,20 +433,21 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
@Override @Override
public void wallet(WalletBean walletBean) { public void wallet(WalletBean walletBean) {
if (walletBean != null) { if (walletBean != null) {
mBinding.tvIcon.setText(walletBean.getCoin()); mBinding.tvIcon.setText(walletBean.getCoin());
} }
} }
private Runnable pendingLotteryRunnable; private Runnable pendingLotteryRunnable;
private Runnable pendingCenteringRunnable; private Runnable pendingCenteringRunnable;
@Override @Override
public void xlhChouSuccess(List<XlhDrawBean> data) { public void xlhChouSuccess(List<XlhDrawBean> data) {
if (data != null){ if (data != null) {
// 取消之前可能存在的任务 // 取消之前可能存在的任务
clearPendingTasks(); clearPendingTasks();
// 抽奖完成后执行动画滚动 // 抽奖完成后执行动画滚动
pendingLotteryRunnable = new Runnable() { pendingLotteryRunnable = new Runnable() {
@Override @Override
public void run() { public void run() {
// 清理之前的状态 // 清理之前的状态
@@ -487,8 +512,6 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
} }
/** /**
* 为新的抽奖做准备，清理之前的状态 * 为新的抽奖做准备，清理之前的状态
*/ */
@@ -517,6 +540,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
// 重新初始化滚动帮助类 // 重新初始化滚动帮助类
scrollHelper = new CenterScrollHelper(mBinding.recycleView); scrollHelper = new CenterScrollHelper(mBinding.recycleView);
} }
/** /**
* 清除所有待执行的任务 * 清除所有待执行的任务
*/ */
@@ -657,8 +681,9 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
/** /**
* 将指定的原始位置item居中显示 * 将指定的原始位置item居中显示
*
* @param originalPosition 原始数据中的位置 * @param originalPosition 原始数据中的位置
* @param originalSize 原始数据大小 * @param originalSize 原始数据大小
*/ */
// 新增优化的居中方法 // 新增优化的居中方法
private void centerSelectedItem(int originalPosition, int originalSize) { private void centerSelectedItem(int originalPosition, int originalSize) {
@@ -711,6 +736,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
/** /**
* 直接滚动到指定位置并居中 * 直接滚动到指定位置并居中
*
* @param targetPosition 目标位置 * @param targetPosition 目标位置
*/ */
private void directScrollToCenter(int targetPosition) { private void directScrollToCenter(int targetPosition) {
@@ -740,6 +766,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
/** /**
* 滚动到指定位置并使该位置的item居中显示 * 滚动到指定位置并使该位置的item居中显示
*
* @param selectedPosition 选中的原始位置 * @param selectedPosition 选中的原始位置
*/ */
private void scrollToCenterWithSelected(int selectedPosition) { private void scrollToCenterWithSelected(int selectedPosition) {
@@ -768,15 +795,18 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
/** /**
* 显示抽奖结果对话框 * 显示抽奖结果对话框
*
* @param data 中奖数据 * @param data 中奖数据
*/ */
private void showResultDialog(List<XlhDrawBean> data) { private void showResultDialog(List<XlhDrawBean> data) {
isDrawing=false;
// 创建并显示对话框 // 创建并显示对话框
XlhObtainDialog dialog = new XlhObtainDialog(getActivity()); XlhObtainDialog dialog = new XlhObtainDialog(getActivity());
dialog.setOnGiftItemClickListener(new XlhObtainDialog.OnGiftItemClickListener() { dialog.setOnGiftItemClickListener(new XlhObtainDialog.OnGiftItemClickListener() {
@Override @Override
public void onPlayAgainClick() { public void onPlayAgainClick() {
isDrawing=true;
// 处理再玩一次点击事件 // 处理再玩一次点击事件
MvpPre.xlhChou(roomId, num); MvpPre.xlhChou(roomId, num);
} }
@@ -791,8 +821,10 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
dialog.show(); dialog.show();
dialog.setGiftList(data); dialog.setGiftList(data);
} }
/** /**
* 根据中奖结果找到最高价值奖品在giftLists中的位置 * 根据中奖结果找到最高价值奖品在giftLists中的位置
*
* @param data 中奖结果列表 * @param data 中奖结果列表
* @return 最高价值奖品在giftLists中的下标，如果没有找到则返回-1 * @return 最高价值奖品在giftLists中的下标，如果没有找到则返回-1
*/ */
@@ -837,6 +869,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
/** /**
* 精确将指定位置的item滚动到中心 * 精确将指定位置的item滚动到中心
*
* @param position 目标位置 * @param position 目标位置
*/ */
private void preciseScrollToCenter(int position) { private void preciseScrollToCenter(int position) {
@@ -867,7 +900,4 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
} }
} }

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

@@ -343,7 +343,7 @@ public interface ApiServer {
Observable<BaseModel<List<HeatedBean>>> getCategories(); Observable<BaseModel<List<HeatedBean>>> getCategories();
@GET(Constants.GET_CIRCLE_LIST) @GET(Constants.GET_CIRCLE_LIST)
Observable<BaseModel<List<CircleListBean>>> getCircleList(@Query("page") String page, @Query("page_limit") String page_limit); Call<BaseModel<List<CircleListBean>>> getCircleList(@Query("page") String page, @Query("page_limit") String page_limit);
@FormUrlEncoded @FormUrlEncoded
@POST(Constants.GET_USER_HOME_ZONE) @POST(Constants.GET_USER_HOME_ZONE)

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

@@ -933,7 +933,25 @@ public class RetrofitClient {
} }
public void getCircleList(String page, String page_limit, BaseObserver<List<CircleListBean>> observer) {//动态列表 public void getCircleList(String page, String page_limit, BaseObserver<List<CircleListBean>> observer) {//动态列表
sApiServer.getCircleList(page, page_limit).compose(new DefaultTransformer<>()).subscribe(observer); sApiServer.getCircleList(page, page_limit).enqueue(new Callback<BaseModel<List<CircleListBean>>>() {
@Override
public void onResponse(Call<BaseModel<List<CircleListBean>>> call, Response<BaseModel<List<CircleListBean>>> response) {
if (response.code() == 200){
BaseModel<List<CircleListBean>> listBaseModel = response.body();
if (listBaseModel != null) {
observer.onNext(listBaseModel.getData());
} else {
observer.onNext(null);
}
}
}
@Override
public void onFailure(Call<BaseModel<List<CircleListBean>>> call, Throwable t) {
t.printStackTrace();
}
});
} }
public void getCircleUserList(String user_id, String page, String page_limit, BaseObserver<List<CircleListBean>> observer) {//用户主页动态列表 public void getCircleUserList(String user_id, String page, String page_limit, BaseObserver<List<CircleListBean>> observer) {//用户主页动态列表

3
moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java
View File

@@ -406,7 +406,8 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
Logger.d("AvatarFrameView", "Added to queue, queue size: " + playQueue.size() + ", url: " + url); Logger.d("AvatarFrameView", "Added to queue, queue size: " + playQueue.size() + ", url: " + url);
if (type2==3){ if (type2==3){
playNextFromQueue(); // playNextFromQueue();
loadSVGA(url);
}else { }else {
// 如果当前没有在播放，则开始播放 // 如果当前没有在播放，则开始播放

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

@@ -111,6 +111,7 @@ public class RoomFriendshipWheatView extends BaseWheatView {
if (isMute()) { if (isMute()) {
ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex); ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex);
} }
mIvFrame.stopSvga();
mIvFrame.setVisibility(INVISIBLE); mIvFrame.setVisibility(INVISIBLE);
mIvFace.remove(); mIvFace.remove();
//停止声浪 //停止声浪

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

@@ -94,6 +94,7 @@ public class RoomMakeWheatView extends BaseWheatView {
if (isMute()){ if (isMute()){
ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex); ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex);
} }
mIvFrame.stopSvga();
mIvFrame.setVisibility(INVISIBLE); mIvFrame.setVisibility(INVISIBLE);
mIvFace.remove(); mIvFace.remove();
//停止声浪 //停止声浪

2
moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
View File

@@ -109,7 +109,7 @@ public class RoomSingSongWheatView extends BaseWheatView {
if (isMute()) { if (isMute()) {
ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex); ImageUtils.loadRes(R.mipmap.room_microphone_off, mIvSex);
} }
mIvFrame.stopSvga();
mIvFrame.setVisibility(INVISIBLE); mIvFrame.setVisibility(INVISIBLE);
mIvFace.remove(); mIvFace.remove();
mIvRipple.setVisibility(GONE); mIvRipple.setVisibility(GONE);

3
moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/ShareDialog.java
View File

@@ -73,6 +73,9 @@ public class ShareDialog extends BaseBottomSheetDialog<RoomDialogShareBinding> {
mBinding.tvQq.setVisibility(GONE); mBinding.tvQq.setVisibility(GONE);
mBinding.tvQqq.setVisibility(GONE); mBinding.tvQqq.setVisibility(GONE);
mBinding.rl.setVisibility(GONE); mBinding.rl.setVisibility(GONE);
}else if (types == 4){
mBinding.tvJub.setVisibility(GONE);
mBinding.tvCopy.setVisibility(GONE);
} }
if (mUserId.equals(SpUtil.getUserId()+"")){ if (mUserId.equals(SpUtil.getUserId()+"")){
mBinding.shanc.setVisibility(VISIBLE); mBinding.shanc.setVisibility(VISIBLE);

2
moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml
View File

@@ -312,6 +312,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/exchange_layout" app:layout_constraintTop_toTopOf="@+id/exchange_layout"
app:layout_constraintBottom_toBottomOf="@+id/exchange_layout" app:layout_constraintBottom_toBottomOf="@+id/exchange_layout"
android:visibility="gone"
/> />
<View <View
@@ -324,6 +325,7 @@
app:layout_constraintEnd_toStartOf="@+id/tv_option" app:layout_constraintEnd_toStartOf="@+id/tv_option"
app:layout_constraintTop_toTopOf="@+id/exchange_layout" app:layout_constraintTop_toTopOf="@+id/exchange_layout"
app:layout_constraintBottom_toBottomOf="@+id/exchange_layout" app:layout_constraintBottom_toBottomOf="@+id/exchange_layout"
android:visibility="gone"
/> />
<LinearLayout <LinearLayout
android:id="@+id/exchange_layout" android:id="@+id/exchange_layout"

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

@@ -113,14 +113,15 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <LinearLayout
android:id="@+id/rl" android:id="@+id/rl"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_16" android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal"> android:orientation="horizontal"
>
<TextView <TextView
android:id="@+id/tv_copy" android:id="@+id/tv_copy"
@@ -159,7 +160,7 @@
android:gravity="center" android:gravity="center"
android:drawablePadding="@dimen/dp_8" android:drawablePadding="@dimen/dp_8"
/> />
</RelativeLayout> </LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"

43
moduleUtil/src/main/res/layout/room_view_friendship_wheat.xml
View File

@@ -9,7 +9,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false"> android:clipToPadding="false">
@@ -20,23 +20,40 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_12" android:layout_marginTop="@dimen/dp_12"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
app:layout_constraintWidth_percent="1"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_bias="0.0"
android:src="@mipmap/jiaoy"/> android:src="@mipmap/jiaoy"/>
<!-- 头像框，与头像大小相同，覆盖在头像上 -->
<com.xscm.moduleutil.widget.AvatarFrameView
android:id="@+id/iv_frame"
android:layout_width="0dp"
android:layout_height="0dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintHeight_percent="1"
app:layout_constraintWidth_percent="1.05"
app:layout_constraintBottom_toBottomOf="@id/riv"
app:layout_constraintEnd_toEndOf="@id/riv"
app:layout_constraintStart_toStartOf="@id/riv"
app:layout_constraintTop_toTopOf="@id/riv" />
<!-- 说话麦圈，与头像大小相同，覆盖在头像上 --> <!-- 说话麦圈，与头像大小相同，覆盖在头像上 -->
<com.opensource.svgaplayer.SVGAImageView <com.opensource.svgaplayer.SVGAImageView
android:id="@+id/iv_ripple" android:id="@+id/iv_ripple"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:autoPlay="false" app:autoPlay="false"
app:layout_constraintBottom_toBottomOf="@id/riv" app:layout_constraintHeight_percent="0.95"
app:layout_constraintEnd_toEndOf="@id/riv" app:layout_constraintWidth_percent="1"
app:layout_constraintStart_toStartOf="@id/riv" app:layout_constraintBottom_toBottomOf="@id/iv_frame"
app:layout_constraintTop_toTopOf="@id/riv" app:layout_constraintEnd_toEndOf="@id/iv_frame"
app:layout_constraintStart_toStartOf="@id/iv_frame"
app:layout_constraintTop_toTopOf="@id/iv_frame"
app:loopCount="0" app:loopCount="0"
app:source="ripple3695.svga" /> app:source="ripple3695.svga" />
@@ -50,19 +67,7 @@
<!-- app:layout_constraintTop_toTopOf="@id/riv"--> <!-- app:layout_constraintTop_toTopOf="@id/riv"-->
<!-- />--> <!-- />-->
<!-- 头像框，与头像大小相同，覆盖在头像上 -->
<com.xscm.moduleutil.widget.AvatarFrameView
android:id="@+id/iv_frame"
android:layout_width="0dp"
android:layout_height="0dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintBottom_toBottomOf="@id/riv"
app:layout_constraintEnd_toEndOf="@id/riv"
app:layout_constraintStart_toStartOf="@id/riv"
app:layout_constraintTop_toTopOf="@id/riv" />
<ImageView <ImageView
android:id="@+id/iv_online" android:id="@+id/iv_online"

97
moduleUtil/src/main/res/layout/room_view_make_wheat.xml
View File

@@ -14,7 +14,6 @@
android:clipToPadding="false"> android:clipToPadding="false">
<com.xscm.moduleutil.widget.GifAvatarOvalView <com.xscm.moduleutil.widget.GifAvatarOvalView
android:id="@+id/riv" android:id="@+id/riv"
android:layout_width="@dimen/dp_40" android:layout_width="@dimen/dp_40"
@@ -25,8 +24,23 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" tools:visibility="visible" />
/>
<com.xscm.moduleutil.widget.AvatarFrameView
android:id="@+id/iv_frame"
android:layout_width="0dp"
android:layout_height="0dp"
android:contentDescription="@null"
android:scaleType="fitXY"
app:autoPlay="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:loopCount="0"
tools:visibility="visible" />
<!--说话动态图--> <!--说话动态图-->
<com.opensource.svgaplayer.SVGAImageView <com.opensource.svgaplayer.SVGAImageView
android:id="@+id/iv_ripple" android:id="@+id/iv_ripple"
@@ -35,27 +49,27 @@
app:autoPlay="false" app:autoPlay="false"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
app:layout_constraintHeight_percent="0.8"
app:layout_constraintWidth_percent="0.8"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_percent="0.8"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.8"
app:loopCount="0" app:loopCount="0"
app:source="ripple3695.svga" app:source="ripple3695.svga"
tools:visibility="visible"/> tools:visibility="visible" />
<!-- <com.xscm.moduleutil.widget.AvatarFrameView--> <!-- <com.xscm.moduleutil.widget.AvatarFrameView-->
<!-- android:id="@+id/iv_ripple"--> <!-- android:id="@+id/iv_ripple"-->
<!-- android:layout_width="0dp"--> <!-- android:layout_width="0dp"-->
<!-- android:layout_height="0dp"--> <!-- android:layout_height="0dp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"--> <!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintDimensionRatio="1:1"--> <!-- app:layout_constraintDimensionRatio="1:1"-->
<!-- app:layout_constraintHeight_percent="0.8"--> <!-- app:layout_constraintHeight_percent="0.8"-->
<!-- app:layout_constraintWidth_percent="0.8"--> <!-- app:layout_constraintWidth_percent="0.8"-->
<!-- app:layout_constraintEnd_toEndOf="parent"--> <!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"--> <!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"--> <!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- />--> <!-- />-->
<ImageView <ImageView
android:id="@+id/iv_sex" android:id="@+id/iv_sex"
@@ -109,29 +123,14 @@
android:layout_height="@dimen/dp_45" android:layout_height="@dimen/dp_45"
android:background="@mipmap/room_ic_owner_offline" android:background="@mipmap/room_ic_owner_offline"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="@id/riv" app:layout_constraintEnd_toEndOf="@id/riv"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="@id/riv" app:layout_constraintStart_toStartOf="@id/riv"
app:loopCount="0"/>
<com.xscm.moduleutil.widget.AvatarFrameView
android:id="@+id/iv_frame"
android:layout_width="0dp"
android:layout_height="0dp"
android:contentDescription="@null"
android:scaleType="fitXY"
app:autoPlay="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHeight_percent="0.1"
app:loopCount="0" app:loopCount="0"
tools:visibility="visible"/> tools:visibility="visible" />
<View <View
android:id="@+id/view_riv_bottom" android:id="@+id/view_riv_bottom"
@@ -140,45 +139,46 @@
app:layout_constraintBottom_toBottomOf="@id/riv" app:layout_constraintBottom_toBottomOf="@id/riv"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
tools:visibility="visible"/> tools:visibility="visible" />
<ImageView <ImageView
android:id="@+id/iv_tag_type" android:id="@+id/iv_tag_type"
android:layout_width="@dimen/dp_30" android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_20" android:layout_height="@dimen/dp_20"
android:src="@mipmap/zc" android:src="@mipmap/zc"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/riv" app:layout_constraintBottom_toBottomOf="@id/riv"
app:layout_constraintEnd_toEndOf="@id/riv" app:layout_constraintEnd_toEndOf="@id/riv"
app:layout_constraintStart_toStartOf="@id/riv" app:layout_constraintStart_toStartOf="@id/riv" />
android:visibility="gone"/>
<TextView <TextView
android:id="@+id/tv_name" android:id="@+id/tv_name"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_5"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_9" android:textSize="@dimen/sp_9"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_5"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/riv" app:layout_constraintTop_toBottomOf="@id/riv"
tools:text="麦位1" tools:text="麦位1"
tools:textColor="@color/color_FF333333" tools:textColor="@color/color_FF333333"
tools:visibility="visible"/> tools:visibility="visible" />
<!-- 心动--> <!-- 心动-->
<com.xscm.moduleutil.widget.WheatCharmView <com.xscm.moduleutil.widget.WheatCharmView
android:id="@+id/charm_view" android:id="@+id/charm_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/tv_name" app:layout_constraintEnd_toEndOf="@id/tv_name"
app:layout_constraintStart_toStartOf="@id/tv_name" app:layout_constraintStart_toStartOf="@id/tv_name"
app:layout_constraintTop_toBottomOf="@id/tv_name" app:layout_constraintTop_toBottomOf="@id/tv_name"
tools:visibility="visible" tools:visibility="visible" />
android:visibility="gone"/>
<ImageView <ImageView
android:id="@+id/iv_shutup" android:id="@+id/iv_shutup"
@@ -186,13 +186,13 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
app:layout_constraintWidth_percent="0.018"
app:layout_constraintHeight_percent="0.018"
android:src="@mipmap/room_ic_wheat_shutup" android:src="@mipmap/room_ic_wheat_shutup"
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@id/riv" app:layout_constraintBottom_toBottomOf="@id/riv"
app:layout_constraintHeight_percent="0.018"
app:layout_constraintStart_toStartOf="@id/riv" app:layout_constraintStart_toStartOf="@id/riv"
tools:visibility="visible" /> app:layout_constraintWidth_percent="0.018"
tools:visibility="visible" />
<com.xscm.moduleutil.widget.ExpressionImgView <com.xscm.moduleutil.widget.ExpressionImgView
android:id="@+id/iv_face" android:id="@+id/iv_face"
@@ -227,6 +227,5 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</layout> </layout>

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

@@ -24,7 +24,7 @@
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@mipmap/room_ic_wheat_default" android:src="@mipmap/room_ic_wheat_default"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="0.99:0.99"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -41,6 +41,23 @@
<!-- app:layout_constraintStart_toStartOf="parent"--> <!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"--> <!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- />--> <!-- />-->
<com.xscm.moduleutil.widget.AvatarFrameView
android:id="@+id/iv_frame"
android:layout_width="0dp"
android:layout_height="0dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_percent="0.95"
android:layout_marginTop="@dimen/dp_5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.95" />
<com.opensource.svgaplayer.SVGAImageView <com.opensource.svgaplayer.SVGAImageView
android:id="@+id/iv_ripple" android:id="@+id/iv_ripple"
android:layout_width="0dp" android:layout_width="0dp"
@@ -48,8 +65,8 @@
android:layout_marginTop="@dimen/dp_8" android:layout_marginTop="@dimen/dp_8"
app:autoPlay="false" app:autoPlay="false"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHeight_percent="0.99" app:layout_constraintHeight_percent="1"
app:layout_constraintWidth_percent="0.99" app:layout_constraintWidth_percent="1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
@@ -131,21 +148,7 @@
tools:visibility="visible" /> tools:visibility="visible" />
<com.xscm.moduleutil.widget.AvatarFrameView
android:id="@+id/iv_frame"
android:layout_width="0dp"
android:layout_height="0dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_percent="0.98"
android:layout_marginTop="@dimen/dp_5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.98" />
<View <View
android:id="@+id/view_riv_bottom" android:id="@+id/view_riv_bottom"

9
modulecircle/src/main/java/com/example/modulecircle/activity/ReleaseActivity.java
View File

@@ -98,8 +98,15 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
updateAdapterData(); updateAdapterData();
} else { } else {
if (item.equals(UserPhotoWallAdapter.ADD_PHOTO)) { if (item.equals(UserPhotoWallAdapter.ADD_PHOTO)) {
int maxSelectable = 9 - uploadedUrls.size();
if (maxSelectable > 0) {
// 点击的是"+"'号，启动图片选择
startChoosePhoto(1, PictureConfig.CHOOSE_REQUEST, false, maxSelectable);
} else {
ToastUtils.showShort("最多只能选择9张图片");
}
// 点击的是“+”号，启动图片选择 // 点击的是“+”号，启动图片选择
startChoosePhoto(1, PictureConfig.CHOOSE_REQUEST, false, 9); // startChoosePhoto(1, PictureConfig.CHOOSE_REQUEST, false, 9);
} else { } else {
// 查看大图或其他操作 // 查看大图或其他操作
// 查看大图或其他操作 // 查看大图或其他操作

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

@@ -380,7 +380,9 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
mBinding.llGiftRule.setVisibility(View.VISIBLE); mBinding.llGiftRule.setVisibility(View.VISIBLE);
setGiftDetail(event.gift); setGiftDetail(event.gift);
} }
roonGiftModel = event.gift; if (event.addSelf) {
roonGiftModel = event.gift;
}
} }
private GiftLotteryDialog currentDialog; private GiftLotteryDialog currentDialog;

8
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java
View File

@@ -129,7 +129,13 @@ public class RoomOnlineDialogFragment extends BaseMvpDialogFragment<RoomPresente
@Override @Override
public void onUserInfoClick(RoomOnlineBean item) { public void onUserInfoClick(RoomOnlineBean item) {
RoomUserInfoFragment.show(roomId, item.getUser_id() + "", pit_number, getHostUser(hostUser), false, 4, isNumberWhether(), getChildFragmentManager()); // 使用 post 延迟执行，确保 dismiss 完成后再显示新对话框
mBinding.getRoot().post(() -> {
mBinding.getRoot().post(() -> {
RoomUserInfoFragment.show(roomId, item.getUser_id() + "", pit_number, getHostUser(hostUser), false, 4, isNumberWhether(), getParentFragmentManager());
});
dismiss();
});
} }
}); });

70
modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java
View File

@@ -47,10 +47,11 @@ import java.util.Date;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
*@author qx * @author qx
*@data 2025/6/6 * @data 2025/6/6
*@description: 相册详情 * @description: 相册详情
*/ */
@Route(path = ARouteConstants.USER_ALBUM_DETAIL) @Route(path = ARouteConstants.USER_ALBUM_DETAIL)
public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, ActivityAlbumDetailBinding> implements AlbumDetailConacts.View { public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, ActivityAlbumDetailBinding> implements AlbumDetailConacts.View {
@@ -208,6 +209,9 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
.forResult(requestCode); //结果回调onActivityResult code .forResult(requestCode); //结果回调onActivityResult code
} }
private int totalUploadCount;//需要上传的数据的总数
private int uploadedCount;//已经上传的数据的个数
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
@@ -223,6 +227,9 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
String path = media.isCompressed() ? media.getCompressPath() : media.getRealPath(); String path = media.isCompressed() ? media.getCompressPath() : media.getRealPath();
imageFiles.add(new File(path)); imageFiles.add(new File(path));
} }
// 记录需要上传的文件总数
totalUploadCount = imageFiles.size();
uploadedCount = 0;
// 开始批量上传 // 开始批量上传
MvpPre.batchUploadFiles(imageFiles, 0); // 第二个参数是你原来的 type MvpPre.batchUploadFiles(imageFiles, 0); // 第二个参数是你原来的 type
@@ -234,21 +241,29 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
@Override @Override
public void upLoadSuccess(String url, int type, int index, int total) { public void upLoadSuccess(String url, int type, int index, int total) {
// 增加已上传计数
if (index >= 0 && index < uploadedUrls.size()) { uploadedCount++;
uploadedUrls.add(index, url); // 插入到对应位置 uploadedUrls.add(url);
} else { // if (index >= 0 && index < uploadedUrls.size()) {
uploadedUrls.add(url); // 添加到最后 // uploadedUrls.add(index, url); // 插入到对应位置
} // } else {
// uploadedUrls.add(url); // 添加到最后
// if (uploadedUrls.size() == total) {
updateAdapterData(); // 所有图片上传完成，更新适配器数据
// } // }
// 当所有图片都上传完成时，更新适配器数据
if (uploadedCount == totalUploadCount) {
updateAdapterData();
// 重置计数器
uploadedCount = 0;
totalUploadCount = 0;
}
} }
@Override @Override
public void upAddAlbum() { public void upAddAlbum() {
uploadedUrls.clear(); uploadedUrls.clear();
// 添加图片后应该重置分页状态并重新加载第一页
page = 1;
MvpPre.getAlbumDetail(albumId, pwd, page + "", "10"); MvpPre.getAlbumDetail(albumId, pwd, page + "", "10");
} }
@@ -263,7 +278,7 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
TextView tvTitle = dialog.findViewById(com.xscm.moduleutil.R.id.tv_title); TextView tvTitle = dialog.findViewById(com.xscm.moduleutil.R.id.tv_title);
tvTitle.setText("选择相册"); tvTitle.setText("选择相册");
assert recyclerView != null; assert recyclerView != null;
recyclerView.setLayoutManager(new GridLayoutManager(this,4)); recyclerView.setLayoutManager(new GridLayoutManager(this, 4));
SingleChoiceAdapter sadapter = new SingleChoiceAdapter(); SingleChoiceAdapter sadapter = new SingleChoiceAdapter();
recyclerView.setAdapter(sadapter); recyclerView.setAdapter(sadapter);
sadapter.setNewData(data); sadapter.setNewData(data);
@@ -287,11 +302,15 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
@Override @Override
public void moveAlbum() { public void moveAlbum() {
// 移动图片后应该重置分页状态并重新加载第一页
page = 1;
MvpPre.getAlbumDetail(albumId, pwd, "1", "10"); MvpPre.getAlbumDetail(albumId, pwd, "1", "10");
} }
@Override @Override
public void deleteAlbum() { public void deleteAlbum() {
// 删除图片后应该重置分页状态并重新加载第一页
page = 1;
MvpPre.getAlbumDetail(albumId, pwd, "1", "10"); MvpPre.getAlbumDetail(albumId, pwd, "1", "10");
} }
@@ -302,8 +321,8 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
@Override @Override
public void findAlbum() { public void findAlbum() {
mBinding.smartRefreshLayout.finishRefresh() ; mBinding.smartRefreshLayout.finishRefresh();
mBinding.smartRefreshLayout.finishLoadMore() ; mBinding.smartRefreshLayout.finishLoadMore();
} }
private void updateAdapterData() { private void updateAdapterData() {
@@ -314,7 +333,7 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
page=1; page = 1;
MvpPre.getAlbumDetail(albumId, pwd, "1", "10"); MvpPre.getAlbumDetail(albumId, pwd, "1", "10");
} }
@@ -331,9 +350,9 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
private void updateZanButtonUI(AlbumBean albumBean) { private void updateZanButtonUI(AlbumBean albumBean) {
if (albumBean.getIs_like().equals("0")) { if (albumBean.getIs_like().equals("0")) {
mBinding.zanImage.setImageResource(com.xscm.moduleutil.R.mipmap.shousz); // 已点赞图标 mBinding.zanImage.setImageResource(com.xscm.moduleutil.R.mipmap.shousz); // 已点赞图标
if (Integer.parseInt(albumBean.getLike_num())==0){ if (Integer.parseInt(albumBean.getLike_num()) == 0) {
mBinding.dyComment.setText("0"); mBinding.dyComment.setText("0");
}else { } else {
mBinding.dyComment.setText(Integer.parseInt(albumBean.getLike_num()) - 1 + ""); mBinding.dyComment.setText(Integer.parseInt(albumBean.getLike_num()) - 1 + "");
} }
} else { } else {
@@ -396,16 +415,19 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
if (albumBean.getImage_list() != null && !albumBean.getImage_list().isEmpty()) { if (albumBean.getImage_list() != null && !albumBean.getImage_list().isEmpty()) {
List<AlbumBean.ImageList> allImages = albumBean.getImage_list(); List<AlbumBean.ImageList> allImages = albumBean.getImage_list();
List<AlbumBean.ImageList> groupedPhotos = groupPhotos(allImages); List<AlbumBean.ImageList> groupedPhotos = groupPhotos(allImages);
if (page==1) { if (page == 1) {
adapter.setNewData(groupedPhotos); adapter.setNewData(groupedPhotos);
}else { } else {
adapter.addData(groupedPhotos); adapter.addData(groupedPhotos);
} }
}else { } else {
page=1; if (page == 1) {
if (albumBean.getCount()==null || albumBean.getCount().equals("0")){ adapter.setNewData(new ArrayList<>());
adapter.setNewData( new ArrayList<>());
} }
// page=1;
// if (albumBean.getCount()==null || albumBean.getCount().equals("0")){
// adapter.setNewData( new ArrayList<>());
// }
} }

178
modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java
View File

@@ -39,6 +39,7 @@ import com.xscm.moduleutil.utils.DateSelectDialog;
import com.xscm.moduleutil.utils.GlideEngine; import com.xscm.moduleutil.utils.GlideEngine;
import com.xscm.moduleutil.utils.ImageUtils; import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.SpUtil; import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.widget.Constants;
import com.xscm.moduleutil.widget.img.FullScreenUtil; import com.xscm.moduleutil.widget.img.FullScreenUtil;
import com.xscm.moduleutil.widget.picker.PictureSelectorUtil; import com.xscm.moduleutil.widget.picker.PictureSelectorUtil;
import com.stx.xhb.xbanner.XBanner; import com.stx.xhb.xbanner.XBanner;
@@ -98,8 +99,14 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
updateAdapterData(); updateAdapterData();
} else { } else {
if (item.equals(UserPhotoWallAdapter.ADD_PHOTO)) { if (item.equals(UserPhotoWallAdapter.ADD_PHOTO)) {
// 点击的是“+”号，启动图片选择 // 修改判断条件，考虑已上传的图片和ADD_PHOTO项
startChoosePhoto(1, PictureConfig.REQUEST_CAMERA, false, 9); int maxSelectable = 6 - uploadedUrls.size();
if (maxSelectable > 0) {
// 点击的是"+"'号，启动图片选择
startChoosePhoto(1, PictureConfig.REQUEST_CAMERA, false, maxSelectable, false);
} else {
ToastUtils.showShort("最多只能选择6张图片");
}
} else { } else {
// 查看大图或其他操作 // 查看大图或其他操作
FullScreenUtil.showFullScreenDialog(EditUserInfoActivity.this, position, list); FullScreenUtil.showFullScreenDialog(EditUserInfoActivity.this, position, list);
@@ -131,7 +138,7 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
private void onClick(View view) { private void onClick(View view) {
if (view.getId() == R.id.rv_user_head) { if (view.getId() == R.id.rv_user_head) {
startChoosePhoto(1, PictureConfig.REQUEST_GO_SETTING, false, 1); startChoosePhoto(1, PictureConfig.REQUEST_GO_SETTING, false, 1,true);
} else if (view.getId() == R.id.rl_1) { } else if (view.getId() == R.id.rl_1) {
startActivity(new Intent(this, ChangeNicknameActivity.class)); startActivity(new Intent(this, ChangeNicknameActivity.class));
} else if (view.getId() == R.id.rl_3) { } else if (view.getId() == R.id.rl_3) {
@@ -155,7 +162,7 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
return new EditUserPresenter(this, this); return new EditUserPresenter(this, this);
} }
private void startChoosePhoto(int mimeType, int requestCode, boolean isVideo, int type) { private void startChoosePhoto(int mimeType, int requestCode, boolean isVideo, int type , boolean isCq) {
// PictureSelector.create(this) // PictureSelector.create(this)
// .openGallery(mimeType) // .openGallery(mimeType)
@@ -169,80 +176,97 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
// .setPictureStyle(MyPictureParameterStyle.Companion.selectPicture()) // .setPictureStyle(MyPictureParameterStyle.Companion.selectPicture())
// .forResult(requestCode); //结果回调onActivityResult code // .forResult(requestCode); //结果回调onActivityResult code
PictureSelectorUtil pictureSelectorUtil = new PictureSelectorUtil();
PictureSelector.create(this) if (!isCq) {
.openGallery(mimeType)
.isGif(isVideo)
.setMaxSelectNum(type)
.isPreviewImage(false)
.setImageEngine(GlideEngine.createGlideEngine())
.setImageEngine(GlideEngine.createGlideEngine()) // 选择器展示不出图片则添加
.setCropEngine(new CropFileEngine() {
@Override
public void onStartCrop(Fragment fragment, Uri srcUri, Uri destinationUri, ArrayList<String> dataSource, int requestCode) {
UCrop.Options options = pictureSelectorUtil.buildOptions();
UCrop uCrop = UCrop.of(srcUri, destinationUri, dataSource);
uCrop.withOptions(options);
uCrop.setImageEngine(new UCropImageEngine() {
@Override
public void loadImage(Context context, String url, ImageView imageView) {
// if (!ImageLoaderUtils.assertValidRequest(context)) {
// return;
// }
Glide.with(context).load(url).override(180, 180).into(imageView);
}
@Override PictureSelector.create(this)
public void loadImage(Context context, Uri url, int maxWidth, int maxHeight, OnCallbackListener<Bitmap> call) { .openGallery(mimeType)
Glide.with(context).asBitmap().load(url).override(maxWidth, maxHeight).into(new CustomTarget<Bitmap>() { .isGif(isVideo)
@Override .setImageEngine(GlideEngine.createGlideEngine())
public void onResourceReady(@NonNull Bitmap resource, @org.jetbrains.annotations.Nullable Transition<? super Bitmap> transition) { .setMaxSelectNum(type)
if (call != null) { .isPreviewImage(true)
call.onCall(resource); .isDisplayCamera(true)
.setOutputCameraDir(Constants.FILE_PATH)
.isOriginalSkipCompress(true)
.forResult(requestCode); //结果回调onActivityResult code
} else {
PictureSelectorUtil pictureSelectorUtil = new PictureSelectorUtil();
PictureSelector.create(this)
.openGallery(mimeType)
.isGif(isVideo)
.setMaxSelectNum(type)
.isPreviewImage(false)
.setImageEngine(GlideEngine.createGlideEngine())
.setImageEngine(GlideEngine.createGlideEngine()) // 选择器展示不出图片则添加
.setCropEngine(new CropFileEngine() {
@Override
public void onStartCrop(Fragment fragment, Uri srcUri, Uri destinationUri, ArrayList<String> dataSource, int requestCode) {
UCrop.Options options = pictureSelectorUtil.buildOptions();
UCrop uCrop = UCrop.of(srcUri, destinationUri, dataSource);
uCrop.withOptions(options);
uCrop.setImageEngine(new UCropImageEngine() {
@Override
public void loadImage(Context context, String url, ImageView imageView) {
Glide.with(context).load(url).override(180, 180).into(imageView);
}
@Override
public void loadImage(Context context, Uri url, int maxWidth, int maxHeight, OnCallbackListener<Bitmap> call) {
Glide.with(context).asBitmap().load(url).override(maxWidth, maxHeight).into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, @org.jetbrains.annotations.Nullable Transition<? super Bitmap> transition) {
if (call != null) {
call.onCall(resource);
}
} }
}
@Override @Override
public void onLoadCleared(@org.jetbrains.annotations.Nullable Drawable placeholder) { public void onLoadCleared(@org.jetbrains.annotations.Nullable Drawable placeholder) {
if (call != null) { if (call != null) {
call.onCall(null); call.onCall(null);
}
} }
} });
}); }
} });
}); uCrop.start(fragment.requireActivity(), fragment, requestCode);
uCrop.start(fragment.requireActivity(), fragment, requestCode); }
} })
}) .forResult(requestCode);
.forResult(requestCode); }
} }
private int totalUploadCount;//需要上传的数据的总数
private int uploadedCount;//已经上传的数据的个数
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (resultCode == RESULT_OK && data != null) { if (resultCode == RESULT_OK && data != null) {
switch (requestCode) { switch (requestCode) {
case PictureConfig.REQUEST_GO_SETTING: case PictureConfig.REQUEST_GO_SETTING:
PictureSelector.create(EditUserInfoActivity.this) PictureSelector.create(EditUserInfoActivity.this)
.openPreview() ; .openPreview();
List<LocalMedia> localMedia1 = PictureSelector.obtainSelectorList(data); List<LocalMedia> localMedia1 = PictureSelector.obtainSelectorList(data);
if (localMedia1 != null && localMedia1.size() != 0) { if (localMedia1 != null && localMedia1.size() != 0) {
LocalMedia imgMedia = localMedia1.get(0); LocalMedia imgMedia = localMedia1.get(0);
String url; String url;
if (imgMedia.isCompressed()) { // if (imgMedia.isCompressed()) {
url = imgMedia.getCompressPath(); // url = imgMedia.getCompressPath();
} else { // } else {
url = imgMedia.getRealPath(); // url = imgMedia.getRealPath();
} // }
url=imgMedia.getCutPath();
MvpPre.uploadFile(new File(url), 1, 1, 1); MvpPre.uploadFile(new File(url), 1, 1, 1);
} }
break; break;
case PictureConfig.CHOOSE_REQUEST: case PictureConfig.CHOOSE_REQUEST:
PictureSelector.create(EditUserInfoActivity.this) PictureSelector.create(EditUserInfoActivity.this)
.openPreview() ; .openPreview();
List<LocalMedia> localMedia = PictureSelector.obtainSelectorList(data); List<LocalMedia> localMedia = PictureSelector.obtainSelectorList(data);
if (localMedia != null && localMedia.size() != 0) { if (localMedia != null && localMedia.size() != 0) {
@@ -258,7 +282,7 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
break; break;
case PictureConfig.REQUEST_CAMERA: case PictureConfig.REQUEST_CAMERA:
PictureSelector.create(EditUserInfoActivity.this) PictureSelector.create(EditUserInfoActivity.this)
.openPreview() ; .openPreview();
List<LocalMedia> localMediaList = PictureSelector.obtainSelectorList(data); List<LocalMedia> localMediaList = PictureSelector.obtainSelectorList(data);
if (localMediaList != null && !localMediaList.isEmpty()) { if (localMediaList != null && !localMediaList.isEmpty()) {
@@ -267,7 +291,9 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
String path = media.isCompressed() ? media.getCompressPath() : media.getRealPath(); String path = media.isCompressed() ? media.getCompressPath() : media.getRealPath();
imageFiles.add(new File(path)); imageFiles.add(new File(path));
} }
// 记录需要上传的文件总数
totalUploadCount = imageFiles.size();
uploadedCount = 0;
// 开始批量上传 // 开始批量上传
MvpPre.batchUploadFiles(imageFiles, 0); // 第二个参数是你原来的 type MvpPre.batchUploadFiles(imageFiles, 0); // 第二个参数是你原来的 type
@@ -299,7 +325,9 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
} }
list.clear(); list.clear();
list.addAll(uploadedUrls); list.addAll(uploadedUrls);
list.add(UserPhotoWallAdapter.ADD_PHOTO); // 最后加上 ADD_PHOTO if (list.size()<6) {
list.add(UserPhotoWallAdapter.ADD_PHOTO); // 最后加上 ADD_PHOTO
}
mUserPhotoWallAdapter.setNewData(list); mUserPhotoWallAdapter.setNewData(list);
userInfo1 = userInfo; userInfo1 = userInfo;
List<XBannerData> s = new ArrayList<>(); List<XBannerData> s = new ArrayList<>();
@@ -344,8 +372,8 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
@Override @Override
public void editUserInfoSuccess(String s) { public void editUserInfoSuccess(String s) {
ToastUtils.showShort(s); ToastUtils.showShort(s);
uploadedUrls.clear(); // uploadedUrls.clear();
MvpPre.getUserHome(SpUtil.getUserId() + ""); // MvpPre.getUserHome(SpUtil.getUserId() + "");
} }
@Override @Override
@@ -364,31 +392,27 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
EventBus.getDefault().post(userBean); EventBus.getDefault().post(userBean);
MvpPre.editUserInfo("", "", "", url, "", "", ""); MvpPre.editUserInfo("", "", "", url, "", "", "");
} else { } else {
// list.add(new UserImgList("1", url)); // 增加已上传计数
// mUserPhotoWallAdapter.setNewData(list); uploadedCount++;
uploadedUrls.add(url);
try { LogUtils.d("EditUserInfoActivity", "图片已插入到位置 " + uploadedUrls.size());
if (index >= 0 && index <= uploadedUrls.size()) { // 当所有图片都上传完成时，更新适配器数据
uploadedUrls.add(index, url); if (uploadedCount == totalUploadCount) {
LogUtils.d("EditUserInfoActivity", "图片已插入到位置 "+index); updateAdapterData();
} else { // 重置计数器
uploadedUrls.add(url); uploadedCount = 0;
LogUtils.d("EditUserInfoActivity", "图片已添加到末尾"); totalUploadCount = 0;
}
} catch (Exception e) {
LogUtils.e("EditUserInfoActivity", "处理图片URL时出错: " + e.getMessage());
uploadedUrls.add(url);
} }
// if (uploadedUrls.size() == total) {
updateAdapterData(); // 所有图片上传完成，更新适配器数据
// }
} }
} }
private void updateAdapterData() { private void updateAdapterData() {
LogUtils.d("EditUserInfoActivity", "图片已添加到末尾"+uploadedUrls.size());
list.clear(); list.clear();
list.addAll(uploadedUrls); // 添加真实图片 list.addAll(uploadedUrls); // 添加真实图片
list.add(UserPhotoWallAdapter.ADD_PHOTO); // 最后加上 ADD_PHOTO if (list.size() < 6) {
list.add(UserPhotoWallAdapter.ADD_PHOTO); // 最后加上 ADD_PHOTO
}
mUserPhotoWallAdapter.setNewData(list); mUserPhotoWallAdapter.setNewData(list);
String imageUrlsString = TextUtils.join(",", uploadedUrls); String imageUrlsString = TextUtils.join(",", uploadedUrls);
// MvpPre.editUserInfo("", "", "", "", imageUrlsString, "", ""); // MvpPre.editUserInfo("", "", "", "", imageUrlsString, "", "");

8
modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java
View File

@@ -58,12 +58,12 @@ public class RoomDetailsActivity extends BaseMvpActivity<RoomDetailsPresenter, A
DoubleTimePickerBottomSheet dialog = new DoubleTimePickerBottomSheet(); DoubleTimePickerBottomSheet dialog = new DoubleTimePickerBottomSheet();
dialog.setOnTimeRangeSelectedListener((startDate, endDate) -> { dialog.setOnTimeRangeSelectedListener((startDate, endDate) -> {
// 处理选择的时间范围 // 处理选择的时间范围
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:mm", Locale.getDefault()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
Log.d("SelectedTime", "开始时间：" + sdf.format(startDate)); Log.d("SelectedTime", "开始时间：" + sdf.format(startDate));
// mBinding.tv2.setText(sdf.format(startDate)); mBinding.tv2.setText(sdf.format(startDate));
Log.d("SelectedTime", "结束时间：" + sdf.format(endDate)); Log.d("SelectedTime", "结束时间：" + sdf.format(endDate));
// mBinding.tv22.setText(sdf.format(endDate)); mBinding.tv22.setText(sdf.format(endDate));
currentPage=1;
stime = sdf.format(startDate); stime = sdf.format(startDate);
etime = sdf.format(endDate); etime = sdf.format(endDate);

2
modulevocal/src/main/java/com/example/modulevocal/adapter/MyCreateAdapter.java
View File

@@ -468,7 +468,7 @@ public class MyCreateAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
tv_name.setText(item.getRoom_name()); tv_name.setText(item.getRoom_name());
tv_num.setText(item.getHot_value()); tv_num.setText(item.getHot_value());
ImageUtils.loadRes(com.xscm.moduleutil.R.drawable.voice_play, iv_play); // ImageUtils.loadRes(com.xscm.moduleutil.R.drawable.voice_play, iv_play);
rl_root.setOnClickListener(new View.OnClickListener() { rl_root.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

8
modulevocal/src/main/java/com/example/modulevocal/fragment/RevenueFragment.java
View File

@@ -84,7 +84,7 @@ public class RevenueFragment extends BaseMvpFragment<RevenuePresenter, FragmentR
DoubleTimePickerBottomSheet dialog = new DoubleTimePickerBottomSheet(); DoubleTimePickerBottomSheet dialog = new DoubleTimePickerBottomSheet();
dialog.setOnTimeRangeSelectedListener((startDate, endDate) -> { dialog.setOnTimeRangeSelectedListener((startDate, endDate) -> {
// 处理选择的时间范围 // 处理选择的时间范围
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:mm", Locale.getDefault()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
Log.d("SelectedTime", "开始时间：" + sdf.format(startDate)); Log.d("SelectedTime", "开始时间：" + sdf.format(startDate));
mBinding.tv2.setText(sdf.format(startDate)); mBinding.tv2.setText(sdf.format(startDate));
Log.d("SelectedTime", "结束时间：" + sdf.format(endDate)); Log.d("SelectedTime", "结束时间：" + sdf.format(endDate));
@@ -113,6 +113,8 @@ public class RevenueFragment extends BaseMvpFragment<RevenuePresenter, FragmentR
}else { }else {
MvpPre.getRevenueData(page+"","50",revenueType,"",endDate,type); MvpPre.getRevenueData(page+"","50",revenueType,"",endDate,type);
} }
}else {
MvpPre.getRevenueData(page+"","50",revenueType,"","",type);
} }
// MvpPre.getRevenueData(page+"","50",revenueType,"","",type); // MvpPre.getRevenueData(page+"","50",revenueType,"","",type);
@@ -125,12 +127,14 @@ public class RevenueFragment extends BaseMvpFragment<RevenuePresenter, FragmentR
// MvpPre.getRevenueData(page+"","50",revenueType,"","",type); // MvpPre.getRevenueData(page+"","50",revenueType,"","",type);
String startDate = mBinding.tv2.getText().toString(); String startDate = mBinding.tv2.getText().toString();
String endDate = mBinding.tv22.getText().toString(); String endDate = mBinding.tv22.getText().toString();
if ( startDate!=null && !startDate.equals("") ){ if ( startDate!=null && !startDate.equals("") ){
if ( endDate!=null && !endDate.equals("") ){ if ( endDate!=null && !endDate.equals("") ){
MvpPre.getRevenueData(page+"","50",revenueType,startDate,endDate,revenueType); MvpPre.getRevenueData(page+"","50",revenueType,startDate,endDate,revenueType);
}else { }else {
MvpPre.getRevenueData(page+"","50",revenueType,"",endDate,type); MvpPre.getRevenueData(page+"","50",revenueType,"",endDate,type);
} }
}else {
MvpPre.getRevenueData(page+"","50",revenueType,"","",type);
} }
} }
}); });

174
modulevocal/src/main/res/layout/activity_edit_user.xml
View File

@@ -3,27 +3,28 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:context=".activity.EditUserActivity"> tools:context=".activity.EditUserActivity">
<data> <data>
</data> </data>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
>
<com.xscm.moduleutil.widget.CustomTopBar <com.xscm.moduleutil.widget.CustomTopBar
android:id="@+id/top_bar" android:id="@+id/top_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent" />
<com.stx.xhb.xbanner.XBanner <com.stx.xhb.xbanner.XBanner
android:id="@+id/xbanner" android:id="@+id/xbanner"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_230" android:layout_height="@dimen/dp_230"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <LinearLayout
@@ -31,8 +32,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_122" android:layout_marginTop="@dimen/dp_122"
android:background="@drawable/bg_r16_fff" android:background="@drawable/bg_r16_fff"
app:layout_constraintTop_toBottomOf="@+id/top_bar" android:orientation="vertical"
android:orientation="vertical"> app:layout_constraintTop_toBottomOf="@+id/top_bar">
<TextView <TextView
android:id="@+id/tv_1" android:id="@+id/tv_1"
@@ -40,42 +41,41 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_84" android:layout_marginStart="@dimen/dp_84"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginEnd="@dimen/dp_84" android:layout_marginEnd="@dimen/dp_84"
android:text="@string/avatar_change_info" android:text="@string/avatar_change_info"
android:textColor="@color/color_FF999999" android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12" />
android:layout_marginTop="@dimen/dp_40"/>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_1" android:id="@+id/rl_1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_16" android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:gravity="center|center_vertical" android:gravity="center|center_vertical">
android:layout_marginTop="@dimen/dp_10">
<TextView <TextView
android:layout_width="@dimen/dp_56" android:layout_width="@dimen/dp_56"
android:layout_height="@dimen/dp_21" android:layout_height="@dimen/dp_21"
android:text="@string/nickname"
android:gravity="center|left"
android:layout_centerInParent="true"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_FF999999"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
/> android:layout_centerInParent="true"
android:gravity="center|left"
android:text="@string/nickname"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_14" />
<TextView <TextView
android:id="@+id/tv_nick_name" android:id="@+id/tv_nick_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_24" android:layout_height="@dimen/dp_24"
tools:text="姓名"
android:gravity="center"
android:textSize="@dimen/sp_16"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:textColor="@color/color_FF333333"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
/> android:gravity="center"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_16"
tools:text="姓名" />
<ImageView <ImageView
android:layout_width="@dimen/dp_16" android:layout_width="@dimen/dp_16"
@@ -83,7 +83,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:src="@drawable/detail_icon_go"/> android:src="@drawable/detail_icon_go" />
</RelativeLayout> </RelativeLayout>
@@ -91,32 +91,31 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_36"
android:gravity="center|center_vertical"
android:layout_marginStart="@dimen/dp_16" android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"> android:gravity="center|center_vertical">
<TextView <TextView
android:layout_width="@dimen/dp_56" android:layout_width="@dimen/dp_56"
android:layout_height="@dimen/dp_21" android:layout_height="@dimen/dp_21"
android:text="@string/gender"
android:gravity="center|left"
android:layout_centerInParent="true"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_FF999999"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
/> android:layout_centerInParent="true"
android:gravity="center|left"
android:text="@string/gender"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_14" />
<TextView <TextView
android:id="@+id/tv_sex" android:id="@+id/tv_sex"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_24" android:layout_height="@dimen/dp_24"
tools:text="男"
android:gravity="center"
android:textSize="@dimen/sp_16"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:textColor="@color/color_FF333333"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
/> android:gravity="center"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_16"
tools:text="男" />
<ImageView <ImageView
android:layout_width="@dimen/dp_16" android:layout_width="@dimen/dp_16"
@@ -124,7 +123,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:src="@drawable/detail_icon_go"/> android:src="@drawable/detail_icon_go" />
</RelativeLayout> </RelativeLayout>
@@ -133,32 +132,31 @@
android:id="@+id/rl_3" android:id="@+id/rl_3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_36"
android:gravity="center|center_vertical"
android:layout_marginStart="@dimen/dp_16" android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"> android:gravity="center|center_vertical">
<TextView <TextView
android:layout_width="@dimen/dp_56" android:layout_width="@dimen/dp_56"
android:layout_height="@dimen/dp_21" android:layout_height="@dimen/dp_21"
android:text="@string/birthday"
android:gravity="center|left"
android:layout_centerInParent="true"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_FF999999"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
/> android:layout_centerInParent="true"
android:gravity="center|left"
android:text="@string/birthday"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_14" />
<TextView <TextView
android:id="@+id/tv_sr" android:id="@+id/tv_sr"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_24" android:layout_height="@dimen/dp_24"
tools:text="2020-11-09"
android:gravity="center"
android:textSize="@dimen/sp_16"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:textColor="@color/color_FF333333"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
/> android:gravity="center"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_16"
tools:text="2020-11-09" />
<ImageView <ImageView
android:layout_width="@dimen/dp_16" android:layout_width="@dimen/dp_16"
@@ -166,7 +164,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:src="@drawable/detail_icon_go"/> android:src="@drawable/detail_icon_go" />
</RelativeLayout> </RelativeLayout>
@@ -175,32 +173,31 @@
android:id="@+id/rl_4" android:id="@+id/rl_4"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_36" android:layout_height="@dimen/dp_36"
android:gravity="center|center_vertical"
android:layout_marginStart="@dimen/dp_16" android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10"> android:gravity="center|center_vertical">
<TextView <TextView
android:layout_width="@dimen/dp_56" android:layout_width="@dimen/dp_56"
android:layout_height="@dimen/dp_21" android:layout_height="@dimen/dp_21"
android:text="@string/introduction"
android:gravity="center|left"
android:layout_centerInParent="true"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_FF999999"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
/> android:layout_centerInParent="true"
android:gravity="center|left"
android:text="@string/introduction"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_14" />
<TextView <TextView
android:id="@+id/tv_jj" android:id="@+id/tv_jj"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_24" android:layout_height="@dimen/dp_24"
tools:text="测试数据"
android:gravity="center"
android:textSize="@dimen/sp_16"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:textColor="@color/color_FF333333"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
/> android:gravity="center"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_16"
tools:text="测试数据" />
<ImageView <ImageView
android:layout_width="@dimen/dp_16" android:layout_width="@dimen/dp_16"
@@ -208,7 +205,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:src="@drawable/detail_icon_go"/> android:src="@drawable/detail_icon_go" />
</RelativeLayout> </RelativeLayout>
@@ -223,36 +220,41 @@
android:id="@+id/tv_5" android:id="@+id/tv_5"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_24" android:layout_height="@dimen/dp_24"
android:text="@string/background_image"
android:gravity="center"
android:layout_centerInParent="true"
android:textSize="@dimen/sp_16"
android:textColor="@color/color_FF333333"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_centerInParent="true"
android:gravity="center"
android:text="@string/background_image"
android:textColor="@color/color_FF333333"
android:textSize="@dimen/sp_16"
/> />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_24" android:layout_height="@dimen/dp_24"
android:text="@string/upload_limit"
android:gravity="center"
android:layout_toRightOf="@+id/tv_5"
android:layout_marginStart="@dimen/dp_5"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:textSize="@dimen/sp_12" android:layout_marginStart="@dimen/dp_5"
android:layout_toRightOf="@+id/tv_5"
android:gravity="center"
android:text="@string/upload_limit"
android:textColor="@color/color_FF666666" android:textColor="@color/color_FF666666"
/> android:textSize="@dimen/sp_12" />
</RelativeLayout> </RelativeLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.core.widget.NestedScrollView
android:id="@+id/rv_photo_wall"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginTop="@dimen/dp_6"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_photo_wall"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_16" />
</androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>
<com.xscm.moduleutil.widget.GifAvatarOvalView <com.xscm.moduleutil.widget.GifAvatarOvalView
@@ -260,11 +262,11 @@
android:layout_width="@dimen/dp_74" android:layout_width="@dimen/dp_74"
android:layout_height="@dimen/dp_74" android:layout_height="@dimen/dp_74"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:src="@mipmap/me_img_upld_head"
app:layout_constraintTop_toBottomOf="@+id/top_bar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_79" android:layout_marginTop="@dimen/dp_79"
android:src="@mipmap/me_img_upld_head"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/top_bar"
app:riv_oval="true" /> app:riv_oval="true" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

8
modulevocal/src/main/res/layout/activity_room_details.xml
View File

@@ -58,7 +58,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_14" android:layout_marginStart="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_5"
android:text="累计收益" android:text="累计收益"
android:textColor="@color/color_FF999999" android:textColor="@color/color_FF999999"
android:textSize="12sp" /> android:textSize="12sp" />
@@ -70,7 +70,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:gravity="center"> android:gravity="center">
@@ -119,7 +119,7 @@
android:layout_below="@+id/tv1" android:layout_below="@+id/tv1"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_16" android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_5"
android:drawableLeft="@mipmap/im_zs" android:drawableLeft="@mipmap/im_zs"
android:drawablePadding="@dimen/dp_5" android:drawablePadding="@dimen/dp_5"
android:text="10000" android:text="10000"
@@ -133,7 +133,6 @@
android:layout_below="@+id/tv3" android:layout_below="@+id/tv3"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_14" android:layout_marginStart="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_5"
android:text="累计流水" android:text="累计流水"
android:textColor="@color/color_FF999999" android:textColor="@color/color_FF999999"
android:textSize="12sp" /> android:textSize="12sp" />
@@ -145,6 +144,7 @@
android:layout_below="@+id/tv4" android:layout_below="@+id/tv4"
android:layout_marginStart="@dimen/dp_16" android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_3" android:layout_marginTop="@dimen/dp_3"
android:paddingBottom="@dimen/dp_3"
android:drawableLeft="@mipmap/jinb" android:drawableLeft="@mipmap/jinb"
android:text="10000" android:text="10000"
android:textColor="@color/color_FF333333" android:textColor="@color/color_FF333333"

56
modulevocal/src/main/res/layout/fragment_revenue.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android" <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" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".fragment.RevenueFragment"> tools:context=".fragment.RevenueFragment">
@@ -11,35 +11,36 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical">
>
<LinearLayout <LinearLayout
android:id="@+id/rl3" android:id="@+id/rl3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_38" android:layout_height="@dimen/dp_38"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_16"
android:background="@drawable/bg_r5_e9e9" android:background="@drawable/bg_r5_e9e9"
android:gravity="center"> android:gravity="center">
<TextView <TextView
android:id="@+id/tv2" android:id="@+id/tv2"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12" android:layout_marginStart="@dimen/dp_12"
android:text="开始日期" android:layout_weight="1"
tools:text="开始日期"
android:hint="开始日期"
android:textColor="@color/color_FF999999" android:textColor="@color/color_FF999999"
android:textSize="12sp" /> android:textSize="12sp" />
<ImageView <ImageView
android:id="@+id/iv1" android:id="@+id/iv1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="0.2"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_weight="0.2"
android:paddingTop="@dimen/dp_3" android:paddingTop="@dimen/dp_3"
android:src="@mipmap/data1" /> android:src="@mipmap/data1" />
@@ -47,42 +48,51 @@
<TextView <TextView
android:id="@+id/tv22" android:id="@+id/tv22"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:text="结束日期" android:layout_weight="1"
tools:text="结束日期"
android:hint="结束日期"
android:textColor="@color/color_FF999999" android:textColor="@color/color_FF999999"
android:textSize="12sp" /> android:textSize="12sp" />
<ImageView <ImageView
android:id="@+id/iv2" android:id="@+id/iv2"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="0.2"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_weight="0.2"
android:paddingTop="@dimen/dp_2" android:paddingTop="@dimen/dp_2"
android:src="@mipmap/data2" /> android:src="@mipmap/data2" />
</LinearLayout> </LinearLayout>
<com.scwang.smartrefresh.layout.SmartRefreshLayout <com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/smart_refresh_layout" android:id="@+id/smart_refresh_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="0dp"
android:layout_weight="1"
app:srlEnableLoadMore="true" app:srlEnableLoadMore="true"
app:srlEnableRefresh="true"> app:srlEnableRefresh="true">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/revenue_view" android:id="@+id/revenue_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_10" android:layout_marginStart="@dimen/dp_16"
android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_10" android:paddingBottom="@dimen/dp_30"
android:background="@color/color_FFF5F5F5" android:layout_marginBottom="@dimen/dp_10"
android:orientation="vertical" android:background="@color/color_FFF5F5F5"
tools:listitem="@layout/item_revenue" /> android:orientation="vertical"
tools:listitem="@layout/item_revenue" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout> </com.scwang.smartrefresh.layout.SmartRefreshLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_30"
android:background="@color/transparent" />
</LinearLayout> </LinearLayout>
</layout> </layout>

3
modulevoice/src/main/res/layout/ranking_list.xml
View File

@@ -168,7 +168,6 @@
android:layout_marginBottom="@dimen/dp_60" android:layout_marginBottom="@dimen/dp_60"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center" android:gravity="center"
android:maxLength="3"
android:text="" android:text=""
android:textColor="#ff333333" android:textColor="#ff333333"
android:textSize="10sp" /> android:textSize="10sp" />
@@ -304,7 +303,6 @@
android:layout_marginBottom="@dimen/dp_60" android:layout_marginBottom="@dimen/dp_60"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center" android:gravity="center"
android:maxLength="3"
android:text="" android:text=""
android:textColor="#ff333333" android:textColor="#ff333333"
android:textSize="10sp" /> android:textSize="10sp" />
@@ -440,7 +438,6 @@
android:layout_marginBottom="@dimen/dp_60" android:layout_marginBottom="@dimen/dp_60"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center" android:gravity="center"
android:maxLength="3"
android:text="" android:text=""
android:textColor="#ff333333" android:textColor="#ff333333"
android:textSize="10sp" /> android:textSize="10sp" />