合并2

MainModule/src/main/java/com/xscm/modulemain/activity/user/PageViewModel.java

@@ -1,11 +1,11 @@
-package com.example.modulevocal.activity.ui.main;
+package com.xscm.modulemain.activity.user;
 
 import static androidx.lifecycle.Transformations.map;
 
-import androidx.arch.core.util.Function;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+
 import com.xscm.moduleutil.bean.GiftUserWallBean;
 
 import java.util.List;

MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/GiftWallActivity.java

@@ -1,30 +1,28 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
-import android.annotation.SuppressLint;
 import android.graphics.Color;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.TextView;
+
 import androidx.viewpager2.widget.ViewPager2;
-import com.example.modulevocal.R;
-import com.example.modulevocal.activity.ui.main.GiftWallConacts;
-import com.example.modulevocal.activity.ui.main.GiftWallPresenter;
+
 import com.google.android.material.tabs.TabLayout;
-import androidx.viewpager.widget.ViewPager;
-import com.example.modulevocal.activity.ui.main.SectionsPagerAdapter;
-import com.example.modulevocal.databinding.ActivityGiftWallBinding;
 import com.google.android.material.tabs.TabLayoutMediator;
-import com.xscm.moduleutil.activity.BaseMvpActivity;
-import com.xscm.moduleutil.bean.CombinedGiftBean;
+import com.xscm.modulemain.BaseMvpActivity;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.user.conacts.GiftWallConacts;
+import com.xscm.modulemain.activity.user.presenter.GiftWallPresenter;
+import com.xscm.modulemain.adapter.SectionsGifPagerAdapter;
+import com.xscm.modulemain.databinding.ActivityGiftWallBinding;
 import com.xscm.moduleutil.bean.GiftUserWallBean;
-import com.xscm.moduleutil.bean.RoomTypeModel;
 import com.xscm.moduleutil.utils.SpUtil;
 
 /**
  * 礼物墙
  */
 public class GiftWallActivity extends BaseMvpActivity<GiftWallPresenter, ActivityGiftWallBinding> implements GiftWallConacts.View {
-    SectionsPagerAdapter sectionsPagerAdapter;
+    SectionsGifPagerAdapter sectionsPagerAdapter;
 
     @Override
     protected void initData() {
@@ -35,7 +33,7 @@ public class GiftWallActivity extends BaseMvpActivity<GiftWallPresenter, Activit
 
     // 在获取到数据后调用此方法初始化 ViewPager
     private void setupViewPagerWithData(GiftUserWallBean data) {
-        sectionsPagerAdapter = new SectionsPagerAdapter(this, data);
+        sectionsPagerAdapter = new SectionsGifPagerAdapter(this, data);
         ViewPager2 viewPager = mBinding.viewPager;
         viewPager.setAdapter(sectionsPagerAdapter);
         TabLayout tabs = mBinding.tabs;

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

@@ -1,4 +1,6 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
+
+import static android.view.View.GONE;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -6,36 +8,31 @@ import android.graphics.LinearGradient;
 import android.graphics.Shader;
 import android.os.Build;
 import android.os.Bundle;
-
-import android.view.MotionEvent;
-import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.GridView;
 import android.widget.TextView;
-import androidx.activity.EdgeToEdge;
+
 import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 import androidx.viewpager2.widget.ViewPager2;
-import com.example.modulevocal.R;
-import com.example.modulevocal.adapter.GridNobleAdapter;
-import com.example.modulevocal.adapter.NobliityBannerAdapter;
-import com.example.modulevocal.conacts.NobleTitleConacts;
-import com.example.modulevocal.databinding.ActivityNobleDetailsBinding;
-import com.example.modulevocal.presenter.NobleTitlePresenter;
-import com.xscm.moduleutil.activity.BaseMvpActivity;
+
+import com.xscm.modulemain.BaseMvpActivity;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.user.conacts.NobleTitleConacts;
+import com.xscm.modulemain.activity.user.presenter.NobleTitlePresenter;
+import com.xscm.modulemain.adapter.GridNobleAdapter;
+import com.xscm.modulemain.adapter.NobliityBannerAdapter;
+import com.xscm.modulemain.databinding.ActivityNobleDetailsBinding;
+import com.xscm.modulemain.dialog.RoomAuctionWebViewDialog;
 import com.xscm.moduleutil.base.CommonAppContext;
-import com.xscm.moduleutil.bean.*;
-import com.xscm.moduleutil.dialog.RoomAuctionWebViewDialog;
-import com.zhpan.bannerview.BannerViewPager;
+import com.xscm.moduleutil.bean.AppPay;
+import com.xscm.moduleutil.bean.BindType;
+import com.xscm.moduleutil.bean.NobilitDeatils;
+import com.xscm.moduleutil.bean.NobilitList;
+import com.xscm.moduleutil.bean.NobilityPrice;
 import com.zhpan.bannerview.constants.PageStyle;
 
 import java.util.List;
 
-import static android.view.View.GONE;
-
 /**
  * @Description: 这是爵位详情方案
  * @Author: qx

MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/NoblePaymentActivity.java

@@ -1,38 +1,43 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
 
 import android.content.Intent;
 import android.graphics.Paint;
 import android.net.Uri;
 import android.os.Bundle;
-
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import androidx.activity.EdgeToEdge;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
+
 import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alibaba.fastjson.JSON;
-import com.example.modulevocal.R;
-import com.example.modulevocal.adapter.NoblePrivilegeAdapter;
-import com.example.modulevocal.conacts.NobleTitleConacts;
-import com.example.modulevocal.databinding.ActivityNoblePaymentBinding;
-import com.example.modulevocal.presenter.NobleTitlePresenter;
 import com.hjq.toast.ToastUtils;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
-import com.xscm.moduleutil.activity.BaseMvpActivity;
+import com.xscm.modulemain.BaseMvpActivity;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.user.conacts.NobleTitleConacts;
+import com.xscm.modulemain.activity.user.presenter.NobleTitlePresenter;
+import com.xscm.modulemain.adapter.NoblePrivilegeAdapter;
+import com.xscm.modulemain.databinding.ActivityNoblePaymentBinding;
+import com.xscm.modulemain.dialog.RoomAuctionWebViewDialog;
 import com.xscm.moduleutil.adapter.PayMethodAdapter;
 import com.xscm.moduleutil.base.CommonAppContext;
-import com.xscm.moduleutil.bean.*;
+import com.xscm.moduleutil.bean.AppPay;
+import com.xscm.moduleutil.bean.BindType;
+import com.xscm.moduleutil.bean.NobilitDeatils;
+import com.xscm.moduleutil.bean.NobilitList;
+import com.xscm.moduleutil.bean.NobilityPrice;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
-import com.xscm.moduleutil.dialog.RoomAuctionWebViewDialog;
 import com.xscm.moduleutil.event.PayEvent;
-import com.xscm.moduleutil.utils.*;
+import com.xscm.moduleutil.utils.ARouteConstants;
+import com.xscm.moduleutil.utils.ColorManager;
+import com.xscm.moduleutil.utils.ImageUtils;
+import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.widget.PaymentUtil;
+
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
@@ -43,9 +48,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-
 /**
  * @Description: 这是爵位支付方案
  * @Author: qx

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

@@ -1,53 +1,46 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.graphics.LinearGradient;
 import android.graphics.Shader;
 import android.os.Bundle;
-
-import android.os.Handler;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.HorizontalScrollView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import androidx.activity.EdgeToEdge;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.NobleTitleConacts;
-import com.example.modulevocal.databinding.ActivityNobleTitleBinding;
-import com.example.modulevocal.presenter.NobleTitlePresenter;
+
 import com.rmondjone.locktableview.LockTableView;
 import com.rmondjone.xrecyclerview.ProgressStyle;
-import com.rmondjone.xrecyclerview.XRecyclerView;
-import com.xscm.moduleutil.activity.BaseMvpActivity;
-import com.xscm.moduleutil.activity.IPresenter;
-import com.xscm.moduleutil.base.BaseRoomContacts;
+import com.xscm.modulemain.BaseMvpActivity;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.user.conacts.NobleTitleConacts;
+import com.xscm.modulemain.activity.user.presenter.NobleTitlePresenter;
+import com.xscm.modulemain.databinding.ActivityNobleTitleBinding;
+import com.xscm.modulemain.dialog.RoomAuctionWebViewDialog;
 import com.xscm.moduleutil.base.CommonAppContext;
-import com.xscm.moduleutil.bean.*;
-import com.xscm.moduleutil.dialog.RoomAuctionWebViewDialog;
-import com.xscm.moduleutil.utils.ARouteConstants;
+import com.xscm.moduleutil.bean.AppPay;
+import com.xscm.moduleutil.bean.BindType;
+import com.xscm.moduleutil.bean.NobilitDeatils;
+import com.xscm.moduleutil.bean.NobilitList;
+import com.xscm.moduleutil.bean.NobilityPrice;
+import com.xscm.moduleutil.bean.TableCellData;
 import com.xscm.moduleutil.utils.ImageUtils;
-import com.xscm.moduleutil.utils.TimeUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-
 /**
  * @Description: 爵位展示页面
  * @Author: qx
  * @Data: 2022/4/18 21:05
  */
-public class NobleTitleActivity extends BaseMvpActivity<NobleTitlePresenter, ActivityNobleTitleBinding> implements NobleTitleConacts.View {
+public class NobleTitleActivity extends BaseMvpActivity<NobleTitlePresenter, ActivityNobleTitleBinding> implements com.xscm.modulemain.activity.user.conacts.NobleTitleConacts.View {
     private LinearLayout mContentView;
     private List<NobilitDeatils.nobilityPowerItem> mNobilityPowerItemList = new ArrayList<>();
     private String lid;

MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java

@@ -23,6 +23,7 @@ import com.xscm.modulemain.activity.user.presenter.SettingPresenter;
 import com.xscm.modulemain.BaseMvpActivity;
 import com.xscm.modulemain.dialog.YouthModelDialog;
 import com.xscm.moduleutil.base.CommonAppContext;
+import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.dialog.RealNameDialog;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.SpUtil;
@@ -50,6 +51,7 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
 
     private int clickCount = 0;
     private static final int REQUIRED_CLICKS = 6;
+    private UserInfo userInfo;
     private Handler handler = new Handler();
     private Runnable resetRunnable = new Runnable() {
         @Override
@@ -60,7 +62,21 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
     private static final long RESET_DELAY = 1000; // 1秒无操作自动重置
 
     protected void initData() {
+        userInfo = SpUtil.getUserInfo();
         mBinding.tvBbh.setText(CommonAppConfig.getInstance().getVersion());
+
+        if (userInfo != null) {
+            if (userInfo.getIs_hide() != null && userInfo.getIs_hide().equals("1")) {
+                mBinding.llQhdz.setVisibility(View.VISIBLE);
+                if (userInfo.getHide_status()!=null && userInfo.getHide_status().equals("1")){
+                    mBinding.swit.setChecked(true);
+                }else {
+                    mBinding.swit.setChecked(false);
+                }
+            } else {
+                mBinding.llQhdz.setVisibility(View.GONE);
+            }
+        }
     }
 
     @Override
@@ -89,6 +105,11 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
 
     @SuppressLint("CheckResult")
     private void onClick(View view) {
+
+        if (MvpPre == null) {
+            MvpPre = bindPresenter();
+        }
+
         if (view.getId() == R.id.ll_youth) {
 //            startActivity(new Intent(this, UnderageActivity.class));
             showYouthModelDialog();
@@ -137,7 +158,7 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
                 }
             }).setNegativeButton("取消", null).create().show();
         } else if (view.getId() == R.id.swit) {
-            if (mBinding.swit.isChecked()) {
+           /* if (mBinding.swit.isChecked()) {
                 ConfigManager.getInstance().switchEnvironment(EnvironmentEnum.PRODUCTION);
                 EnvironmentEnum selectedEnv = EnvironmentEnum.PRODUCTION;
                 EnvironmentPrefs prefs = new EnvironmentPrefs(this);
@@ -147,6 +168,11 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
                 EnvironmentEnum selectedEnv = EnvironmentEnum.TEST;
                 EnvironmentPrefs prefs = new EnvironmentPrefs(this);
                 prefs.setSelectedEnvironment(selectedEnv);
+            }*/
+            if (mBinding.swit.isChecked()) {
+                MvpPre.getModifyHideStatus("1");
+            } else {
+                MvpPre.getModifyHideStatus("0");
             }
         } else if (view.getId() == R.id.ll_tcdl) {
             new AlertDialog.Builder(this).setMessage("确定要退出登录吗？")

MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/GiftWallConacts.java

@@ -1,6 +1,7 @@
-package com.example.modulevocal.activity.ui.main;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
+
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 import com.xscm.moduleutil.bean.GiftUserWallBean;

MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/MeConacts.java

@@ -4,7 +4,11 @@ import android.app.Activity;
 
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
+import com.xscm.moduleutil.bean.BannerModel;
 import com.xscm.moduleutil.bean.UserInfo;
+import com.xscm.moduleutil.bean.WalletBean;
+
+import java.util.List;
 
 
 public final class MeConacts {
@@ -16,9 +20,9 @@ public final class MeConacts {
 
         void hideSkill(boolean hideSkill);
 
-//        void isFirstRecharge(EntranceCheckBean entranceCheckBean);
+        void wallet(WalletBean walletBean);
 
-//        void setMemberList(GuardMemberBean guardMemberBean);
+        void setBanners(List<BannerModel> bannerModels);
     }
 
     public interface IMePre extends IPresenter {
@@ -33,6 +37,9 @@ public final class MeConacts {
         void entranceCheckFirstRecharge();
 
         void getMemberList(String userId, int page);
+
+
+        void wallet();
     }
 
 }

MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/NobleTitleConacts.java

@@ -1,9 +1,14 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
+
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
-import com.xscm.moduleutil.bean.*;
+import com.xscm.moduleutil.bean.AppPay;
+import com.xscm.moduleutil.bean.BindType;
+import com.xscm.moduleutil.bean.NobilitDeatils;
+import com.xscm.moduleutil.bean.NobilitList;
+import com.xscm.moduleutil.bean.NobilityPrice;
 
 import java.util.List;
 

MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/SettingConacts.java

@@ -15,5 +15,7 @@ public class SettingConacts {
         void clearLoginInfo();
 
         void cancel();
+
+        void getModifyHideStatus(String hide_status);
     }
 }

MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/PlaceholderFragment.java

@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity.ui.main;
+package com.xscm.modulemain.activity.user.fragment;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -6,14 +6,16 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.GridView;
-import android.widget.TextView;
-import androidx.annotation.Nullable;
+
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
-import com.example.modulevocal.databinding.FragmentGiftWallBinding;
+
+import com.xscm.modulemain.activity.user.PageViewModel;
+import com.xscm.modulemain.adapter.GiftWallAdapter;
+import com.xscm.modulemain.databinding.FragmentGiftWallBinding;
 import com.xscm.moduleutil.bean.GiftUserWallBean;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java

@@ -114,11 +114,24 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
         } else {
             mBinding.slidingTabLayout.setCurrentTab(0);
         }
-        mBinding.headerInfo.rivUserHead.setData(userInfo.getAvatar(), "", userInfo.getSex() + "");
+        mBinding.headerInfo.rivUserHead.setData(userInfo.getAvatar(), "", userInfo.getNobility_image());
+        String sex = userInfo.getSex()==1?"男":"女";
+        mBinding.headerInfo.tvUserId.setText(sex+" | ID:"+userInfo.getUser_code());
+
         mBinding.headerInfo.tvNickName.setText(userInfo.getNickname());
-        mBinding.headerInfo.tvUserId.setText(userInfo.getUser_code());
+        mBinding.headerInfo.tvNickName.setTextColor( (userInfo.getNickname_color()!=null && !userInfo.getNickname_color().equals(""))?Color.parseColor(userInfo.getNickname_color()):Color.parseColor("#333333"));
+//        mBinding.headerInfo.tvUserId.setText(userInfo.getUser_code());
         mBinding.headerInfo.tvAge.setText(userInfo.getAge() + "岁");
         mBinding.headerInfo.tvJj.setText(userInfo.getProfile());
+
+
+        if (userInfo.getIs_use_code()==1){
+            mBinding.headerInfo.imBeautiful.setVisibility(View.VISIBLE);
+        }else {
+            mBinding.headerInfo.imBeautiful.setVisibility(View.GONE);
+        }
+
+
         LinearLayout llContainer = mBinding.headerInfo.llImageContainer;
         llContainer.removeAllViews(); // 清空旧的 ImageView
 

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

@@ -6,6 +6,7 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
@@ -15,7 +16,14 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.stx.xhb.xbanner.XBanner;
+import com.tencent.mm.opensdk.modelbiz.WXOpenCustomerServiceChat;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.user.activity.GiftWallActivity;
+import com.xscm.modulemain.activity.user.activity.NobleTitleActivity;
+import com.xscm.modulemain.activity.user.activity.RechargeActivity;
 import com.xscm.modulemain.databinding.FragmentVocalRangeBinding;
 import com.xscm.modulemain.activity.user.activity.BlacklistActivity;
 import com.xscm.modulemain.activity.user.activity.DailyTasksActivity;
@@ -31,7 +39,9 @@ import com.xscm.modulemain.activity.user.presenter.MePresenter;
 import com.xscm.modulemain.activity.WebViewActivity;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.CommonAppContext;
+import com.xscm.moduleutil.bean.BannerModel;
 import com.xscm.moduleutil.bean.UserInfo;
+import com.xscm.moduleutil.bean.WalletBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
 
@@ -90,18 +100,51 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
 //        mBinding.meMyCustom.setOnClickListener(this::onClick);
 //        mBinding.meMyHelp.setOnClickListener(this::onClick);
         mBinding.ivSz.setOnClickListener(this::onClick);
-        mBinding.beautifulViewCopy.setOnClickListener(this::onClick);
+        mBinding.tvCopy.setOnClickListener(this::onClick);
 //        mBinding.meMyShare.setOnClickListener(this::onClick);
         mBinding.tvHome.setOnClickListener(this::onClick);
         mBinding.meDressUp.setOnClickListener(this::onClick);
         mBinding.tvMyWallet.setOnClickListener(this::onClick);
         mBinding.meDaily.setOnClickListener(this::onClick);
-        mBinding.meMyGuild.setOnClickListener(this::onClick);
-        mBinding.tvMyShopping.setOnClickListener(this::onClick);
+        mBinding.llMeGuild.setOnClickListener(this::onClick);
+        mBinding.llMyShopping.setOnClickListener(this::onClick);
         mBinding.imMyRoom.setOnClickListener(this::onClick);
         mBinding.meMyDan.setOnClickListener(this::onClick);
         mBinding.ivHb.setOnClickListener(this::onClick);
-        mBinding.ivKf.setOnClickListener(this::onClick);
+        mBinding.ivFk.setOnClickListener(this::onClick);
+        mBinding.llRecharge.setOnClickListener(this::onClick);
+        mBinding.llMeIncome.setOnClickListener(this::onClick);
+        mBinding.llMeHelp.setOnClickListener(this::onClick);
+        mBinding.llGiftWall.setOnClickListener(this::onClick);
+        mBinding.clNobleTitle.setOnClickListener(this::onClick);
+
+        mBinding.banner.loadImage(new XBanner.XBannerAdapter() {
+            @Override
+            public void loadBanner(XBanner banner, Object model, View view, int position) {
+                BannerModel bannerModel = (BannerModel) model;
+                ImageUtils.loadCenterCrop((String) bannerModel.getXBannerUrl(), (ImageView) view);
+            }
+        });
+        mBinding.banner.setOnItemClickListener(new XBanner.OnItemClickListener() {
+            @Override
+            public void onItemClick(XBanner banner, Object model, View view, int position) {
+//                if (ProxyChecker.isProxySet(context)) {
+//                    ToastUtils.show("使用代理禁止访问");
+//                    return;
+//                }
+                /**
+                 * 1房间2文章3链接 其他详情图
+                 *
+                 * type=1时，该值表示房间id；type=2时，表示文章id
+                 */
+                BannerModel bannerModel = (BannerModel) model;
+                Intent intent=new Intent(getActivity(), WebViewActivity.class);
+                intent.putExtra("url", bannerModel.getUrl());
+                intent.putExtra("title", "防骗指南");
+                startActivity(intent);
+//                ARouter.getInstance().build(ARouteConstants.H5).withString("url", bannerModel.getUrl()).withString("title", "首页横幅").navigation();
+            }
+        });
     }
 
 
@@ -109,6 +152,8 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
     public void onResume() {
         super.onResume();
         MvpPre.getMyInfo();
+        MvpPre.wallet();
+        MvpPre.getBanners("6");
 //        MvpPre.getMemberList(SpUtils.getUserId(), 1);
     }
 
@@ -126,12 +171,12 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
             Intent intent=new Intent(getContext(), BlacklistActivity.class);
             intent.putExtra("type",0);
             startActivity(intent);
-        }else if (id==R.id.me_my_guild){
+        }else if (id==R.id.ll_me_guild){
             Intent intent=new Intent(getContext(), WebViewActivity.class);
             intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/union/index?id="+SpUtil.getToken());
             intent.putExtra("title", "公会");
             startActivity(intent);
-        }else if (id==R.id.tv_my_shopping){
+        }else if (id==R.id.ll_my_shopping){
             Intent intent=new Intent(getContext(), WebViewActivity.class);
             intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/prop/propMall?id="+SpUtil.getToken());
             intent.putExtra("title", "道具商城");
@@ -181,13 +226,18 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
             startActivity(new Intent(getContext(), DailyTasksActivity.class));
         }
         else if (id == R.id.iv_sz) {//设置
-            startActivity(new Intent(getContext(), SettingActivity.class));
+            //            startActivity(new Intent(getContext(), SettingActivity.class));
+            Intent intent = new Intent(getContext(), SettingActivity.class);
+            Bundle bundle = new Bundle();
+            bundle.putSerializable("userInfo", userInfo);
+            intent.putExtras(bundle);
+            startActivity(intent);
         }else if (id == R.id.me_my_dan){//等级
             Intent intent = new Intent(getContext(), WebViewActivity.class);
             intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/other/grade?id=" + SpUtil.getToken());
             intent.putExtra("title", "等级");
             startActivity(intent);
-        }else if (id == R.id.iv_kf){//反馈
+        }else if (id == R.id.ll_me_help){//反馈
             Intent intent = new Intent(getContext(), WebViewActivity.class);
             intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/feedback/help?id=" + SpUtil.getToken());
 //            intent.putExtra("url", "http://192.168.110.17:8080/web/index.html#/pages/feedback/help?id=" + SpUtil.getToken());
@@ -198,8 +248,23 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
             intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url()+"/web/index.html#/pages/other/income?id=" + SpUtil.getToken());
             intent.putExtra("title", "邀请");
             startActivity(intent);
-        }else if (id==R.id.beautiful_view_copy){
+        }else if (id==R.id.tv_copy){
             copyComment(mBinding.beautifulView.getText().toString());
+        }else if (id==R.id.ll_recharge){//充值
+            startActivity(new Intent(getActivity(), RechargeActivity.class));
+        }else if (id==R.id.ll_me_income){
+            String appId = CommonAppContext.getInstance().getCurrentEnvironment().getWxAppId(); // 填移动应用(App)的 AppId
+            IWXAPI api = WXAPIFactory.createWXAPI(getContext(), appId);
+
+// 判断当前版本是否支持拉起客服会话
+            WXOpenCustomerServiceChat.Req req = new WXOpenCustomerServiceChat.Req();
+            req.corpId = "ww1de4300858c0b461";                                  // 企业ID
+            req.url = "https://work.weixin.qq.com/kfid/kfcb3d23a59c188a0e7";    // 客服URL
+            api.sendReq(req);
+        }else if (id==R.id.ll_gift_wall){//我的页面的礼物墙
+            startActivity(new Intent(getContext(), GiftWallActivity.class));
+        }else if (id==R.id.cl_noble_title){//爵位展示页面
+            startActivity(new Intent(getContext(), NobleTitleActivity.class));
         }
     }
     private void copyComment(String content) {
@@ -245,12 +310,21 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
     public void myInfoSuccess(UserInfo data) {
         SpUtil.saveUserInfo(data);
         this.userInfo = data;
-        mBinding.rivUserHead.setData(data.getAvatar(), data.getDress(), String.valueOf(data.getSex()));
+        mBinding.rivUserHead.setData(data.getAvatar(), data.getDress(),data.getNobility_image());
         mBinding.tvNickName.setText(data.getNickname());
-        mBinding.beautifulView.setText("ID:"+data.getUser_code());
+        mBinding.tvNickName.setTextColor( (data.getNickname_color()!=null&& !data.getNickname_color().equals(""))? Color.parseColor(data.getNickname_color()): Color.parseColor("#ffffff"));
+        String sex = data.getSex()==1?"男":"女";
+        mBinding.beautifulView.setText(sex+" | ID:"+data.getUser_code());
         mBinding.tvFollow.setText(data.getFollow_num()+"");
         mBinding.tvFans.setText(data.getFans_num()+"");
         mBinding.tvFriends.setText(data.getLook_me_num()+"");
+
+        if (data.getIs_use_code()==1){
+            mBinding.imBeautiful.setVisibility(View.VISIBLE);
+        }else {
+            mBinding.imBeautiful.setVisibility(View.GONE);
+        }
+
         if (data.getAuth()==1){
             SpUtil.setRealName(true);
         }else {
@@ -298,26 +372,16 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
     public void hideSkill(boolean hideSkill) {
 
     }
+    @Override
+    public void wallet(WalletBean walletBean) {
+        mBinding.tvIcon.setText(walletBean.getCoin());
+    }
 
-    /**
-     * 首充有礼显示
-     */
-//    @Override
-//    public void isFirstRecharge(EntranceCheckBean entranceCheckBean) {
-////        if (entranceCheckBean != null) {
-////            mBinding.ivFirstCharge.setVisibility(entranceCheckBean.isAllow_show() ? View.VISIBLE : View.GONE);
-////        }
-//    }
+    @Override
+    public void setBanners(List<BannerModel> bannerModels) {
+        mBinding.banner.setBannerData(com.xscm.moduleutil.R.layout.index_image_banner, bannerModels);
+    }
 
-    /**
-     * 获取守护数
-     */
-//    @Override
-//    public void setMemberList(GuardMemberBean guardMemberBean) {
-////        if (guardMemberBean != null) {
-////            mBinding.tvGuardNum.setText(guardMemberBean.getHead().getTotal_number());
-////        }
-//    }
 
     private void copyUserId(CharSequence content) {
         ClipboardManager clipboard = (ClipboardManager) getActivity().getSystemService(CLIPBOARD_SERVICE);
@@ -327,85 +391,6 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
         }
     }
 
-//    private List<MeItemBean> initItems() {
-//        List<MeItemBean> items = new ArrayList<>();
-//        // 成为大神
-//        MeItemBean skill = new MeItemBean(true, true);
-//        skill.setIcon(R.mipmap.me_icon_cwds);
-//        skill.setName("成为大神");
-//        skill.setType("skill");
-//        items.add(skill);
-//        // 我的订单
-////        MeItemBean order = new MeItemBean(true, false);
-////        order.setIcon(R.mipmap.me_icon_wddd);
-////        order.setName("我的订单");
-////        order.setType("order");
-////        items.add(order);
-////        // 评价订单
-////        MeItemBean pjOrder = new MeItemBean(true, false);
-////        pjOrder.setIcon(R.mipmap.me_icon_pjdd);
-////        pjOrder.setName("评价订单");
-////        pjOrder.setType("pjOrder");
-////        items.add(pjOrder);
-//        // 我的等级
-//        MeItemBean wdDengji = new MeItemBean(true, true);
-//        wdDengji.setIcon(R.mipmap.me_icon_wddj);
-//        wdDengji.setName("我的等级");
-//        wdDengji.setType("wdDengji");
-//        items.add(wdDengji);
-//        // 我的公会
-//        MeItemBean wdGonghui = new MeItemBean(true, true);
-//        wdGonghui.setIcon(R.mipmap.me_icon_wdgh);
-//        wdGonghui.setName("我的公会");
-//        wdGonghui.setType("wdGonghui");
-//        items.add(wdGonghui);
-////        // 邀请有礼
-////        MeItemBean yqYouli = new MeItemBean(true, true);
-////        yqYouli.setIcon(R.mipmap.me_icon_yqyl);
-////        yqYouli.setName("邀请有礼");
-////        yqYouli.setType("yqYouli");
-////        items.add(yqYouli);
-//        // 实名认证
-//        MeItemBean verified = new MeItemBean(false, true);
-//        verified.setIcon(R.mipmap.me_icon_smrz);
-//        verified.setName("实名认证");
-//        verified.setType("verified");
-//        items.add(verified);
-//
-//        return items;
-//    }
-
-//    private List<MeItemBean> initItems2() {
-//        List<MeItemBean> items = new ArrayList<>();
-//        // 在线客服
-//        MeItemBean customerService = new MeItemBean(true, true);
-//        customerService.setType("customer_service");
-//        customerService.setName("在线客服");
-//        customerService.setIcon(R.mipmap.me_icon_service);
-//        items.add(customerService);
-//        // 帮助中心
-//        MeItemBean helpCenter = new MeItemBean(true, true);
-//        helpCenter.setType("help_center");
-//        helpCenter.setName("帮助中心");
-//        helpCenter.setIcon(R.mipmap.me_icon_help);
-//        items.add(helpCenter);
-//        // 设置
-//        MeItemBean settings = new MeItemBean(false, true);
-//        settings.setType("settings");
-//        settings.setName("设置");
-//        settings.setIcon(R.mipmap.me_icon_setting);
-//        items.add(settings);
-//
-//        return items;
-//    }
-
-    /**
-     * 关闭首充入口
-     */
-//    @Subscribe(threadMode = ThreadMode.MAIN)
-//    public void closeFirstCharge(CloseFirstChargeEvent closeFirstChargeEvent) {
-////        mBinding.ivFirstCharge.setVisibility(View.GONE);
-//    }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {

MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/EditUserPresenter.java

@@ -12,15 +12,17 @@ import com.xscm.moduleutil.utils.cos.CosUploadManager;
 import com.xscm.moduleutil.utils.oss.OSSOperUtils;
 
 import java.io.File;
+import java.lang.ref.WeakReference;
 import java.util.List;
 
 import io.reactivex.disposables.Disposable;
 
 public class EditUserPresenter extends BasePresenter<EditUserConactos.View> implements EditUserConactos.IMePre {
+    EditUserConactos.View mView;
     public EditUserPresenter(EditUserConactos.View view, Context context) {
         super(view, context);
+        mView = view;
     }
-
     @Override
     public void topicList(String page, String page_limit) {
 
@@ -85,6 +87,9 @@ public class EditUserPresenter extends BasePresenter<EditUserConactos.View> impl
 
             @Override
             public void onNext(UserInfo userInfo) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
                 MvpRef.get().getUserHomeSuccess(userInfo);
             }
         });

MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/GiftWallPresenter.java

@@ -1,9 +1,12 @@
-package com.example.modulevocal.activity.ui.main;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
+
+import com.xscm.modulemain.activity.user.conacts.GiftWallConacts;
 import com.xscm.moduleutil.bean.GiftUserWallBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
+
 import io.reactivex.disposables.Disposable;
 
 /**

MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/MePresenter.java

@@ -3,16 +3,23 @@ package com.xscm.modulemain.activity.user.presenter;
 import android.content.Context;
 
 import com.xscm.modulemain.activity.user.conacts.MeConacts;
+import com.xscm.moduleutil.bean.BannerModel;
 import com.xscm.moduleutil.bean.UserInfo;
+import com.xscm.moduleutil.bean.WalletBean;
 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 MePresenter extends BasePresenter<MeConacts.View> implements MeConacts.IMePre {
 
+    MeConacts.View mView;
     public MePresenter(MeConacts.View view, Context context) {
         super(view, context);
+        mView = view;
     }
 
     @Override
@@ -164,28 +171,39 @@ public class MePresenter extends BasePresenter<MeConacts.View> implements MeCona
     }
 
 
-    public void getConfig() {
-//        api.appUpdate(new com.qpyy.libcommon.http.BaseObserver<AppUpdateModel>() {
-//            @Override
-//            public void onSubscribe(Disposable d) {
-//                addDisposable(d);
-//            }
-//
-//            @Override
-//            public void onNext(AppUpdateModel appUpdateModel) {
-//                String channelId = "default";
-//                try {
-//                    channelId = MetaDataUtils.getMetaDataInApp("TD_CHANNEL_ID");
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-//                MvpRef.get().hideSkill(appUpdateModel != null && appUpdateModel.getChannels() != null && appUpdateModel.getChannels().contains(channelId));
-//            }
-//
-//            @Override
-//            public void onComplete() {
-//
-//            }
-//        });
+    @Override
+    public void wallet() {
+        api.wallet(new BaseObserver<WalletBean>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(WalletBean walletBean) {
+                MvpRef.get().wallet(walletBean);
+            }
+        });
+    }
+
+    public void getBanners(String s) {
+//        Type listType = new TypeToken<List<BannerModel>>() {}.getType();
+//        List<BannerModel> restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtils.getHomeBanner(), listType);
+//        MvpRef.get().setBanners(restoredRoomModels);
+        api.getBanners(s,new BaseObserver<List<BannerModel>>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(List<BannerModel> bannerModels) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
+                MvpRef.get().setBanners(bannerModels);
+            }
+
+        });
     }
 }

MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/NobleTitlePresenter.java

@@ -1,17 +1,23 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
-import com.example.modulevocal.conacts.MeConacts;
-import com.example.modulevocal.conacts.NobleTitleConacts;
-import com.xscm.moduleutil.bean.*;
+
+import com.xscm.modulemain.activity.user.conacts.NobleTitleConacts;
+import com.xscm.moduleutil.bean.AppPay;
+import com.xscm.moduleutil.bean.BindType;
+import com.xscm.moduleutil.bean.NobilitDeatils;
+import com.xscm.moduleutil.bean.NobilitList;
+import com.xscm.moduleutil.bean.NobilityPrice;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
-import io.reactivex.disposables.Disposable;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
 
+import io.reactivex.disposables.Disposable;
+
 /**
  * com.example.modulevocal.presenter
  * qx

MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/RechargePresenter.java

@@ -51,7 +51,7 @@ public class RechargePresenter extends BasePresenter<RechargeConactos.View> impl
 
     @Override
     public void appPay(String user_id, String money, String coin, String type, String type_params, String type_id) {
-        api.appPay(user_id, money, coin, type,type_params,type_id, new BaseObserver<AppPay>() {
+        api.appPay(user_id, money, coin, type,type_params,type_id,"", new BaseObserver<AppPay>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);

MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/SettingPresenter.java

@@ -6,13 +6,18 @@ import com.xscm.modulemain.activity.user.conacts.SettingConacts;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
 
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.ref.WeakReference;
+
 import io.reactivex.disposables.Disposable;
 
 public class SettingPresenter extends BasePresenter<SettingConacts.View> implements SettingConacts.IMePre {
+    private SettingConacts.View mView;
     public SettingPresenter(SettingConacts.View view, Context context) {
         super(view, context);
+        mView = view;
     }
-
     @Override
     public void clearLoginInfo() {
         api.clearLoginInfo(new BaseObserver<String>() {
@@ -23,6 +28,9 @@ public class SettingPresenter extends BasePresenter<SettingConacts.View> impleme
 
             @Override
             public void onNext(String s) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
                 MvpRef.get().clearLoginInfo(s);
             }
         });
@@ -39,8 +47,26 @@ public class SettingPresenter extends BasePresenter<SettingConacts.View> impleme
 
             @Override
             public void onNext(String s) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
                 MvpRef.get().cancel(s);
             }
         });
     }
+
+    @Override
+    public void getModifyHideStatus(String hide_status) {
+        api.getModifyHideStatus(hide_status, new BaseObserver<String>() {
+            @Override
+            public void onSubscribe(@NotNull Disposable d) {
+                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(@NotNull String s) {
+
+            }
+        });
+    }
 }