YUSHENG/yusheng-android
8
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/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);
}