添加了清除缓存，存在BUG

modulevocal/src/main/AndroidManifest.xml

@@ -8,139 +8,141 @@
         android:supportsRtl="true"
         android:theme="@style/BaseAppTheme">
         <activity
-            android:name=".activity.WithdrawalListActivity"
-            android:launchMode="singleTask"
+            android:name=".activity.AboutUsActivity"
             android:exported="false" />
+        <activity
+            android:name=".activity.WithdrawalListActivity"
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.GiftBoxRecordActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.BindCardDetailsActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.BindCardActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.AlbumDetailActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.SettingActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.CreateAlbumActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.RealName1Activity"
             android:exported="false" />
         <activity
             android:name=".activity.RevenueActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.DailyTasksActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.UserHomepageActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.MyBagActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.BriefIntroductionActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.ChangeNicknameActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.CurrencyExchangeActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.WithdrawalActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.RechargeActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.MyMoneyActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.EditUserInfoActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.EditUserActivity"
             android:exported="false" />
         <activity
             android:name=".activity.ChangPassActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.PersonalityActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.RealDetailActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.RoomAllowanceDetailActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.RoomAllowanceActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.RoomDetailsActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.CreatedRoomActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.MyRoomActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
-
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.PhoneReplacementActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.ChangePasswordActivity"
             android:exported="false" />
         <activity
             android:name=".activity.BlacklistActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.MessageReminderActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.NotificationActivity"
-            android:launchMode="singleTask"
-            android:exported="false" />
+            android:exported="false"
+            android:launchMode="singleTask" />
         <activity
             android:name=".activity.UnderageActivity"
-            android:launchMode="singleTask"
-            android:exported="true" />
+            android:exported="true"
+            android:launchMode="singleTask" />
     </application>
 
 </manifest>

modulevocal/src/main/java/com/example/modulevocal/activity/AboutUsActivity.java

@@ -0,0 +1,50 @@
+package com.example.modulevocal.activity;
+
+import android.os.Bundle;
+
+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.databinding.ActivityAboutUsBinding;
+import com.qxcm.moduleutil.activity.BaseAppCompatActivity;
+import com.qxcm.moduleutil.utils.ARouteConstants;
+import com.qxcm.moduleutil.utils.SystemUtils;
+import com.qxcm.moduleutil.widget.CommonAppConfig;
+
+/**
+ *@author qx
+ *@data 2025/8/14
+ *@description: 关于我们
+ */
+public class AboutUsActivity extends BaseAppCompatActivity<ActivityAboutUsBinding> {
+
+
+    @Override
+    protected void initData() {
+        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();
+        });
+
+        mBinding.llYins.setOnClickListener(v -> {
+            ARouter.getInstance().build(ARouteConstants.H5).withString("url", "file:///android_asset/page_show.html").withString("title", "隐私协议").navigation();
+
+        });
+    }
+
+    @Override
+    protected void initView() {
+        mBinding.topBar.setTitle("关于我们");
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_about_us;
+    }
+}

modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java

@@ -344,21 +344,21 @@ public class EditUserInfoActivity extends BaseMvpActivity<EditUserPresenter, Act
             }
         });
 
-        V2TIMUserFullInfo userFullInfo = new V2TIMUserFullInfo();
-        userFullInfo.setNickname(userInfo.getNickname());
-        userFullInfo.setFaceUrl(userInfo.getAvatar());
-        userFullInfo.setAllowType(userInfo.getSex());
-        V2TIMManager.getInstance().setSelfInfo(userFullInfo, new V2TIMCallback() {
-            @Override
-            public void onSuccess() {
-                LogUtils.e("@@@", "成功");
-            }
-
-            @Override
-            public void onError(int code, String desc) {
-                LogUtils.e("@@@", "描述" + desc);
-            }
-        });
+//        V2TIMUserFullInfo userFullInfo = new V2TIMUserFullInfo();
+//        userFullInfo.setNickname(userInfo.getNickname());
+//        userFullInfo.setFaceUrl(userInfo.getAvatar());
+//        userFullInfo.setAllowType(userInfo.getSex());
+//        V2TIMManager.getInstance().setSelfInfo(userFullInfo, new V2TIMCallback() {
+//            @Override
+//            public void onSuccess() {
+//                LogUtils.e("@@@", "成功");
+//            }
+//
+//            @Override
+//            public void onError(int code, String desc) {
+//                LogUtils.e("@@@", "描述" + desc);
+//            }
+//        });
     }
 
     @Override

modulevocal/src/main/java/com/example/modulevocal/activity/PhoneReplacementActivity.java

@@ -1,6 +1,8 @@
 package com.example.modulevocal.activity;
 
 import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.view.View;
 
 import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
@@ -9,28 +11,129 @@ import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 
 import com.example.modulevocal.R;
+import com.example.modulevocal.conacts.PhoneReplacementConacts;
 import com.example.modulevocal.databinding.ActivityPhoneReplacementBinding;
+import com.example.modulevocal.presenter.PhoneReplacementPresenter;
+import com.hjq.toast.ToastUtils;
 import com.qxcm.moduleutil.activity.BaseAppCompatActivity;
+import com.qxcm.moduleutil.activity.BaseMvpActivity;
+import com.qxcm.moduleutil.utils.SpUtil;
+
 /**
- *@author
- *@data
- *@description: 手机换绑
+ * @author
+ * @data
+ * @description: 手机换绑
  */
-public class PhoneReplacementActivity extends BaseAppCompatActivity<ActivityPhoneReplacementBinding> {
-
-
+public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPresenter, ActivityPhoneReplacementBinding> implements PhoneReplacementConacts.View {
+    private CountDownTimer mTimer;
+    private String mobile;
+    private String type;//1：更换手机 2：绑定手机
     @Override
     protected void initData() {
+        if (SpUtil.getUserBean().getMobile() == null || SpUtil.getUserBean().getMobile().equals("")) {
+            type="2";
+            mBinding.topBar.setTitle("手机绑定");
+        }else {
+            type="1";
+            mBinding.topBar.setTitle("手机换绑");
+        }
+    }
 
+    @Override
+    protected PhoneReplacementPresenter bindPresenter() {
+        return new PhoneReplacementPresenter(this, this);
     }
 
     @Override
     protected void initView() {
-        mBinding.topBar.setTitle("手机换绑");
+
+        mBinding.tvSendCode.setOnClickListener(this::onClick);
+        mBinding.btnSubmit.setOnClickListener(this::onClick);
     }
 
     @Override
     protected int getLayoutId() {
         return R.layout.activity_phone_replacement;
     }
+
+    private void onClick(View view) {
+        if (view.getId() == R.id.tv_send_code) {
+            if (mBinding.edPhone.getText().toString().isEmpty()) {
+                ToastUtils.show("请输入手机号");
+                return;
+            }
+
+            if (MvpPre == null) {
+                MvpPre = bindPresenter();
+            }
+            MvpPre.sendCode(mBinding.edPhone.getText().toString(), type);
+            sendCodeSuccess2(mBinding.edPhone.getText().toString());
+        } else if (view.getId() == R.id.btnSubmit) {
+
+            if (mBinding.edPhone.getText().toString().isEmpty()) {
+                com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
+                return;
+            }
+            if (mBinding.edPassword.getText().toString().isEmpty()) {
+                com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码");
+                return;
+            }
+            if (MvpPre != null) {
+                if (SpUtil.getUserBean().getMobile() == null || SpUtil.getUserBean().getMobile().equals("")){
+                    MvpPre.mobileView(mBinding.edPhone.getText().toString(), mBinding.edPhone.getText().toString(), mBinding.edPassword.getText().toString(), type);
+                }else {
+                    MvpPre.mobileView(SpUtil.getUserBean().getMobile(), mBinding.edPhone.getText().toString(), mBinding.edPassword.getText().toString(), type);
+                }
+            }
+        }
+    }
+
+    public void sendCodeSuccess2(String phoneNumber) {
+        com.blankj.utilcode.util.ToastUtils.showShort("短信验证码发送成功请注意查收");
+        mBinding.tvSendCode.setEnabled(false);
+        mBinding.tvSendCode.setAlpha(0.5f);
+        releaseTimer();
+        if (mTimer != null) {
+            mTimer.cancel();
+        }
+        mTimer = new CountDownTimer(60000L, 1000L) {
+            @Override
+            public void onTick(long millisUntilFinished) {
+                if (mBinding.tvSendCode != null) {
+                    mBinding.tvSendCode.setText(String.format("重新发送（%s）", millisUntilFinished / 1000));
+                }
+            }
+
+            @Override
+            public void onFinish() {
+                mBinding.tvSendCode.setAlpha(1f);
+                mBinding.tvSendCode.setEnabled(true);
+                mBinding.tvSendCode.setText("重新发送");
+            }
+        };
+        mTimer.start();
+    }
+
+    private void releaseTimer() {
+        if (mTimer != null) {
+            mTimer.cancel();
+            mTimer = null;
+        }
+    }
+
+    @Override
+    public void sendCodeSuccess1(String phoneNumber) {
+
+    }
+
+    @Override
+    public void sendCodeSuccess(String s) {
+        if (s.contains("失败")){
+            ToastUtils.show(s);
+        }else {
+            ToastUtils.show(s);
+            finish();
+        }
+
+    }
 }

modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java

@@ -154,6 +154,9 @@ public class RoomDetailsActivity extends BaseMvpActivity<RoomDetailsPresenter, A
                 r.setTotal_earning(list.getList().get(i).getTotal_earning());
                 r.setTime(list.getList().get(i).getTime());
                 r.setSticky(true);
+                if (currentPage==1){
+                    loadedUserIds.clear();
+                }
                 // 确保不重复添加
                 if (!loadedUserIds.contains(r.getTime())) {
                     newData.add(r);
@@ -191,7 +194,9 @@ public class RoomDetailsActivity extends BaseMvpActivity<RoomDetailsPresenter, A
             mBinding.rv.requestLayout();
 
         } else {
-            adapter.setNewData(null);
+            if (currentPage == 1) {
+                adapter.setNewData(null);
+            }
         }
     }
 

modulevocal/src/main/java/com/example/modulevocal/activity/SettingActivity.java

@@ -131,8 +131,11 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
                     })
                     .setNegativeButton("取消", null).create().show();
         }else if (view.getId() == R.id.ll_gywm){
-            Intent intent = new Intent(this, WebViewActivity.class);
-            intent.putExtra("url", "https://vespa.qxmier.com/web/index.html#/pages/other/aboutUs?id=" + SpUtil.getToken());
+//            Intent intent = new Intent(this, WebViewActivity.class);
+//            intent.putExtra("url", "https://vespa.qxmier.com/web/index.html#/pages/other/aboutUs?id=" + SpUtil.getToken());
+//            startActivity(intent);
+
+            Intent intent=new Intent(this, AboutUsActivity.class);
             startActivity(intent);
         }
     }

modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java

@@ -42,14 +42,14 @@ public class TaskBoxAdapter extends BaseQuickAdapter<GiftBoxBean.GiftBean, BaseV
         if (position == 0) {
             itemView.setBackgroundColor(mContext.getResources().getColor(com.qxcm.moduleutil.R.color.color_FCE4ED)); // 红色
             giftName.setTextColor(mContext.getResources().getColor(com.qxcm.moduleutil.R.color.color_E24171));
-            setSpannableText(giftTitle, "最高可获得%d金币", Integer.parseInt(item.getHighest_gain()),com.qxcm.moduleutil.R.color.color_E24171);
+            setSpannableText(giftTitle, item.getTitle(), Integer.parseInt(item.getHighest_gain()),com.qxcm.moduleutil.R.color.color_E24171);
 //            helper.setImageDrawable(R.id.task_box, mContext.getResources().getDrawable(com.qxcm.moduleutil.R.mipmap.task_cj));
 
 
         } else if (position == 1) {
             itemView.setBackgroundColor(mContext.getResources().getColor(com.qxcm.moduleutil.R.color.color_FDE8AE)); // 黄色
             giftName.setTextColor(mContext.getResources().getColor(com.qxcm.moduleutil.R.color.color_F35F07));
-            setSpannableText(giftTitle, "最高可获得%d金币", Integer.parseInt(item.getHighest_gain()),com.qxcm.moduleutil.R.color.color_F35F07);
+            setSpannableText(giftTitle, item.getTitle(), Integer.parseInt(item.getHighest_gain()),com.qxcm.moduleutil.R.color.color_F35F07);
 //            helper.setImageDrawable(R.id.task_box, mContext.getResources().getDrawable(com.qxcm.moduleutil.R.mipmap.task_gj));
 
         } else {

modulevocal/src/main/java/com/example/modulevocal/conacts/PhoneReplacementConacts.java

@@ -0,0 +1,21 @@
+package com.example.modulevocal.conacts;
+
+import android.app.Activity;
+
+import com.qxcm.moduleutil.activity.IPresenter;
+import com.qxcm.moduleutil.activity.IView;
+
+public class PhoneReplacementConacts {
+    public interface View extends IView<Activity> {
+        void sendCodeSuccess1(String phoneNumber);
+
+        void sendCodeSuccess(String s);
+    }
+
+    public interface IMePre extends IPresenter {
+        void sendCode(String phoneNumber, String type);
+
+        void mobileView(String mobile, String new_mobile, String sms_code,String type);
+
+    }
+}

modulevocal/src/main/java/com/example/modulevocal/fragment/UserHomepageFragment.java

@@ -165,6 +165,12 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
         mBinding.headerInfo.tvGz.setOnClickListener(this::onClick);
         mBinding.headerInfo.tvGsSx.setOnClickListener(this::onClick);
         refreshView();
+
+        if (userInfo.getGuild()==null || userInfo.getGuild().isEmpty()){
+            mBinding.headerInfo.tvGH.setText("所属公会：无");
+        }else {
+            mBinding.headerInfo.tvGH.setText("所属公会："+userInfo.getGuild());
+        }
     }
 
     private void refreshView() {

modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java

@@ -236,7 +236,8 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
 
         // 设置剪贴板数据
         clipboard.setPrimaryClip(clip);
-        Toast.makeText(getContext(), "复制成功", Toast.LENGTH_SHORT);
+//        Toast.makeText(getContext(), "复制成功", Toast.LENGTH_SHORT);
+        ToastUtils.showShort("复制成功");
         // 可选：通知用户文本已复制
     }
 

modulevocal/src/main/java/com/example/modulevocal/presenter/PhoneReplacementPresenter.java

@@ -0,0 +1,76 @@
+package com.example.modulevocal.presenter;
+
+import android.content.Context;
+
+import com.example.modulevocal.conacts.PhoneReplacementConacts;
+import com.qxcm.moduleutil.http.BaseObserver;
+import com.qxcm.moduleutil.presenter.BasePresenter;
+
+import java.lang.ref.WeakReference;
+
+import io.reactivex.disposables.Disposable;
+
+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;
+    }
+
+    @Override
+    public void sendCode(String phoneNumber, String type) {
+        api.sendCode(phoneNumber,type, new BaseObserver<Object>() {
+
+            @Override
+            public void onSubscribe(Disposable d) {
+                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(Object o) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
+                MvpRef.get().sendCodeSuccess1(phoneNumber);
+            }
+
+        });
+    }
+
+    @Override
+    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);
+                }
+
+                @Override
+                public void onNext(String s) {
+                    if (MvpRef==null){
+                        MvpRef=new WeakReference<>(mView);
+                    }
+                    MvpRef.get().sendCodeSuccess(s);
+                }
+            });
+        }else if (type.equals("2")){
+            api.mobileView2(new_mobile, sms_code, new BaseObserver<String>() {
+                @Override
+                public void onSubscribe(Disposable d) {
+                    addDisposable(d);
+                }
+
+                @Override
+                public void onNext(String s) {
+                    if (MvpRef==null){
+                        MvpRef=new WeakReference<>(mView);
+                    }
+                    MvpRef.get().sendCodeSuccess(s);
+                }
+            });
+        }
+    }
+
+
+}

modulevocal/src/main/res/layout/activity_about_us.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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:id="@+id/main"
+
+    tools:context=".activity.AboutUsActivity">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/log_bj">
+
+        <com.qxcm.moduleutil.widget.CustomTopBar
+            android:id="@+id/top_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <ImageView
+            android:id="@+id/im_title"
+            android:layout_width="@dimen/dp_80"
+            android:layout_height="@dimen/dp_80"
+            android:layout_marginTop="@dimen/dp_100"
+            android:src="@mipmap/ic_launcher_round"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_10"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_20"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/im_title" />
+
+        <TextView
+            android:id="@+id/tv_app_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_10"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_15"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_app_name"
+            tools:text="版本号：1.0.0" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_200"
+            android:orientation="vertical"
+            android:layout_marginTop="@dimen/dp_10"
+            app:layout_constraintTop_toBottomOf="@+id/tv_app_version"
+            android:background="@drawable/bg_r15_white"
+            >
+
+            <LinearLayout
+                android:id="@+id/ll_yonghu"
+                style="@style/My_Info_Item_LL_Style"
+
+                >
+                <TextView
+                    style="@style/My_Info_Item_Title_Style"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:text="用户许可协议" />
+
+                <ImageView style="@style/My_Info_Item_Arrow_Style" />
+            </LinearLayout>
+
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dp"
+                android:layout_alignParentBottom="true"
+                android:background="#E2E2E2"
+                />
+
+
+            <LinearLayout
+                android:id="@+id/ll_yins"
+                style="@style/My_Info_Item_LL_Style"
+                android:background="@drawable/bg_r15_white">
+
+                <TextView
+                    style="@style/My_Info_Item_Title_Style"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:text="隐私协议" />
+
+                <ImageView style="@style/My_Info_Item_Arrow_Style" />
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

modulevocal/src/main/res/layout/activity_currency_exchange.xml

@@ -127,7 +127,7 @@
                 android:layout_alignParentEnd="true"
                 android:gravity="center"
                 android:layout_marginStart="@dimen/dp_4"
-                android:text="全部提现"
+                android:text="全部兑换"
                 android:textSize="@dimen/sp_12"
                 android:textColor="#0DFB89"
                 />

modulevocal/src/main/res/layout/activity_phone_replacement.xml

@@ -84,7 +84,7 @@
                 android:layout_toRightOf="@+id/iv_code"
                 android:background="@android:color/transparent"
                 android:hint="@string/login_hint_code"
-                android:inputType="textPassword"
+                android:inputType="number"
                 android:maxLength="20"
                 android:singleLine="true"
                 android:textColor="@color/black"

modulevocal/src/main/res/layout/activity_recharge.xml

@@ -67,182 +67,109 @@
             </RelativeLayout>
         </RelativeLayout>
 
-        <ScrollView
-            android:id="@+id/scroll_view"
+        <!-- 使用NestedScrollView替代ScrollView -->
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/nested_scroll_view"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_300"
-            app:layout_constraintTop_toBottomOf="@+id/rl_1">
+            android:layout_height="0dp"
+            android:layout_marginTop="@dimen/dp_12"
+            app:layout_constraintTop_toBottomOf="@+id/rl_1"
+            app:layout_constraintBottom_toTopOf="@+id/tv_payment"
+            app:layout_constraintVertical_bias="0.0">
 
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_16"
-                android:layout_marginTop="@dimen/dp_12"
-                android:layout_marginEnd="@dimen/dp_16" />
-        </ScrollView>
+                android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/r_4"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_12"
-            android:layout_marginEnd="@dimen/dp_16"
-            app:layout_constraintBottom_toTopOf="@+id/v_view"
-            app:layout_constraintTop_toBottomOf="@+id/scroll_view">
+                <!-- 第一个RecyclerView -->
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:layout_marginEnd="@dimen/dp_16"
+                    android:nestedScrollingEnabled="false" />
 
-            <TextView
-                android:id="@+id/t_4"
-                android:layout_width="@dimen/dp_18"
-                android:layout_height="@dimen/dp_27"
-                android:layout_alignParentStart="true"
-                android:layout_centerInParent="true"
-                android:layout_centerVertical="true"
-                android:layout_marginStart="@dimen/dp_16"
-                android:gravity="center"
-                android:text="￥"
-                android:textColor="@color/color_FF000000"
-                android:textSize="@dimen/sp_18"
-                android:textStyle="bold" />
+                <RelativeLayout
+                    android:id="@+id/r_4"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginEnd="@dimen/dp_16">
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/et_custom_amount"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_toRightOf="@+id/t_4"
-                android:background="@null"
-                android:hint="请输入充值金额"
-                android:inputType="numberDecimal"
-                android:textColorHint="@color/color_FF999999"
-                android:textSize="@dimen/sp_14" />
+                    <TextView
+                        android:id="@+id/t_4"
+                        android:layout_width="@dimen/dp_18"
+                        android:layout_height="@dimen/dp_27"
+                        android:layout_alignParentStart="true"
+                        android:layout_centerInParent="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginStart="@dimen/dp_16"
+                        android:gravity="center"
+                        android:text="￥"
+                        android:textColor="@color/color_FF000000"
+                        android:textSize="@dimen/sp_18"
+                        android:textStyle="bold" />
 
-            <TextView
-                android:id="@+id/t_5"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_27"
-                android:layout_alignParentEnd="true"
-                android:layout_centerInParent="true"
-                android:layout_marginStart="@dimen/dp_4"
-                android:gravity="center"
-                android:text="将获得0金币"
-                android:textStyle="bold"
-                android:visibility="gone" />
-        </RelativeLayout>
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/et_custom_amount"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:layout_toRightOf="@+id/t_4"
+                        android:background="@null"
+                        android:hint="请输入充值金额"
+                        android:inputType="numberDecimal"
+                        android:textColorHint="@color/color_FF999999"
+                        android:textSize="@dimen/sp_14" />
 
-        <View
-            android:id="@+id/v_view"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_0_5"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_12"
-            android:layout_marginEnd="@dimen/dp_16"
-            android:background="@color/color_FF999999"
-            app:layout_constraintTop_toBottomOf="@id/r_4" />
+                    <TextView
+                        android:id="@+id/t_5"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_27"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerInParent="true"
+                        android:layout_marginStart="@dimen/dp_4"
+                        android:gravity="center"
+                        android:text="将获得0金币"
+                        android:textStyle="bold"
+                        android:visibility="gone" />
+                </RelativeLayout>
 
-        <TextView
-            android:id="@+id/t_2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_12"
-            android:layout_marginEnd="@dimen/dp_16"
-            android:text="@string/payment_method"
-            android:textColor="@color/color_FF333333"
-            android:textSize="@dimen/sp_16"
-            app:layout_constraintTop_toBottomOf="@id/v_view" />
+                <View
+                    android:id="@+id/v_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_0_5"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginEnd="@dimen/dp_16"
+                    android:background="@color/color_FF999999" />
 
-        <!--        <RelativeLayout-->
-        <!--            android:id="@+id/rl_weixin_pay"-->
-        <!--            android:layout_width="match_parent"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginStart="@dimen/dp_16"-->
-        <!--            android:layout_marginTop="@dimen/dp_10"-->
-        <!--            android:layout_marginEnd="@dimen/dp_16"-->
-        <!--            app:layout_constraintTop_toBottomOf="@+id/t_2">-->
+                <TextView
+                    android:id="@+id/t_2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginEnd="@dimen/dp_16"
+                    android:text="@string/payment_method"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/sp_16" />
 
-        <!--            <ImageView-->
-        <!--                android:id="@+id/im_wx"-->
-        <!--                android:layout_width="@dimen/dp_20"-->
-        <!--                android:layout_height="@dimen/dp_20"-->
-        <!--                android:src="@mipmap/wx_zf" />-->
+                <!-- 第二个RecyclerView -->
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycle_view1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginEnd="@dimen/dp_16"
+                    android:nestedScrollingEnabled="false" />
 
-        <!--            <TextView-->
-        <!--                android:layout_width="wrap_content"-->
-        <!--                android:layout_height="wrap_content"-->
-        <!--                android:layout_centerVertical="true"-->
-        <!--                android:layout_marginLeft="@dimen/dp_1"-->
-        <!--                android:layout_toRightOf="@+id/im_wx"-->
-        <!--                android:text="@string/wechat_payment"-->
-        <!--                android:textColor="@color/color_FF333333"-->
-        <!--                android:textSize="@dimen/sp_14" />-->
-
-
-        <!--            <ImageView-->
-        <!--                android:id="@+id/iv_weixin"-->
-        <!--                android:layout_width="wrap_content"-->
-        <!--                android:layout_height="wrap_content"-->
-        <!--                android:layout_alignParentRight="true"-->
-        <!--                android:layout_centerVertical="true"-->
-        <!--                android:layout_marginEnd="@dimen/dp_2"-->
-        <!--                android:src="@drawable/level_pay" />-->
-
-        <!--        </RelativeLayout>-->
-
-        <!--        <RelativeLayout-->
-        <!--            android:id="@+id/rl_three_pay"-->
-        <!--            android:layout_width="match_parent"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginStart="@dimen/dp_16"-->
-        <!--            android:layout_marginTop="@dimen/dp_12"-->
-        <!--            android:layout_marginEnd="@dimen/dp_16"-->
-        <!--            app:layout_constraintTop_toBottomOf="@+id/rl_weixin_pay">-->
-
-        <!--            <ImageView-->
-        <!--                android:id="@+id/im_zfb"-->
-        <!--                android:layout_width="@dimen/dp_20"-->
-        <!--                android:layout_height="@dimen/dp_20"-->
-        <!--                android:src="@mipmap/sign_icon_zfb" />-->
-
-        <!--            <TextView-->
-        <!--                android:layout_width="wrap_content"-->
-        <!--                android:layout_height="wrap_content"-->
-        <!--                android:layout_centerVertical="true"-->
-        <!--                android:layout_marginLeft="@dimen/dp_1"-->
-        <!--                android:layout_toRightOf="@+id/im_zfb"-->
-        <!--                android:text="@string/alipay_payment"-->
-        <!--                android:textColor="@color/color_FF333333"-->
-        <!--                android:textSize="@dimen/sp_14" />-->
-
-
-        <!--            <ImageView-->
-        <!--                android:id="@+id/iv_three_pay"-->
-        <!--                android:layout_width="wrap_content"-->
-        <!--                android:layout_height="wrap_content"-->
-        <!--                android:layout_alignParentRight="true"-->
-        <!--                android:layout_centerVertical="true"-->
-        <!--                android:layout_marginEnd="@dimen/dp_2"-->
-        <!--                android:src="@drawable/level_pay" />-->
-
-        <!--        </RelativeLayout>-->
-        <ScrollView
-            android:id="@+id/scroll_view2"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_140"
-            app:layout_constraintTop_toBottomOf="@+id/t_2">
-
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycle_view1"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginStart="@dimen/dp_16"
-                android:layout_marginTop="@dimen/dp_12"
-                android:layout_marginEnd="@dimen/dp_16"
-                app:layout_constraintTop_toBottomOf="@+id/t_2" />
-        </ScrollView>
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
 
         <TextView
             android:id="@+id/tv_payment"
@@ -251,7 +178,7 @@
             android:layout_alignParentBottom="true"
             android:layout_marginLeft="@dimen/dp_38"
             android:layout_marginRight="@dimen/dp_38"
-            android:layout_marginBottom="@dimen/dp_47"
+            android:layout_marginBottom="@dimen/dp_27"
             android:background="@drawable/cs"
             android:gravity="center"
             android:text="确认支付"
@@ -259,7 +186,6 @@
             android:textSize="@dimen/sp_14"
             app:layout_constraintBottom_toBottomOf="parent" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
+</layout>

modulevocal/src/main/res/layout/user_top.xml

@@ -13,21 +13,19 @@
         android:clipChildren="false">
 
 
-
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_177"
+            android:layout_height="@dimen/dp_187"
             android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginEnd="@dimen/dp_16"
             android:layout_marginTop="@dimen/dp_60"
+            android:layout_marginEnd="@dimen/dp_16"
             android:background="@drawable/bg_r16_fff">
 
             <com.qxcm.moduleutil.utils.MeHeadView
                 android:id="@+id/riv_user_head"
                 android:layout_width="@dimen/dp_70"
                 android:layout_height="@dimen/dp_70"
-                android:layout_marginTop="-20dp"
-               />
+                android:layout_marginTop="-20dp" />
 
             <TextView
                 android:id="@+id/tv_gz"
@@ -36,25 +34,24 @@
                 android:layout_marginTop="@dimen/dp_19"
                 android:layout_marginEnd="@dimen/dp_6"
                 android:layout_toStartOf="@+id/tv_gs_sx"
-                android:background="@mipmap/gz"
-                />
+                android:background="@mipmap/gz" />
+
             <TextView
                 android:id="@+id/tv_gs_sx"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_29"
+                android:layout_alignParentEnd="true"
                 android:layout_marginTop="@dimen/dp_19"
                 android:layout_marginEnd="@dimen/dp_12"
-                android:layout_alignParentEnd="true"
-                android:background="@mipmap/gsui"
-            />
+                android:background="@mipmap/gsui" />
 
             <TextView
                 android:id="@+id/tv_nick_name"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_24"
+                android:layout_below="@+id/riv_user_head"
                 android:layout_marginStart="@dimen/dp_15"
                 android:layout_marginTop="@dimen/dp_4"
-                android:layout_below="@+id/riv_user_head"
                 android:textColor="@color/color_FF333333"
                 android:textSize="@dimen/sp_16"
                 tools:text="备注名" />
@@ -62,19 +59,18 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_4"
+                android:layout_alignTop="@+id/tv_nick_name"
                 android:layout_marginStart="@dimen/dp_12"
-                android:gravity="center"
+                android:layout_marginTop="@dimen/dp_4"
                 android:layout_toEndOf="@id/tv_nick_name"
-                android:layout_alignTop="@+id/tv_nick_name">
+                android:gravity="center">
 
                 <TextView
                     android:layout_width="@dimen/dp_20"
                     android:layout_height="@dimen/dp_20"
                     android:text="ID:"
                     android:textColor="@color/color_FF999999"
-                    android:textSize="@dimen/sp_12"
-                     />
+                    android:textSize="@dimen/sp_12" />
 
                 <TextView
                     android:id="@+id/tv_user_id"
@@ -90,47 +86,57 @@
                 android:id="@+id/tv_age"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_8"
-                android:layout_marginStart="@dimen/dp_16"
                 android:layout_below="@id/tv_nick_name"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
                 android:text="25岁"
                 android:textColor="@color/color_FF999999"
                 android:textSize="@dimen/sp_12" />
 
-<!--            <androidx.recyclerview.widget.RecyclerView-->
+            <!--            <androidx.recyclerview.widget.RecyclerView-->
 
-<!--                android:id="@+id/recycle_view1"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="@dimen/dp_16"-->
-<!--                android:layout_toRightOf="@+id/tv_age"-->
-<!--                android:layout_marginStart="@dimen/dp_8"-->
-<!--                android:layout_alignTop="@+id/tv_age"/>-->
+            <!--                android:id="@+id/recycle_view1"-->
+            <!--                android:layout_width="wrap_content"-->
+            <!--                android:layout_height="@dimen/dp_16"-->
+            <!--                android:layout_toRightOf="@+id/tv_age"-->
+            <!--                android:layout_marginStart="@dimen/dp_8"-->
+            <!--                android:layout_alignTop="@+id/tv_age"/>-->
 
             <LinearLayout
                 android:id="@+id/ll_image_container"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_16"
-                android:layout_toRightOf="@+id/tv_age"
-                android:layout_marginStart="@dimen/dp_8"
                 android:layout_alignTop="@+id/tv_age"
-                android:orientation="horizontal"
-                />
+                android:layout_marginStart="@dimen/dp_8"
+                android:layout_toRightOf="@+id/tv_age"
+                android:orientation="horizontal" />
+
+            <TextView
+                android:id="@+id/tv_g_h"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/tv_age"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
+                android:textColor="@color/color_FF999999"
+                android:textSize="@dimen/sp_12"
+                tools:text="所属公会：" />
+
+            <TextView
+                android:id="@+id/tv_jj"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_22"
+                android:layout_below="@id/tv_g_h"
+                android:layout_marginStart="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_8"
+                android:layout_marginEnd="@dimen/dp_16"
+                android:ellipsize="end"
+                android:gravity="left|center"
+                android:singleLine="true"
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/sp_14"
+                tools:text="时光会教会你所有的过去，但你只能看到现在，所以好好" />
 
-        <TextView
-            android:id="@+id/tv_jj"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_22"
-            android:gravity="left|center"
-            android:layout_marginTop="@dimen/dp_8"
-            android:layout_below="@id/tv_age"
-            android:layout_marginStart="@dimen/dp_16"
-            android:layout_marginEnd="@dimen/dp_16"
-            android:textColor="@color/color_FF333333"
-            android:textSize="@dimen/sp_14"
-            android:singleLine="true"
-            android:ellipsize="end"
-            tools:text="时光会教会你所有的过去，但你只能看到现在，所以好好"
-            />
             <androidx.recyclerview.widget.RecyclerView
 
                 android:id="@+id/recycle_view2"
@@ -138,8 +144,7 @@
                 android:layout_height="@dimen/dp_24"
                 android:layout_below="@+id/tv_jj"
                 android:layout_marginStart="@dimen/dp_16"
-                android:layout_marginTop="@dimen/dp_8"
-               />
+                android:layout_marginTop="@dimen/dp_8" />
         </RelativeLayout>
 
     </RelativeLayout>

modulevocal/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

modulevocal/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>