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

1:修改页面的图标

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

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

@@ -11,6 +11,7 @@ import com.example.modulevocal.presenter.MyMoneyPresenter;
import com.hjq.toast.ToastUtils;
import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.bean.BindType;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.bean.WalletBean;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.SpUtil;
@@ -45,6 +46,8 @@ public class MyMoneyActivity extends BaseMvpActivity<MyMoneyPresenter, ActivityM
super.onResume();
MvpPre.wallet();
MvpPre.bindType(SpUtil.getUserId() + "");
MvpPre.getMyInfo();
}
private void onClick(View view) {
@@ -125,4 +128,9 @@ public class MyMoneyActivity extends BaseMvpActivity<MyMoneyPresenter, ActivityM
}
}
@Override
public void myInfoSuccess(UserInfo data) {
SpUtil.saveUserInfo(data);
}
}

33
modulevocal/src/main/java/com/example/modulevocal/activity/MyRoomActivity.java
View File

@@ -32,16 +32,20 @@ import com.xscm.moduleutil.bean.ManageRoomResp;
import com.xscm.moduleutil.bean.MyCpRoom;
import com.xscm.moduleutil.bean.MyFootResp;
import com.xscm.moduleutil.bean.MyRoomBean;
import com.xscm.moduleutil.event.RoomOutEvent;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.ImageLoader;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.widget.CustomTopBar;
import org.greenrobot.eventbus.EventBus;
import java.util.List;
/**
*@author
*@data 2025/5/15
*@description: 我的房间
* @author
* @data 2025/5/15
* @description: 我的房间
*/
@Route(path = ARouteConstants.MY_ROOM)
public class MyRoomActivity extends BaseMvpActivity<MyRoomPresenter, RoomActivityMyRoomBinding> implements MyRoomListContacts.View {
@@ -186,6 +190,15 @@ public class MyRoomActivity extends BaseMvpActivity<MyRoomPresenter, RoomActivit
mBinding.topBar.setRightIcon(com.xscm.moduleutil.R.mipmap.trend_icon);
mBinding.topBar.setImgPaddingRight(35);
mBinding.topBar.setRightImgVIsible(true);
mBinding.riv.setOnClickListener(v -> {
RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), CommonAppContext.getInstance().playId, "");
});
mBinding.ivGuanbi.setOnClickListener(v -> {
mBinding.ll.setVisibility(View.INVISIBLE);
CommonAppContext.getInstance().isShow = false;
CommonAppContext.getInstance().isPlaying = false;
EventBus.getDefault().post(new RoomOutEvent());
});
initListener();
}
@@ -200,11 +213,11 @@ public class MyRoomActivity extends BaseMvpActivity<MyRoomPresenter, RoomActivit
} else {
mBinding.ll.setVisibility(View.INVISIBLE);
}
if (CommonAppContext.getInstance().isPlaying && CommonAppContext.getInstance().isShow) {
RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), CommonAppContext.getInstance().playId,"");
// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", CommonAppContext.getInstance().playId).navigation();
}
// if (CommonAppContext.getInstance().isPlaying && CommonAppContext.getInstance().isShow) {
// RoomManager.getInstance().fetchRoomDataAndEnter(getApplicationContext(), CommonAppContext.getInstance().playId,"");
//
//// ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("form", "首页").withString("roomId", CommonAppContext.getInstance().playId).navigation();
// }
}
private final Runnable mRivAnimationTask = () -> {
@@ -224,13 +237,13 @@ public class MyRoomActivity extends BaseMvpActivity<MyRoomPresenter, RoomActivit
// }
// startActivity(new Intent(MyRoomActivity.this,CreatedRoomActivity.class));
// }
if (!SpUtil.getRealName()){
if (!SpUtil.getRealName()) {
ToastUtils.show("实名认证后才能创建直播间");
ARouter.getInstance().build(ARouteConstants.REAL_NAME_ACTIVITY2).navigation();
// startActivity(new Intent(MyRoomActivity.this, RealName1Activity.class));
return;
}
startActivity(new Intent(MyRoomActivity.this,CreatedRoomActivity.class));
startActivity(new Intent(MyRoomActivity.this, CreatedRoomActivity.class));
finish();
}
});

14
modulevocal/src/main/java/com/example/modulevocal/activity/PersonalityActivity.java
View File

@@ -2,6 +2,7 @@ package com.example.modulevocal.activity;
import android.content.Intent;
import android.graphics.Color;
import android.view.View;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
@@ -179,7 +180,7 @@ public class PersonalityActivity extends BaseMvpActivity<PersonalityPresenter, A
mBinding.slidingTabLayout.setViewPager(mBinding.viewPager);
mBinding.slidingTabLayout.setCurrentTab(0);
mBinding.viewPager.setOffscreenPageLimit(0);
refreshCurrentGiftFragment(personaltyBean.get(0).getId());
refreshCurrentGiftFragment(personaltyBean.get(0).getId(),0);
mBinding.viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
@@ -189,7 +190,7 @@ public class PersonalityActivity extends BaseMvpActivity<PersonalityPresenter, A
@Override
public void onPageSelected(int position) {
// 当页面切换时，控制 tv_bb_qs 按钮的显示
refreshCurrentGiftFragment(personaltyBean.get(position).getId());
refreshCurrentGiftFragment(personaltyBean.get(position).getId(),position);
}
@Override
@@ -198,9 +199,14 @@ public class PersonalityActivity extends BaseMvpActivity<PersonalityPresenter, A
}
});
}
private void refreshCurrentGiftFragment(String id) {
private void refreshCurrentGiftFragment(String id,int position) {
if (getCurrentGiftFragment()!=null){
getCurrentGiftFragment().loadDataIfNeeded(Integer.parseInt(id));
getCurrentGiftFragment().loadDataIfNeeded(Integer.parseInt(id), position);
if (position==0){
mBinding.ivUser.setVisibility(View.VISIBLE);
}else {
mBinding.ivUser.setVisibility(View.GONE);
}
}
}
private ZhuangBanShangChengFragment getCurrentGiftFragment() {

21
modulevocal/src/main/java/com/example/modulevocal/activity/SettingActivity.java
View File

@@ -18,6 +18,8 @@ import com.example.modulevocal.presenter.SettingPresenter;
import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.activity.WebViewActivity;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.FirstChargeGiftBean;
import com.xscm.moduleutil.dialog.FirstChargeDialog;
import com.xscm.moduleutil.dialog.RealNameDialog;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.utils.SpUtil;
@@ -78,11 +80,22 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
} else {
RealNameDialog realNameDialog = new RealNameDialog(this);
realNameDialog.show();
realNameDialog.setOnDismissListener(dialog -> {
dialog.dismiss();
ARouter.getInstance().build(ARouteConstants.REAL_NAME_ACTIVITY2).navigation();
// startActivity(new Intent(SettingActivity.this, RealName1Activity.class));
realNameDialog.setOnFirstChargeListener(new RealNameDialog.OnFirstChargeListener() {
@Override
public void onFirstChargeConfirmed(String giftBean, int type) {
realNameDialog.dismiss();
ARouter.getInstance().build(ARouteConstants.REAL_NAME_ACTIVITY2).navigation();
}
@Override
public void onFirstChargeCancelled() {
realNameDialog.dismiss();
}
});
// realNameDialog.setOnDismissListener(dialog -> {
// dialog.dismiss();
// ARouter.getInstance().build(ARouteConstants.REAL_NAME_ACTIVITY2).navigation();
// });
}
} else if (view.getId() == R.id.ll_qhch) {
new AlertDialog.Builder(this).setMessage("确认清理缓存？").setPositiveButton("确定", new DialogInterface.OnClickListener() {

29
modulevocal/src/main/java/com/example/modulevocal/activity/UserHomepageActivity.java
View File

@@ -1,13 +1,17 @@
package com.example.modulevocal.activity;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.KeyEvent;
import android.view.View;
import android.widget.ImageView;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.blankj.utilcode.util.ToastUtils;
import com.example.moduletablayout.listener.CustomTabEntity;
import com.example.modulevocal.R;
import com.example.modulevocal.conacts.UserHomepageConacts;
@@ -16,6 +20,7 @@ import com.example.modulevocal.fragment.UserHomepageFragment;
import com.example.modulevocal.presenter.UserHomepagePresenter;
import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.CircleListBean;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.bean.XBannerData;
@@ -67,6 +72,30 @@ public class UserHomepageActivity extends BaseMvpActivity<UserHomepagePresenter,
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
finish();
return true;
}
return super.onKeyDown(keyCode, event);
}
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getOnBackPressedDispatcher() != null) {
getOnBackPressedDispatcher().addCallback(this, new androidx.activity.OnBackPressedCallback(true) {
@Override
public void handleOnBackPressed() {
finish();
}
});
}
}
@Override
protected void initView() {
super.initView();

4
modulevocal/src/main/java/com/example/modulevocal/adapter/BlackAdapter.java
View File

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

5
modulevocal/src/main/java/com/example/modulevocal/conacts/MyMoneyConactos.java
View File

@@ -5,13 +5,14 @@ import android.app.Activity;
import com.xscm.moduleutil.activity.IPresenter;
import com.xscm.moduleutil.activity.IView;
import com.xscm.moduleutil.bean.BindType;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.bean.WalletBean;
public final class MyMoneyConactos {
public interface View extends IView<Activity> {
void wallet(WalletBean walletBean);
void bindType(BindType bindType);
void myInfoSuccess(UserInfo data);
}
public interface IMePre extends IPresenter {
@@ -20,5 +21,7 @@ public final class MyMoneyConactos {
void bindType(String userId);
void getMyInfo();
}
}

29
modulevocal/src/main/java/com/example/modulevocal/fragment/MyAlbumFragment.java
View File

@@ -53,7 +53,7 @@ public class MyAlbumFragment extends BaseMvpFragment<MyAlbumPresenter, FragmentM
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
userId = getArguments().getString("userId");
userId = getArguments().getString("userId");
}
@Override
@@ -64,7 +64,7 @@ public class MyAlbumFragment extends BaseMvpFragment<MyAlbumPresenter, FragmentM
@Override
protected void initData() {
MvpPre.getAlbumList("1", "10",userId);
MvpPre.getAlbumList("1", "10", userId);
}
@Override
@@ -78,29 +78,29 @@ public class MyAlbumFragment extends BaseMvpFragment<MyAlbumPresenter, FragmentM
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
AlbumBean item = mAdapter.getItem(position);
if ("0".equals(item.getId())) {
startActivity(new Intent(getActivity(), CreateAlbumActivity.class));
}
else {
startActivity(new Intent(getActivity(), CreateAlbumActivity.class));
} else {
if (!TextUtils.isEmpty(item.getPwd())) {
if (userId.equals(SpUtil.getUserId() + "")){
if (userId.equals(SpUtil.getUserId() + "")) {
onPasswordCorrect(item);
}else {
} else {
showPasswordInputDialog(item);
}
} else {
ARouter.getInstance().build(ARouteConstants.USER_ALBUM_DETAIL).withString("albumId", item.getId()).withString("pwd", item.getPwd()).withString("target_fragment",ARouteConstants.FRAGMENT_ALBUM).navigation();
ARouter.getInstance().build(ARouteConstants.USER_ALBUM_DETAIL).withString("albumId", item.getId()).withString("pwd", item.getPwd()).withString("target_fragment", ARouteConstants.FRAGMENT_ALBUM).navigation();
}
}
}
});
List<AlbumBean> list = new ArrayList<>();
if (userId.equals(SpUtil.getUserId()+"")){
if (userId.equals(SpUtil.getUserId() + "")) {
AlbumBean albumBean = new AlbumBean();
albumBean.setId("0");
list.add(albumBean);
mAdapter.setNewData(list);
}
}
@SuppressLint({"MissingInflatedId", "LocalSuppress"})
private void showPasswordInputDialog(AlbumBean item) {
// 创建弹出框视图
@@ -108,7 +108,7 @@ public class MyAlbumFragment extends BaseMvpFragment<MyAlbumPresenter, FragmentM
// 获取弹出框中的控件
final EditText etPassword = dialogView.findViewById(com.xscm.moduleutil.R.id.ed_album_password);
TextView btnCancel = dialogView.findViewById(com.xscm.moduleutil.R.id.tv_cancel);
TextView btnCancel = dialogView.findViewById(com.xscm.moduleutil.R.id.tv_cancel);
TextView btnConfirm = dialogView.findViewById(com.xscm.moduleutil.R.id.tv_confirm);
// 创建并显示弹出框
@@ -150,7 +150,7 @@ public class MyAlbumFragment extends BaseMvpFragment<MyAlbumPresenter, FragmentM
// 密码正确后的操作方法（示例）
private void onPasswordCorrect(AlbumBean item) {
// 密码正确后的具体操作
ARouter.getInstance().build(ARouteConstants.USER_ALBUM_DETAIL).withString("albumId", item.getId()).withString("pwd", item.getPwd()).navigation();
ARouter.getInstance().build(ARouteConstants.USER_ALBUM_DETAIL).withString("albumId", item.getId()).withString("pwd", item.getPwd()).navigation();
}
@Override
@@ -160,10 +160,13 @@ public class MyAlbumFragment extends BaseMvpFragment<MyAlbumPresenter, FragmentM
@Override
public void getAlbumList(List<AlbumBean> data) {
if (userId.equals(SpUtil.getUserId()+"")){
if (data == null) {
data = new ArrayList<>();
}
if (userId.equals(SpUtil.getUserId() + "")) {
AlbumBean albumBean = new AlbumBean();
albumBean.setId("0");
data.add(0,albumBean);
data.add(0, albumBean);
}
mAdapter.setNewData(data);
}

4
modulevocal/src/main/java/com/example/modulevocal/fragment/UserHomepageFragment.java
View File

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

28
modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java
View File

@@ -264,22 +264,24 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
llContainer.removeAllViews(); // 清空旧的 ImageView
List<String> images = data.getIcon(); // 获取图片列表
if (images != null && !images.isEmpty()) {
for (String url : images) {
if (url.contains("http")) {
ImageView imageView = new ImageView(getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_37),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_15)
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView.setLayoutParams(params);
imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
for (String url : images) {
if (url.contains("http")) {
ImageView imageView = new ImageView(getContext());
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_74),
getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_17)
);
params.setMargins(0, 0, getContext().getResources().getDimensionPixelSize(com.xscm.moduleutil.R.dimen.dp_5), 0); // 右边距
imageView.setLayoutParams(params);
imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
// 使用 Glide 加载图片
ImageUtils.loadHeadCC(url, imageView);
// 使用 Glide 加载图片
ImageUtils.loadHeadCC(url, imageView);
llContainer.addView(imageView);
llContainer.addView(imageView);
}
}
}

4
modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengConactos.java
View File

@@ -11,7 +11,7 @@ import java.util.List;
public class ZhuangBanShangChengConactos {
public interface View extends IView<Activity> {
void getDecorateList(List<ZhuangBanShangChengBean> zhuangBanShangChengBeans);
void getDecorateList(List<ZhuangBanShangChengBean> zhuangBanShangChengBeans,int tabIndex);
void setUserDecorate();
@@ -19,7 +19,7 @@ public class ZhuangBanShangChengConactos {
}
public interface ICreatedRoomPre extends IPresenter {
void getDecorateList(String type);
void getDecorateList(String type,int tabIndex);
void setUserDecorate(String udid);

178
modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengFragment.java
View File

@@ -1,9 +1,11 @@
package com.example.modulevocal.fragment.zhuangb;
import static android.view.View.GONE;
import static com.xscm.moduleutil.utils.ImageLoader.loadImage;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import androidx.recyclerview.widget.GridLayoutManager;
@@ -12,13 +14,18 @@ import com.example.modulevocal.R;
import com.example.modulevocal.databinding.ZhuangbanRecyclerviewNorefBinding;
import com.example.modulevocal.fragment.MyRoomListFragment;
import com.hjq.toast.ToastUtils;
import com.makeramen.roundedimageview.RoundedImageView;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean;
import com.xscm.moduleutil.color.ThemeableDrawableUtils;
import com.xscm.moduleutil.utils.ColorManager;
import com.xscm.moduleutil.utils.ImageUtils;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.widget.AvatarFrameView;
import com.tencent.qgame.animplayer.AnimView;
import com.xscm.moduleutil.widget.GiftAnimView;
import java.util.ArrayList;
import java.util.List;
public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangChengPresenter, ZhuangbanRecyclerviewNorefBinding> implements ZhuangBanShangChengConactos.View {
@@ -30,7 +37,11 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangC
private String did;
ZhuangBanShangChengAdapter adapter;
AvatarFrameView imageBg;
GiftAnimView imageBg2;
AnimView item_animview;
RoundedImageView image_user;
private int tabIndex;
@Override
protected ZhuangBanShangChengPresenter bindPresenter() {
return new ZhuangBanShangChengPresenter(this, getActivity());
@@ -43,22 +54,26 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangC
fragment.setArguments(args);
return fragment;
}
@Override
public void initArgs(Bundle arguments) {
super.initArgs(arguments);
type = arguments.getInt("type", MyRoomListFragment.TYPE_CREATE);
}
public void loadDataIfNeeded(int type){
if (MvpPre==null){
MvpPre=bindPresenter();
public void loadDataIfNeeded(int type,int tabIndex) {
if (MvpPre == null) {
MvpPre = bindPresenter();
}
MvpPre.getDecorateList(type+"");
this.type = type;
this.tabIndex = tabIndex;
MvpPre.getDecorateList(type + "", tabIndex);
}
@Override
protected void initData() {
MvpPre.getDecorateList(type+"");
MvpPre.getDecorateList(type + "", tabIndex);
// //这里根据传递的type进行数据查询
@@ -73,9 +88,39 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangC
// zhuangBanShangChengBean.setBase_image("");
// zhuangBanShangChengBeanList.add(zhuangBanShangChengBean);
// }
image_user = (RoundedImageView) getActivity().findViewById(R.id.iv_user);
imageBg = (AvatarFrameView) getActivity().findViewById(R.id.image_headPortrait);
// imageBg2 = (GiftAnimView) getActivity().findViewById(R.id.image_headPortrait2);
imageBg2 = new GiftAnimView(getActivity());
imageBg2.setLayoutParams(new ViewGroup.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT
));
imageBg2.setVisibility(GONE);
ViewGroup parentLayout = (ViewGroup) getActivity().findViewById(R.id.ccl).getParent(); // 或者其他合适的父布局
parentLayout.addView(imageBg2);
item_animview = (AnimView) getActivity().findViewById(R.id.item_animview);
if (SpUtil.getUserInfo() != null) {
if (SpUtil.getUserInfo().getAvatar() != null) {
ImageUtils.loadHeadCC(SpUtil.getUserInfo().getAvatar(), image_user);
}
}
// if (type == 1) {
//// image_user.setVisibility(View.VISIBLE);
// imageBg.setVisibility(View.VISIBLE);
// imageBg2.setVisibility(View.GONE);
// } else if (type == 2){
//// image_user.setVisibility(View.GONE);
// imageBg.setVisibility(View.GONE);
// imageBg2.setVisibility(View.VISIBLE);
// }else {
//// image_user.setVisibility(View.GONE);
// imageBg.setVisibility(View.GONE);
// imageBg2.setVisibility(View.GONE);
// }
adapter = new ZhuangBanShangChengAdapter();
GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(), 3);
mBinding.recyclerView.setLayoutManager(gridLayoutManager);
@@ -83,6 +128,29 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangC
adapter.setOnItemChildClickListener((adapter1, view, position) -> {
List<ZhuangBanShangChengBean> list = (List<ZhuangBanShangChengBean>) adapter1.getData();
// 清除之前的选择状态
clearPreviousSelection(list);
// // 设置当前选择
// ZhuangBanShangChengBean selectedBean = list.get(position);
// selectedBean.setIs_select(true);
// pSelect = position;
// did = selectedBean.getUdid();
//
// // 更新UI显示
// if (position == 0) { // "无"选项
// mBinding.ll.setVisibility(View.GONE);
// clearDecorations();
// } else {
// mBinding.ll.setVisibility(View.VISIBLE);
//
// if ("svga".equalsIgnoreCase(getFileExtension(selectedBean.getPlay_image()))) {
// imageBg.stopAll();
// imageBg.setSource(selectedBean.getPlay_image(), 2);
// } else if ("mp4".equalsIgnoreCase(getFileExtension(selectedBean.getPlay_image()))) {
// imageBg.stopAll();
// imageBg.setSource(selectedBean.getPlay_image(), 2);
// }
// }
if (pSelect != -1 && pSelect != position) {
list.get(pSelect).setIs_select(false);
@@ -90,38 +158,60 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangC
pSelect = position;
did = list.get(position).getUdid();
mBinding.ll.setVisibility(View.VISIBLE);
if (list.get( position)!=null && list.get(position).getType()!=null && list.get(position).getPlay_image()!=null) {
if ("svga".equalsIgnoreCase(getFileExtension(list.get(position).getPlay_image()))) {
// imageBg.playSVGA(list.get(position).getPlay_image());
imageBg.stopAll();
imageBg.setSource(list.get(position).getPlay_image(),1);
} else if ("mp4".equalsIgnoreCase(getFileExtension(list.get(position).getPlay_image()))) {
// imageBg.playMP4(Uri.parse(list.get(position).getPlay_image()));
imageBg.stopAll();
imageBg.setSource(list.get(position).getPlay_image(),1);
// if ("svga".equalsIgnoreCase(getFileExtension(list.get(position).getPlay_image()))) {
if (list.get(position).getType().equals("1")) {
imageBg2.setVisibility(View.GONE);
imageBg.stopAll();
imageBg.setSource(list.get(position).getPlay_image(), 2);
} else if (list.get(position).getType().equals("2")) {
// imageBg2.setSource(list.get(position).getPlay_image(), 2);
imageBg2.setVisibility(View.VISIBLE);
imageBg2.previewEffectWith(list.get(position).getPlay_image());
}
}
// } else if ("mp4".equalsIgnoreCase(getFileExtension(list.get(position).getPlay_image()))) {
//// imageBg.playMP4(Uri.parse(list.get(position).getPlay_image()));
// imageBg.stopAll();
// imageBg.setSource(list.get(position).getPlay_image(),2);
// }
} else if (pSelect != -1 && pSelect == position) {
list.get(position).setIs_select(false);
pSelect = -1;
mBinding.ll.setVisibility(View.GONE);
mBinding.ll.setVisibility(GONE);
} else {
list.get(position).setIs_select(true);
did = list.get(position).getUdid();
pSelect = position;
mBinding.ll.setVisibility(View.VISIBLE);
if (list.get( position)!=null && list.get(position).getType()!=null && list.get(position).getPlay_image()!=null) {
if (list.get(position).getType().equals("1")) {
imageBg2.setVisibility(View.GONE);
imageBg.stopAll();
imageBg.setSource(list.get(position).getPlay_image(), 2);
} else if (list.get(position).getType().equals("2")) {
imageBg2.setVisibility(View.VISIBLE);
// imageBg2.stopAll();
// imageBg2.setSource(list.get(position).getPlay_image(), 2);
imageBg2.previewEffectWith(list.get(position).getPlay_image());
}
}
// loadImage(getContext(),imageBg, list.get(position).getPlay_image());
// ImageUtils.loadDecorationAvatar(list.get(position).getPlay_image(), imageBg);
// imageBg.load(list.get(position).getPlay_image());
if ("svga".equalsIgnoreCase(getFileExtension(list.get(position).getPlay_image()))) {
imageBg.stopAll();
imageBg.setSource(list.get(position).getPlay_image(),1);
// imageBg.playSVGA(list.get(position).getPlay_image());
} else if ("mp4".equalsIgnoreCase(getFileExtension(list.get(position).getPlay_image()))) {
imageBg.stopAll();
imageBg.setSource(list.get(position).getPlay_image(), 1);
// imageBg.playMP4(Uri.parse(list.get(position).getPlay_image()));
}
// if ("svga".equalsIgnoreCase(getFileExtension(list.get(position).getPlay_image()))) {
// imageBg.stopAll();
// imageBg.setSource(list.get(position).getPlay_image(), 2);
//// imageBg.playSVGA(list.get(position).getPlay_image());
// } else if ("mp4".equalsIgnoreCase(getFileExtension(list.get(position).getPlay_image()))) {
// imageBg.stopAll();
// imageBg.setSource(list.get(position).getPlay_image(), 2);
//// imageBg.playMP4(Uri.parse(list.get(position).getPlay_image()));
// }
}
@@ -131,6 +221,29 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangC
adapter.setNewData(zhuangBanShangChengBeanList);
}
/**
* 清除之前的选择状态
*/
private void clearPreviousSelection(List<ZhuangBanShangChengBean> list) {
if (pSelect != -1 && pSelect < list.size()) {
list.get(pSelect).setIs_select(false);
}
pSelect = -1;
}
/**
* 清除装饰效果
*/
private void clearDecorations() {
if (imageBg != null) {
imageBg.stopAll();
}
if (item_animview != null) {
item_animview.stopPlay();
}
}
private String getFileExtension(String url) {
if (url == null || url.isEmpty()) return "";
int dotIndex = url.lastIndexOf(".");
@@ -144,9 +257,9 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangC
protected void initView() {
mBinding.zhuangbanBuy.setOnClickListener(v -> {
if (did == null || did.isEmpty()){
MvpPre.cancelUserDecorate(type+"");
}else {
if (did == null || did.isEmpty()) {
MvpPre.cancelUserDecorate(type + "");
} else {
MvpPre.setUserDecorate(did);
}
});
@@ -160,15 +273,20 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangC
}
@Override
public void getDecorateList(List<ZhuangBanShangChengBean> zhuangBanShangChengBeans) {
if (adapter==null){
public void getDecorateList(List<ZhuangBanShangChengBean> zhuangBanShangChengBeans, int tabIndex) {
if (adapter == null) {
adapter = new ZhuangBanShangChengAdapter();
}
if (zhuangBanShangChengBeans==null){
zhuangBanShangChengBeans=new ArrayList<>();
}
ZhuangBanShangChengBean zhuangBanShangChengBean = new ZhuangBanShangChengBean();
zhuangBanShangChengBean.setTitle("无");
zhuangBanShangChengBean.setBase_image("");
zhuangBanShangChengBeans.add(0,zhuangBanShangChengBean);
zhuangBanShangChengBeans.add(0, zhuangBanShangChengBean);
adapter.setNewData(zhuangBanShangChengBeans);
this.tabIndex = tabIndex;
}
@Override

4
modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengPresenter.java
View File

@@ -20,7 +20,7 @@ public class ZhuangBanShangChengPresenter extends BasePresenter<ZhuangBanShangCh
}
@Override
public void getDecorateList(String type) {
public void getDecorateList(String type,int tabIndex) {
api.getDecorateList(type, new BaseObserver<List<ZhuangBanShangChengBean>>() {
@Override
public void onSubscribe(Disposable d) {
@@ -32,7 +32,7 @@ public class ZhuangBanShangChengPresenter extends BasePresenter<ZhuangBanShangCh
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().getDecorateList(zhuangBanShangChengBeans);
MvpRef.get().getDecorateList(zhuangBanShangChengBeans, tabIndex);
}
});
}

16
modulevocal/src/main/java/com/example/modulevocal/presenter/MyMoneyPresenter.java
View File

@@ -4,6 +4,7 @@ import android.content.Context;
import com.example.modulevocal.conacts.MyMoneyConactos;
import com.xscm.moduleutil.bean.BindType;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.bean.WalletBean;
import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.presenter.BasePresenter;
@@ -44,4 +45,19 @@ public class MyMoneyPresenter extends BasePresenter<MyMoneyConactos.View> implem
}
});
}
@Override
public void getMyInfo() {
api.getMyInfo(new BaseObserver<UserInfo>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable(d);
}
@Override
public void onNext(UserInfo userInfo) {
MvpRef.get().myInfoSuccess(userInfo);
}
});
}
}

2
modulevocal/src/main/res/layout/activity_created_room.xml
View File

@@ -93,7 +93,7 @@
android:layout_weight="1"
android:background="@drawable/bg_r100_hui"
android:gravity="center|left"
android:hint="请输入昵称"
android:hint="请输入房间名称"
android:maxLength="10"
android:paddingStart="10dp"
android:paddingEnd="@dimen/dp_10"

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

@@ -136,7 +136,7 @@
app:layout_constraintTop_toBottomOf="@+id/tv_zd">
<TextView
android:layout_width="@dimen/dp_56"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_21"
android:layout_alignParentStart="true"
android:layout_centerHorizontal="true"
@@ -168,7 +168,7 @@
app:layout_constraintTop_toBottomOf="@+id/r_1">
<TextView
android:layout_width="@dimen/dp_56"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_21"
android:text="@string/diamond_income_expense"
android:layout_centerInParent="true"
@@ -212,7 +212,7 @@
app:layout_constraintTop_toBottomOf="@+id/tv_qt">
<TextView
android:layout_width="@dimen/dp_56"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_21"
android:text="@string/diamond_to_coin"
android:layout_centerInParent="true"
@@ -245,7 +245,7 @@
app:layout_constraintTop_toBottomOf="@+id/r_3">
<TextView
android:layout_width="@dimen/dp_56"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_21"
android:text="@string/diamond_to_bangka"
android:layout_centerInParent="true"

9
modulevocal/src/main/res/layout/activity_personality.xml
View File

@@ -9,6 +9,7 @@
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ccl"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -85,7 +86,8 @@
<com.tencent.qgame.animplayer.AnimView
android:id="@+id/item_animview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -118,6 +120,11 @@
android:layout_marginTop="@dimen/dp_30"
app:layout_constraintTop_toBottomOf="@+id/cl_2" />
<com.xscm.moduleutil.widget.GiftAnimView
android:id="@+id/image_headPortrait2"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_60"

3
modulevocal/src/main/res/layout/me_fagment_user_gift_wall.xml
View File

@@ -18,12 +18,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_20">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_10"
android:nestedScrollingEnabled="false"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:layout_constraintTop_toBottomOf="@+id/tv_title"

3
modulevocal/src/main/res/layout/me_item_user_gift_wall.xml
View File

@@ -2,9 +2,10 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_78"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_110"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_10"
android:background="#E9E9E9"
android:gravity="center_horizontal"
android:orientation="vertical"