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

1、修改包的图片

Browse Source 
2、修改房间的所有进出方式
This commit is contained in:
梁小江
2025-09-19 02:28:02 +08:00
parent 4e0ea44f21
commit fc544229fe
1003 changed files with 2512 additions and 1966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modulevocal/src/main/java/com/example/modulevocal/activity/AboutUsActivity.java
View File

@@ -5,6 +5,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
import com.example.modulevocal.R;
import com.example.modulevocal.databinding.ActivityAboutUsBinding;
import com.xscm.moduleutil.activity.BaseAppCompatActivity;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.widget.CommonAppConfig;
@@ -16,11 +17,12 @@ public class AboutUsActivity extends BaseAppCompatActivity<ActivityAboutUsBindin
mBinding.tvAppVersion.setText("Version " + CommonAppConfig.getInstance().getVersion());
mBinding.llYonghu.setOnClickListener(v -> {
ARouter.getInstance().build(ARouteConstants.H5).withString("url", "file:///android_asset/page_yongh.html").withString("title", "用户协议").navigation();
ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=6").withString("title", "用户协议").navigation();
});
mBinding.llYins.setOnClickListener(v -> {
ARouter.getInstance().build(ARouteConstants.H5).withString("url", "file:///android_asset/page_show.html").withString("title", "隐私协议").navigation();
ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=4").withString("title", "隐私协议").navigation();
// ARouter.getInstance().build(ARouteConstants.H5).withString("url", "file:///android_asset/page_show.html").withString("title", "隐私协议").navigation();
});
}

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

@@ -7,6 +7,7 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
import com.example.modulevocal.R;
import com.example.modulevocal.conacts.PersonalityConacts;
@@ -15,11 +16,13 @@ import com.example.modulevocal.fragment.zhuangb.ZhuangBanShangChengFragment;
import com.example.modulevocal.presenter.PersonalityPresenter;
import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.activity.WebViewActivity;
import com.xscm.moduleutil.adapter.GiftTwoDetailsFragment;
import com.xscm.moduleutil.adapter.MyPagerAdapter;
import com.xscm.moduleutil.base.CommonAppContext;
import com.xscm.moduleutil.bean.PersonaltyBean;
import com.xscm.moduleutil.utils.ColorManager;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.widget.dialog.RewardGiftDialogFragment;
import java.util.ArrayList;
import java.util.List;
@@ -169,9 +172,44 @@ 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());
mBinding.viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
}
@Override
public void onPageSelected(int position) {
// 当页面切换时，控制 tv_bb_qs 按钮的显示
refreshCurrentGiftFragment(personaltyBean.get(position).getId());
}
@Override
public void onPageScrollStateChanged(int state) {
}
});
}
private void refreshCurrentGiftFragment(String id) {
if (getCurrentGiftFragment()!=null){
getCurrentGiftFragment().loadDataIfNeeded(Integer.parseInt(id));
}
}
private ZhuangBanShangChengFragment getCurrentGiftFragment() {
int currentPosition = mBinding.viewPager.getCurrentItem();
// 使用 ViewPager 的 adapter 获取当前 fragment
MyFragmentPagerAdapter adapter = (MyFragmentPagerAdapter) mBinding.viewPager.getAdapter();
if (adapter != null) {
// 直接从 adapter 获取 fragment
Fragment fragment = adapter.getItem(currentPosition);
if (fragment instanceof ZhuangBanShangChengFragment) {
return (ZhuangBanShangChengFragment) fragment;
}
}
return null;
}
private static class MyFragmentPagerAdapter extends FragmentStatePagerAdapter {
private List<PersonaltyBean> list;

3
modulevocal/src/main/java/com/example/modulevocal/activity/PhoneReplacementActivity.java
View File

@@ -10,6 +10,8 @@ import com.example.modulevocal.presenter.PhoneReplacementPresenter;
import com.hjq.toast.ToastUtils;
import com.xscm.moduleutil.activity.BaseAppCompatActivity;
import com.xscm.moduleutil.activity.BaseMvpActivity;
import com.xscm.moduleutil.bean.UserBean;
import com.xscm.moduleutil.bean.UserInfo;
import com.xscm.moduleutil.color.ThemeableDrawableUtils;
import com.xscm.moduleutil.utils.ColorManager;
import com.xscm.moduleutil.utils.SpUtil;
@@ -133,6 +135,7 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
ToastUtils.show(s);
} else {
ToastUtils.show(s);
finish();
}

5
modulevocal/src/main/java/com/example/modulevocal/adapter/RevenueAdapter.java
View File

@@ -1,5 +1,7 @@
package com.example.modulevocal.adapter;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.example.modulevocal.R;
@@ -18,7 +20,8 @@ public class RevenueAdapter extends BaseQuickAdapter<RevenueBean, BaseViewHolder
helper.setText(R.id.tv_time, time);
helper.setText(R.id.tv_name, item.getRemarks());
helper.setText(R.id.tv_jb, item.getChange_value());
TextView textView=helper.getView(R.id.tv_name);
textView.setSelected(true);
if (item.getType()==2){
helper.getView(R.id.im_ty).setBackgroundResource(com.xscm.moduleutil.R.mipmap.gift_t);
}else if (item.getType()==1){

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

@@ -145,13 +145,13 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
intent.putExtra("type",2);
startActivity(intent);
} else if (id == R.id.ll_friends) {//访客
if (userInfo.getCharm_level()>=20){
// if (userInfo.getCharm_level()>=20){
Intent intent=new Intent(getContext(), BlacklistActivity.class);
intent.putExtra("type",3);
startActivity(intent);
}else {
ToastUtils.showShort("需要魅力等级20以上才能查看");
}
// }else {
// ToastUtils.showShort("需要魅力等级20以上才能查看");
// }
// ARouter.getInstance().build(ARouteConstants.ME_MY_FRIENDS).withInt("type", 0).navigation();
// AppLogUtil.reportAppLog(AppLogEvent.C0112);

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

@@ -48,10 +48,21 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangC
super.initArgs(arguments);
type = arguments.getInt("type", MyRoomListFragment.TYPE_CREATE);
}
public void loadDataIfNeeded(int type){
if (MvpPre==null){
MvpPre=bindPresenter();
}
MvpPre.getDecorateList(type+"");
}
@Override
protected void initData() {
MvpPre.getDecorateList(type+"");
// //这里根据传递的type进行数据查询
// zhuangBanShangChengBeanList=new ArrayList<>();
// for (int i = 0; i < 10; i++) {
// ZhuangBanShangChengBean zhuangBanShangChengBean=new ZhuangBanShangChengBean();
@@ -82,9 +93,11 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangC
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);
}
} else if (pSelect != -1 && pSelect == position) {
@@ -101,9 +114,11 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangC
// 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()));
}
@@ -146,8 +161,11 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment<ZhuangBanShangC
@Override
public void getDecorateList(List<ZhuangBanShangChengBean> zhuangBanShangChengBeans) {
if (adapter==null){
adapter = new ZhuangBanShangChengAdapter();
}
ZhuangBanShangChengBean zhuangBanShangChengBean = new ZhuangBanShangChengBean();
zhuangBanShangChengBean.setTitle("默认头像");
zhuangBanShangChengBean.setTitle("无");
zhuangBanShangChengBean.setBase_image("");
zhuangBanShangChengBeans.add(0,zhuangBanShangChengBean);
adapter.setNewData(zhuangBanShangChengBeans);

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

@@ -6,13 +6,17 @@ import com.xscm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean;
import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.presenter.BasePresenter;
import java.lang.ref.WeakReference;
import java.util.List;
import io.reactivex.disposables.Disposable;
public class ZhuangBanShangChengPresenter extends BasePresenter<ZhuangBanShangChengConactos.View> implements ZhuangBanShangChengConactos.ICreatedRoomPre {
ZhuangBanShangChengConactos.View mView;
public ZhuangBanShangChengPresenter(ZhuangBanShangChengConactos.View view, Context context) {
super(view, context);
this.mView = view;
}
@Override
@@ -25,6 +29,9 @@ public class ZhuangBanShangChengPresenter extends BasePresenter<ZhuangBanShangCh
@Override
public void onNext(List<ZhuangBanShangChengBean> zhuangBanShangChengBeans) {
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().getDecorateList(zhuangBanShangChengBeans);
}
});
@@ -40,7 +47,10 @@ public class ZhuangBanShangChengPresenter extends BasePresenter<ZhuangBanShangCh
@Override
public void onNext(String s) {
MvpRef.get().setUserDecorate();
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().setUserDecorate();
}
});
}
@@ -56,6 +66,9 @@ public class ZhuangBanShangChengPresenter extends BasePresenter<ZhuangBanShangCh
@Override
public void onNext(String s) {
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().cancelUserDecorate();
}
});

33
modulevocal/src/main/java/com/example/modulevocal/presenter/PhoneReplacementPresenter.java
View File

@@ -3,15 +3,18 @@ package com.example.modulevocal.presenter;
import android.content.Context;
import com.example.modulevocal.conacts.PhoneReplacementConacts;
import com.xscm.moduleutil.bean.UserBean;
import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.presenter.BasePresenter;
import com.xscm.moduleutil.utils.SpUtil;
import java.lang.ref.WeakReference;
import io.reactivex.disposables.Disposable;
public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementConacts.View> implements PhoneReplacementConacts.IMePre{
public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementConacts.View> implements PhoneReplacementConacts.IMePre {
PhoneReplacementConacts.View mView;
public PhoneReplacementPresenter(PhoneReplacementConacts.View view, Context context) {
super(view, context);
this.mView = view;
@@ -19,7 +22,7 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
@Override
public void sendCode(String phoneNumber, String type) {
api.sendCode(phoneNumber,type, new BaseObserver<Object>() {
api.sendCode(phoneNumber, type, new BaseObserver<Object>() {
@Override
public void onSubscribe(Disposable d) {
@@ -28,8 +31,8 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
@Override
public void onNext(Object o) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
MvpRef.get().sendCodeSuccess1(phoneNumber);
}
@@ -38,23 +41,26 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
}
@Override
public void mobileView(String mobile, String new_mobile, String sms_code,String type) {
if (type.equals("1")){
public void mobileView(String mobile, String new_mobile, String sms_code, String type) {
if (type.equals("1")) {
api.mobileView(mobile, new_mobile, sms_code, new BaseObserver<String>() {
@Override
public void onSubscribe(Disposable d) {
addDisposable( d);
addDisposable(d);
}
@Override
public void onNext(String s) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
UserBean userInfo = SpUtil.getUserBean();
userInfo.setMobile(new_mobile);
SpUtil.saveUserBean(userInfo);
MvpRef.get().sendCodeSuccess(s);
}
});
}else if (type.equals("2")){
} else if (type.equals("2")) {
api.mobileView2(new_mobile, sms_code, new BaseObserver<String>() {
@Override
public void onSubscribe(Disposable d) {
@@ -63,9 +69,12 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
@Override
public void onNext(String s) {
if (MvpRef==null){
MvpRef=new WeakReference<>(mView);
if (MvpRef == null) {
MvpRef = new WeakReference<>(mView);
}
UserBean userInfo = SpUtil.getUserBean();
userInfo.setMobile(new_mobile);
SpUtil.saveUserBean(userInfo);
MvpRef.get().sendCodeSuccess(s);
}
});

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

@@ -45,7 +45,8 @@
android:layout_marginEnd="@dimen/dp_84"
android:text="@string/avatar_change_info"
android:textColor="@color/color_FF999999"
android:textSize="@dimen/sp_12" />
android:textSize="@dimen/sp_12"
android:visibility="invisible"/>
<RelativeLayout
android:id="@+id/rl_1"
@@ -123,7 +124,8 @@
android:layout_alignParentEnd="true"
android:layout_centerInParent="true"
android:layout_marginEnd="@dimen/dp_16"
android:src="@drawable/detail_icon_go" />
android:src="@drawable/detail_icon_go"
android:visibility="invisible"/>
</RelativeLayout>

1
modulevocal/src/main/res/layout/activity_setting.xml
View File

@@ -53,6 +53,7 @@
android:id="@+id/ll_youth"
style="@style/My_Info_Item_LL_Style"
android:background="@drawable/bg_r15_white"
android:visibility="gone"
>
<TextView

1
modulevocal/src/main/res/layout/fragment_vocal_range.xml
View File

@@ -69,6 +69,7 @@
android:layout_height="@dimen/dp_68"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_88"
android:paddingStart="@dimen/dp_16"
android:layout_weight="1"
android:gravity="center|left"
android:orientation="horizontal"

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

@@ -10,12 +10,19 @@
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_20"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_FF333333"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
tools:text="每日签到"
/>
<TextView

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

@@ -97,7 +97,7 @@
android:id="@+id/tv_bl"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="今日收益"
android:text="今日流水"
android:textColor="#ff999999"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="@+id/tv_sy"