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

Merge branch 'branch_new_dev' into branch_new

Browse Source
This commit is contained in:
骆召亮
2025-11-20 09:42:20 +08:00
parent 57b8ded0eb e9e50c1b65
commit acec782e3a
18 changed files with 40 additions and 1769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MainModule/src/main/java/com/xscm/modulemain/activity/plaza/activity/ReleaseActivity.java
View File

@@ -33,7 +33,7 @@ import com.luck.picture.lib.entity.LocalMedia;
import com.xscm.modulemain.activity.plaza.contacts.ReleaseContract;
import com.xscm.modulemain.activity.plaza.presenter.ReleasePresenter;
import com.xscm.modulemain.BaseMvpActivity;
import com.xscm.moduleutil.adapter.UserPhotoWallAdapter;
import com.xscm.modulemain.adapter.ShareWallAdapter;
import com.xscm.moduleutil.bean.HeatedBean;
import com.xscm.moduleutil.color.ThemeableDrawableUtils;
import com.xscm.moduleutil.utils.ColorManager;
@@ -54,7 +54,7 @@ import java.util.List;
* @description: 发布动态
*/
public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityReleaseBinding> implements ReleaseContract.View {
UserPhotoWallAdapter mUserPhotoWallAdapter;
ShareWallAdapter mUserPhotoWallAdapter;
List<String> list=new ArrayList<>();
private List<String> uploadedUrls = new ArrayList<>();//真实图片地址
final int maxNum = 1200;
@@ -88,7 +88,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
});
mBinding.rvPhotoWall.setLayoutManager(new GridLayoutManager(this, 3));
mBinding.rvPhotoWall.setAdapter(mUserPhotoWallAdapter = new UserPhotoWallAdapter());
mBinding.rvPhotoWall.setAdapter(mUserPhotoWallAdapter = new ShareWallAdapter());
mUserPhotoWallAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
@@ -98,7 +98,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
uploadedUrls.remove(item);
updateAdapterData();
} else {
if (item.equals(UserPhotoWallAdapter.ADD_PHOTO)) {
if (item.equals(ShareWallAdapter.ADD_PHOTO)) {
int maxSelectable = 9 - uploadedUrls.size();
if (maxSelectable > 0) {
// 点击的是"+"'号，启动图片选择
@@ -176,7 +176,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
private void updateAdapterData() {
list.clear();
list.addAll(uploadedUrls); // 添加真实图片
list.add(UserPhotoWallAdapter.ADD_PHOTO); // 最后加上 ADD_PHOTO
list.add(ShareWallAdapter.ADD_PHOTO); // 最后加上 ADD_PHOTO
mUserPhotoWallAdapter.setNewData(list);
}
private void onClick(View view) {
@@ -281,7 +281,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
BottomSheetDialog dialog = new BottomSheetDialog(this);
dialog.setContentView(R.layout.bottom_sheet_recyclerview);
dialog.setContentView(R.layout.bottom_album_recyclerview);
View bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet);
if (bottomSheet != null) {
bottomSheet.setBackgroundResource(android.R.color.transparent); // 设置为透明

12
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/AlbumDetailActivity.java
View File

@@ -31,6 +31,7 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
import com.xscm.modulemain.activity.user.conacts.AlbumDetailConacts;
import com.xscm.modulemain.activity.user.presenter.AlbumDetailPresenter;
import com.xscm.modulemain.BaseMvpActivity;
import com.xscm.modulemain.dialog.ShareDialog;
import com.xscm.moduleutil.bean.AlbumBean;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.GlideEngine;
@@ -38,7 +39,6 @@ import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.PermissionDescriptionHelper;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.widget.Constants;
import com.xscm.modulemain.dialog.ShareDialog;
import java.io.File;
import java.text.SimpleDateFormat;
@@ -259,12 +259,12 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
@Override
public void getAlbumList(List<AlbumBean> data) {
BottomSheetDialog dialog = new BottomSheetDialog(this);
dialog.setContentView(com.xscm.moduleutil.R.layout.bottom_sheet_recyclerview);
dialog.setContentView(R.layout.bottom_album_recyclerview);
RecyclerView recyclerView = dialog.findViewById(com.xscm.moduleutil.R.id.rv_options);
View btnCancel = dialog.findViewById(com.xscm.moduleutil.R.id.btn_cancel);
View btnConfirm = dialog.findViewById(com.xscm.moduleutil.R.id.btn_confirm);
TextView tvTitle = dialog.findViewById(com.xscm.moduleutil.R.id.tv_title);
RecyclerView recyclerView = dialog.findViewById(R.id.rv_options);
View btnCancel = dialog.findViewById(R.id.btn_cancel);
View btnConfirm = dialog.findViewById(R.id.btn_confirm);
TextView tvTitle = dialog.findViewById(R.id.tv_title);
tvTitle.setText("选择相册");
assert recyclerView != null;
recyclerView.setLayoutManager(new GridLayoutManager(this, 4));

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

@@ -379,7 +379,7 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
@Override
public void setBanners(List<BannerModel> bannerModels) {
mBinding.banner.setBannerData(com.xscm.moduleutil.R.layout.index_image_banner, bannerModels);
mBinding.banner.setBannerData(R.layout.index_image_banner, bannerModels);
}

65
MainModule/src/main/java/com/xscm/modulemain/adapter/ShareWallAdapter.java Normal file
View File

@@ -0,0 +1,65 @@
package com.xscm.modulemain.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.xscm.modulemain.R;
import com.xscm.moduleutil.utils.ImageUtils;
public class ShareWallAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
private boolean b = false;
public static final String ADD_PHOTO = "ADD_PHOTO";
private int longClickPos = -1;
public ShareWallAdapter() {
super(R.layout.me_item_user_photo_wall);
}
@Override
protected void convert(BaseViewHolder helper, String item) {
helper.setGone(R.id.iv_close, false);
if (item.equals(ADD_PHOTO)) {
helper.setVisible(R.id.iv_close, false);
// 显示加号图片
helper.setImageResource(R.id.riv_user_head, com.xscm.moduleutil.R.mipmap.add_img);
} else {
helper.setVisible(R.id.iv_close, true);
ImageUtils.loadCenterCrop(item, helper.getView(R.id.riv_user_head));
}
// if (helper.getAdapterPosition() == 5) {
// helper.setVisible(R.id.riv_user_head, false);
// helper.setVisible(R.id.iv_close, false);
// } else {
// helper.setVisible(R.id.riv_user_head, true);
// if (!"0".equals(item.getId())) {
// ImageUtils.loadCenterCrop(item.getUrl(), helper.getView(R.id.riv_user_head));
// if (longClickPos == helper.getAdapterPosition()) {
// helper.setVisible(R.id.iv_close, true);
// } else {
// helper.setVisible(R.id.iv_close, false);
// }
// } else {
// helper.setImageResource(R.id.riv_user_head, com.qxcm.moduleutil.R.mipmap.add_img);
// helper.setGone(R.id.iv_close, false);
// }
// }
helper.addOnClickListener(R.id.iv_close);
helper.addOnClickListener(R.id.riv_user_head);
helper.addOnLongClickListener(R.id.riv_user_head);
}
public void setDelete(boolean b) {
this.b = b;
notifyDataSetChanged();
}
public void setLongClickPos(int pos) {
this.longClickPos = pos;
notifyDataSetChanged();
}
public boolean getDelete() {
return b;
}
}

4
MainModule/src/main/java/com/xscm/modulemain/adapter/UserPhotoWallAdapter.java
View File

@@ -21,10 +21,10 @@ public class UserPhotoWallAdapter extends BaseQuickAdapter<String, BaseViewHolde
if (item.equals(ADD_PHOTO)) {
helper.setVisible(R.id.iv_close, false);
// 显示加号图片
helper.setImageResource(com.xscm.moduleutil.R.id.riv_user_head, com.xscm.moduleutil.R.mipmap.add_img);
helper.setImageResource(R.id.riv_user_head, com.xscm.moduleutil.R.mipmap.add_img);
} else {
helper.setVisible(R.id.iv_close, true);
ImageUtils.loadCenterCrop(item, helper.getView(com.xscm.moduleutil.R.id.riv_user_head));
ImageUtils.loadCenterCrop(item, helper.getView(R.id.riv_user_head));
}
// if (helper.getAdapterPosition() == 5) {
// helper.setVisible(R.id.riv_user_head, false);

9
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
View File

@@ -21,6 +21,7 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.viewpager.widget.ViewPager;
import com.blankj.utilcode.util.LogUtils;
import com.hjq.toast.ToastUtils;
import com.xscm.modulemain.R;
import com.xscm.modulemain.adapter.GiftUserAdapter;
@@ -116,6 +117,9 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
roomId = getArguments().getString("roomId");
jingp = getArguments().getInt("jingp");
heart_id = getArguments().getString("heart_id");
LogUtils.e("RoomGiftDialogFragment_roomInfoResp",roomInfoResp.toString());
LogUtils.e("RoomGiftDialogFragment_userInfo",userInfo.toString());
}
@Override
@@ -156,8 +160,8 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
}
// 清理其他引用
roomInfoResp = null;
userInfo = null;
// roomInfoResp = null;
// userInfo = null;
rewardUserBeanList = null;
giftLabelBeanList = null;
roonGiftModel = null;
@@ -202,7 +206,6 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
rewardUserBean.setSelect(true);
rewardUserBeanList.add(rewardUserBean);
} else {
rewardUserBeanList = getSortedRewardUserList(roomInfoResp.getRoom_info().getPit_list(), "9", "10");
}
mBinding.rvGiftUser.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));