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

1：修改家族展示续签按钮位置

Browse Source 
2：修改购买爵位前，先请求一次接口
3：修改所有CP更改为心动
4：修改挚友，初始获取数据变更成40条
5：未实名认证不能进行歌手认证
This commit is contained in:
梁小江
2025-12-04 15:20:05 +08:00
parent 0f0c2d97cc
commit 46b0a856fe
11 changed files with 155 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,11 +61,7 @@ public class NobleDetailsActivity extends BaseMvpActivity<NobleTitlePresenter, A
gridView = mBinding.gridView;
mGiftWallAdapter=new GridNobleAdapter();
mBinding.imLjkt.setOnClickListener(v -> {
Intent intent = new Intent(this, NoblePaymentActivity.class);
Bundle bundle = new Bundle();
bundle.putString("lid",xlid);
intent.putExtras( bundle);
startActivity(intent);
MvpPre.getNobilityPrice(xlid);
});
}
@@ -152,7 +148,11 @@ public class NobleDetailsActivity extends BaseMvpActivity<NobleTitlePresenter, A
@Override
public void getNobilityPrice(NobilityPrice nobilityPrice) {
Intent intent = new Intent(this, NoblePaymentActivity.class);
Bundle bundle = new Bundle();
bundle.putString("lid",xlid);
intent.putExtras( bundle);
startActivity(intent);
}
@SuppressLint("SetTextI18n")

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

@@ -74,11 +74,7 @@ public class NobleTitleActivity extends BaseMvpActivity<NobleTitlePresenter, Act
intent.putExtras(bundle);
startActivity(intent);
}else if (id== R.id.im_me_noble_xf) {
Intent intent = new Intent(this, NoblePaymentActivity.class);
Bundle bundle = new Bundle();
bundle.putString("lid",lid);
intent.putExtras(bundle);
startActivity(intent);
MvpPre.getNobilityPrice(lid);
}
}
@@ -251,7 +247,11 @@ public class NobleTitleActivity extends BaseMvpActivity<NobleTitlePresenter, Act
@Override
public void getNobilityPrice(NobilityPrice nobilityPrice) {
Intent intent = new Intent(this, NoblePaymentActivity.class);
Bundle bundle = new Bundle();
bundle.putString("lid",lid);
intent.putExtras(bundle);
startActivity(intent);
}
// 在 Activity 或 Fragment 中

14
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ui/main/BosomFriendFragment.kt
View File

@@ -67,7 +67,7 @@ class BosomFriendFragment : BaseMvpFragment<UserHomepagePresenter?, FragmentBoso
page = 1 // 重置页码
// 如果已经初始化完成，立即获取数据
if (isAdded) {
MvpPre?.getFriendList(userId, page.toString(), "10") // 获取第一页数据
MvpPre?.getFriendList(userId, page.toString(), "40") // 获取第一页数据
}
}
@@ -77,7 +77,7 @@ class BosomFriendFragment : BaseMvpFragment<UserHomepagePresenter?, FragmentBoso
override fun initData() {
// 根据userId获取挚友列表数据
if (userId.isNotEmpty()) {
MvpPre?.getFriendList(userId, page.toString(), "10") // 初始加载第一页数据
MvpPre?.getFriendList(userId, page.toString(), "40") // 初始加载第一页数据
}
// 观察ViewModel中的数据变化
@@ -157,19 +157,19 @@ class BosomFriendFragment : BaseMvpFragment<UserHomepagePresenter?, FragmentBoso
// 设置下拉刷新
mBinding.smartRefreshLayout.setOnRefreshListener {
page = 1 // 重置页码
MvpPre?.getFriendList(userId, page.toString(), "10")
MvpPre?.getFriendList(userId, page.toString(), "40")
}
mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(object :
OnRefreshLoadMoreListener {
override fun onLoadMore(refreshLayout: RefreshLayout) {
page++
MvpPre?.getFriendList(userId, page.toString(), "10")
MvpPre?.getFriendList(userId, page.toString(), "40")
}
override fun onRefresh(refreshLayout: RefreshLayout) {
page = 1 // 重置页码
MvpPre?.getFriendList(userId, page.toString(), "10")
MvpPre?.getFriendList(userId, page.toString(), "40")
}
})
@@ -261,12 +261,12 @@ class BosomFriendFragment : BaseMvpFragment<UserHomepagePresenter?, FragmentBoso
override fun topRelationCard(s: String?) {
page = 1 // 重置页码
MvpPre?.getFriendList(userId, page.toString(), "10")
MvpPre?.getFriendList(userId, page.toString(), "40")
}
override fun deleteRelationCard(s: String?) {
page = 1 // 重置页码
MvpPre?.getFriendList(userId, page.toString(), "10")
MvpPre?.getFriendList(userId, page.toString(), "40")
}
override fun setFriendListMore(data: List<RelationshipBean?>?) {

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

@@ -17,7 +17,9 @@ import android.widget.LinearLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.alibaba.android.arouter.launcher.ARouter;
import com.blankj.utilcode.util.LogUtils;
import com.hjq.toast.ToastUtils;
import com.stx.xhb.xbanner.XBanner;
import com.tencent.mm.opensdk.modelbiz.WXOpenCustomerServiceChat;
import com.tencent.mm.opensdk.openapi.IWXAPI;
@@ -45,6 +47,7 @@ import com.xscm.modulemain.activity.user.presenter.MePresenter;
import com.xscm.modulemain.activity.WebViewActivity;
import com.xscm.modulemain.dialog.UserNetWorthDialog;
import com.xscm.moduleutil.base.WebUrlConstants;
import com.xscm.moduleutil.utils.ARouteConstants;
import com.xscm.moduleutil.widget.ShineTextView;
import com.xscm.moduleutil.base.BaseMvpFragment;
import com.xscm.moduleutil.base.CommonAppContext;
@@ -271,6 +274,11 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
} else if (id == R.id.cl_noble_title) {//爵位展示页面
startActivity(new Intent(getContext(), NobleTitleActivity.class));
} else if (id == R.id.ll_singer) {//歌手认证
if (!SpUtil.getRealName()) {
ToastUtils.show("实名认证后才能进行歌手认证");
ARouter.getInstance().build(ARouteConstants.REAL_NAME_ACTIVITY2).navigation();
return;
}
Intent intent = new Intent(getContext(), SingerVerificationActivity.class);
intent.putExtra("isSinger", userInfo.getSinger_status());
startActivity(intent);