From 07dbffaa5a2a7447443fa77fe2037c2374fee62e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Fri, 19 Dec 2025 15:51:24 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=B7=A1=E4=B9=90?=
 =?UTF-8?q?=E4=BC=9A=E6=8A=BD=E5=A5=96=E6=AC=A1=E6=95=B0=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA1-5-8=202=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E6=8D=A2=E7=BB=91=E5=92=8C=E6=89=8B=E6=9C=BA=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=203=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=B1=95=E7=A4=BA=E8=83=8C=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moduleutil/adapter/AppUpdateDialog.java   |   1 +
 .../com/xscm/moduleutil/http/ApiServer.java   |   2 +-
 .../xscm/moduleutil/http/RetrofitClient.java  |   4 +-
 .../xscm/moduleutil/utils/TextViewUtils.java  |  24 ++++
 .../com/xscm/moduleutil/widget/Constants.java |   3 +-
 .../res/layout/fragment_tour_club_dialog.xml  |   4 +-
 MainModule/src/main/AndroidManifest.xml       |   7 +-
 .../activity/PhoneReplacementActivity.java    | 108 +++++++++++++-----
 .../user/activity/SettingActivity.java        |  21 +++-
 .../user/conacts/PhoneReplacementConacts.java |   7 +-
 .../presenter/PhoneReplacementPresenter.java  |  25 ++--
 .../dialog/TourClubDialogFragment.java        |  12 +-
 .../res/layout/activity_phone_replacement.xml |  94 ++++++++++++++-
 .../src/main/res/layout/activity_setting.xml  |   7 ++
 .../src/main/res/layout/fragment_news.xml     |   3 +-
 .../res/layout/news_rv_item_system_news.xml   |   3 +
 16 files changed, 261 insertions(+), 64 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/AppUpdateDialog.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/AppUpdateDialog.java
index 8ddd1da5..7f0e5a97 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/AppUpdateDialog.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/AppUpdateDialog.java
@@ -117,6 +117,7 @@ public class AppUpdateDialog extends BaseDialog<DialogAppUpdateBinding> implemen
             mProgressDialog.dismiss();
         }
         try {
+            LogUtils.e("installAppSuccess",localPath);
             AppUtils.installApp(localPath);
         } catch (Exception e) {
             Logger.e("installAppError", e);
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
index 26ab62a5..4b45960b 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
@@ -39,7 +39,7 @@ public interface ApiServer {
 
     @FormUrlEncoded  //手机换绑
     @POST(Constants.MODIFY_MOBILE)
-    Call<BaseModel<String>> mobileView(@Field("mobile") String mobile, @Field("new_mobile") String new_mobile, @Field("sms_code") String sms_code);
+    Call<BaseModel<String>> mobileView(@Field("mobile") String mobile, @Field("new_mobile") String new_mobile, @Field("sms_code") String sms_code,@Field("new_sms_code") String new_sms_code);
 
     @GET(Constants.GET_EMOTION)
     Call<BaseModel<List<Emotion>>> upEmotion();
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
index 4090997e..650981f0 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -241,8 +241,8 @@ public class RetrofitClient {
         });
     }
 
-    public void mobileView(String mobile, String new_mobile, String sms_code, BaseObserver<String> observer) {
-        sApiServer.mobileView(mobile, new_mobile, sms_code).enqueue(new Callback<BaseModel<String>>() {
+    public void mobileView(String mobile, String new_mobile, String sms_code,String new_sms_code, BaseObserver<String> observer) {
+        sApiServer.mobileView(mobile, new_mobile, sms_code,new_sms_code).enqueue(new Callback<BaseModel<String>>() {
             @Override
             public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
                 if (response.code() == 200) {
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/TextViewUtils.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/TextViewUtils.java
index d25a5321..29695667 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/TextViewUtils.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/TextViewUtils.java
@@ -168,4 +168,28 @@ public class TextViewUtils {
     public interface OnClickableTextListener {
         void onClick();
     }
+
+    /**
+     * 使用正则表达式格式化手机号，中间4位替换为****
+     * @param phone 原始手机号
+     * @return 格式化后的手机号
+     */
+    public static String formatPhoneNumberWithRegex(String phone) {
+        if (phone == null) {
+            return "";
+        }
+        return phone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2");
+    }
+
+    /**
+     * 处理带区号的手机号，中间4位替换为****
+     * @param phone 原始手机号（可能带区号）
+     * @return 格式化后的手机号
+     */
+    public static String formatAnyPhone(String phone) {
+        if (phone == null) {
+            return "";
+        }
+        return phone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2");
+    }
 }
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java
index 3cafe89d..bd309247 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java
@@ -444,7 +444,8 @@ public class Constants {
 
 
 
-    public static final String MODIFY_MOBILE = "/api/UserData/modify_mobile";//手机换绑
+//    public static final String MODIFY_MOBILE = "/api/UserData/modify_mobile";//手机换绑
+    public static final String MODIFY_MOBILE = "/api/UserData/modify_mobiles";//手机换绑
     public static final String BIND_MOBILE = "/api/UserData/bind_mobile";//手机绑定
 
 
diff --git a/BaseModule/src/main/res/layout/fragment_tour_club_dialog.xml b/BaseModule/src/main/res/layout/fragment_tour_club_dialog.xml
index 93a59995..5fbf14e9 100644
--- a/BaseModule/src/main/res/layout/fragment_tour_club_dialog.xml
+++ b/BaseModule/src/main/res/layout/fragment_tour_club_dialog.xml
@@ -544,7 +544,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_3"
                     android:gravity="center"
-                    android:text="抽十次"
+                    android:text="抽五次"
                     android:textSize="@dimen/sp_12" />
 
                 <TextView
@@ -573,7 +573,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_3"
                     android:gravity="center"
-                    android:text="抽百次"
+                    android:text="抽八次"
                     android:textSize="@dimen/sp_12" />
 
                 <TextView
diff --git a/MainModule/src/main/AndroidManifest.xml b/MainModule/src/main/AndroidManifest.xml
index bf4f6eec..b2d2319a 100644
--- a/MainModule/src/main/AndroidManifest.xml
+++ b/MainModule/src/main/AndroidManifest.xml
@@ -8,9 +8,12 @@
 
     <application android:theme="@style/AppTheme">
         <activity
-            android:name=".TransparentActivity"
-            android:theme="@style/TransparentActivityTheme"
+            android:name=".activity.user.activity.MobilePhoneActivity"
             android:exported="false" />
+        <activity
+            android:name=".TransparentActivity"
+            android:exported="false"
+            android:theme="@style/TransparentActivityTheme" />
         <activity
             android:name=".activity.user.activity.TotalRevenueActivity"
             android:exported="false" />
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PhoneReplacementActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PhoneReplacementActivity.java
index b8295d46..16aac968 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PhoneReplacementActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PhoneReplacementActivity.java
@@ -1,7 +1,11 @@
 package com.xscm.modulemain.activity.user.activity;
 
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
 import android.os.CountDownTimer;
 import android.view.View;
+import android.widget.TextView;
 
 import com.xscm.modulemain.R;
 import com.xscm.modulemain.databinding.ActivityPhoneReplacementBinding;
@@ -9,14 +13,15 @@ import com.hjq.toast.ToastUtils;
 import com.xscm.modulemain.activity.user.conacts.PhoneReplacementConacts;
 import com.xscm.modulemain.activity.user.presenter.PhoneReplacementPresenter;
 import com.xscm.modulemain.BaseMvpActivity;
+import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.SpUtil;
 
 /**
- *@author
- *@data
- *@description: 手机换绑
+ * @author
+ * @data
+ * @description: 手机换绑
  */
 public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPresenter, ActivityPhoneReplacementBinding> implements PhoneReplacementConacts.View {
     private CountDownTimer mTimer;
@@ -28,9 +33,14 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
         if (SpUtil.getUserBean().getMobile() == null || SpUtil.getUserBean().getMobile().equals("")) {
             type = "2";
             mBinding.topBar.setTitle("手机绑定");
+            mBinding.relTheOldPhone.setVisibility(GONE);
+            mBinding.rlTheOldCode.setVisibility(GONE);
         } else {
             type = "1";
             mBinding.topBar.setTitle("手机换绑");
+            mBinding.relTheOldPhone.setVisibility(VISIBLE);
+            mBinding.tvPhone.setText(SpUtil.getUserBean().getMobile());
+            mBinding.rlTheOldCode.setVisibility(VISIBLE);
         }
     }
 
@@ -45,6 +55,8 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
         mBinding.tvSendCode.setOnClickListener(this::onClick);
         mBinding.btnSubmit.setOnClickListener(this::onClick);
 
+        mBinding.tvSendTheOldCode.setOnClickListener(this::onClick);
+
         mBinding.tvSendCode.setTextColor(ColorManager.getInstance().getPrimaryColorInt());
 
         ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.btnSubmit, ColorManager.getInstance().getPrimaryColorInt(), 53);
@@ -57,7 +69,12 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
     }
 
     private void onClick(View view) {
-        if (view.getId() == R.id.tv_send_code) {
+        if (view.getId() == R.id.tv_send_the_old_code) {
+            if (MvpPre == null) {
+                MvpPre = bindPresenter();
+            }
+            MvpPre.sendCode(SpUtil.getUserBean().getMobile(), type, mBinding.tvSendTheOldCode);
+        } else if (view.getId() == R.id.tv_send_code) {
             if (mBinding.edPhone.getText().toString().isEmpty()) {
                 ToastUtils.show("请输入手机号");
                 return;
@@ -66,32 +83,57 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
             if (MvpPre == null) {
                 MvpPre = bindPresenter();
             }
-            MvpPre.sendCode(mBinding.edPhone.getText().toString(), type);
+            MvpPre.sendCode(mBinding.edPhone.getText().toString(), type, mBinding.tvSendCode);
 
         } else if (view.getId() == R.id.btnSubmit) {
+            if (type.equals("1")){
 
-            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);
+                if(mBinding.edTheOldPassword.getText().toString().isEmpty()){
+                    com.blankj.utilcode.util.ToastUtils.showShort("请输入旧手机验证码");
+                    return;
+                }
+
+                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){
+                    MvpPre.mobileView(SpUtil.getUserBean().getMobile(), mBinding.edPhone.getText().toString(),mBinding.edTheOldPassword.getText().toString(), mBinding.edPassword.getText().toString(), type);
+                }
+
+            }else if (type.equals("2")){
+                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){
+                    MvpPre.mobileView("", mBinding.edPhone.getText().toString(), mBinding.edPassword.getText().toString(),"", type);
                 }
             }
+
+
+//            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) {
+    public void sendCodeSuccess2(String phoneNumber,TextView textView) {
         com.blankj.utilcode.util.ToastUtils.showShort("短信验证码发送成功请注意查收");
-        mBinding.tvSendCode.setEnabled(false);
-        mBinding.tvSendCode.setAlpha(0.5f);
+        textView.setEnabled(false);
+        textView.setAlpha(0.5f);
         releaseTimer();
         if (mTimer != null) {
             mTimer.cancel();
@@ -99,16 +141,16 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
         mTimer = new CountDownTimer(60000L, 1000L) {
             @Override
             public void onTick(long millisUntilFinished) {
-                if (mBinding.tvSendCode != null) {
-                    mBinding.tvSendCode.setText(String.format("重新发送（%s）", millisUntilFinished / 1000));
+                if (textView != null) {
+                    textView.setText(String.format("重新发送（%s）", millisUntilFinished / 1000));
                 }
             }
 
             @Override
             public void onFinish() {
-                mBinding.tvSendCode.setAlpha(1f);
-                mBinding.tvSendCode.setEnabled(true);
-                mBinding.tvSendCode.setText("重新发送");
+              textView.setAlpha(1f);
+              textView.setEnabled(true);
+              textView.setText("重新发送");
             }
         };
         mTimer.start();
@@ -122,18 +164,22 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
     }
 
     @Override
-    public void sendCodeSuccess1(String phoneNumber) {
-        sendCodeSuccess2(mBinding.edPhone.getText().toString());
+    public void sendCodeSuccess1(String phoneNumber, TextView textView) {
+        sendCodeSuccess2(mBinding.edPhone.getText().toString(),textView);
     }
 
     @Override
     public void sendCodeSuccess(String s) {
-        if (s.contains("失败")) {
+        if (s.contains("成功")) {
             ToastUtils.show(s);
+            try {
+                CommonAppContext.getInstance().clearLoginInfo();
+            } catch (ClassNotFoundException e) {
+                throw new RuntimeException(e);
+            }
+            finish();
         } else {
             ToastUtils.show(s);
-
-            finish();
         }
 
     }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
index bb19c851..cea72e4b 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
@@ -36,6 +36,7 @@ import com.xscm.moduleutil.dialog.RealNameDialog;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.SpUtil;
+import com.xscm.moduleutil.utils.TextViewUtils;
 import com.xscm.moduleutil.widget.CommonAppConfig;
 
 import java.io.File;
@@ -81,6 +82,13 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
             } else {
                 mBinding.llQhdz.setVisibility(View.GONE);
             }
+            if (userInfo.getMobile()!=null && !userInfo.getMobile().equals("")) {
+                mBinding.tvPhoneTitle.setText("手机换绑");
+                mBinding.tvPhone.setText(TextViewUtils.formatAnyPhone(userInfo.getMobile()));
+            }else {
+                mBinding.tvPhoneTitle.setText("手机绑定");
+                mBinding.tvPhone.setText("");
+            }
         }
     }
 
@@ -130,7 +138,12 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
         } else if (id == R.id.ll_szmm) {//设置密码
             startActivity(new Intent(this, ChangPassActivity.class));
         } else if (id == R.id.ll_shb) {
-            startActivity(new Intent(this, PhoneReplacementActivity.class));
+            LogUtils.e("点击了", SpUtil.getUserBean().getMobile());
+            if (TextUtils.isEmpty(SpUtil.getUserBean().getMobile())){
+                startActivity(new Intent(this, PhoneReplacementActivity.class));
+            }else {
+                startActivity(new Intent(this, MobilePhoneActivity.class));
+            }
         } else if (id == R.id.ll_smrz) {//实名认证
             if (SpUtil.getRealName()) {
                 startActivity(new Intent(this, RealDetailActivity.class));
@@ -208,12 +221,12 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
                     .setPositiveButton("确定", new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
-                            if( SpUtil.getUserBean().getMobile()==null){
+                            if (SpUtil.getUserBean().getMobile() == null) {
                                 if (MvpPre == null) {
                                     MvpPre = bindPresenter();
                                 }
                                 MvpPre.cancel("");
-                            }else {
+                            } else {
                                 showSecondaryVerificationDialog();
                             }
 
@@ -335,7 +348,7 @@ public class SettingActivity extends BaseMvpActivity<SettingPresenter, ActivityS
                     MvpPre.cancel(code);
 
                     dialog.dismiss();
-                }else {
+                } else {
                     com.hjq.toast.ToastUtils.show("请输入正确的验证码");
                 }
             }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/PhoneReplacementConacts.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/PhoneReplacementConacts.java
index d8d2d377..f25528f3 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/PhoneReplacementConacts.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/PhoneReplacementConacts.java
@@ -1,6 +1,7 @@
 package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
+import android.widget.TextView;
 
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
@@ -8,15 +9,15 @@ import com.xscm.moduleutil.activity.IView;
 
 public class PhoneReplacementConacts {
     public interface View extends IView<Activity> {
-        void sendCodeSuccess1(String phoneNumber);
+        void sendCodeSuccess1(String phoneNumber,TextView textView);
 
         void sendCodeSuccess(String s);
     }
 
     public interface IMePre extends IPresenter {
-        void sendCode(String phoneNumber, String type);
+        void sendCode(String phoneNumber, String type, TextView tvSendCode);
 
-        void mobileView(String mobile, String new_mobile, String sms_code,String type);
+        void mobileView(String mobile, String new_mobile, String sms_code,String new_sms_code,String type);
 
     }
 }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/PhoneReplacementPresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/PhoneReplacementPresenter.java
index d0d0ea43..b5aff91b 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/PhoneReplacementPresenter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/PhoneReplacementPresenter.java
@@ -1,6 +1,7 @@
 package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
+import android.widget.TextView;
 
 import com.xscm.modulemain.activity.user.conacts.PhoneReplacementConacts;
 import com.xscm.moduleutil.bean.UserBean;
@@ -21,7 +22,7 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
     }
 
     @Override
-    public void sendCode(String phoneNumber, String type) {
+    public void sendCode(String phoneNumber, String type, TextView textView) {
         api.sendCode(phoneNumber, type, new BaseObserver<String>() {
 
             @Override
@@ -34,16 +35,16 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
                 if (MvpRef == null) {
                     MvpRef = new WeakReference<>(mView);
                 }
-                MvpRef.get().sendCodeSuccess1(phoneNumber);
+                MvpRef.get().sendCodeSuccess1(phoneNumber,textView);
             }
 
         });
     }
 
     @Override
-    public void mobileView(String mobile, String new_mobile, String sms_code, String type) {
+    public void mobileView(String mobile, String new_mobile, String sms_code,String new_sms_code, String type) {
         if (type.equals("1")) {
-            api.mobileView(mobile, new_mobile, sms_code, new BaseObserver<String>() {
+            api.mobileView(mobile, new_mobile, sms_code,new_sms_code, new BaseObserver<String>() {
                 @Override
                 public void onSubscribe(Disposable d) {
                     addDisposable(d);
@@ -54,9 +55,11 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
                     if (MvpRef == null) {
                         MvpRef = new WeakReference<>(mView);
                     }
-                    UserBean userInfo = SpUtil.getUserBean();
-                    userInfo.setMobile(new_mobile);
-                    SpUtil.saveUserBean(userInfo);
+                    if (s.contains("成功")) {
+                        UserBean userInfo = SpUtil.getUserBean();
+                        userInfo.setMobile(new_mobile);
+                        SpUtil.saveUserBean(userInfo);
+                    }
                     MvpRef.get().sendCodeSuccess(s);
                 }
             });
@@ -72,9 +75,11 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
                     if (MvpRef == null) {
                         MvpRef = new WeakReference<>(mView);
                     }
-                    UserBean userInfo = SpUtil.getUserBean();
-                    userInfo.setMobile(new_mobile);
-                    SpUtil.saveUserBean(userInfo);
+                    if (s.contains("成功")) {
+                        UserBean userInfo = SpUtil.getUserBean();
+                        userInfo.setMobile(new_mobile);
+                        SpUtil.saveUserBean(userInfo);
+                    }
                     MvpRef.get().sendCodeSuccess(s);
                 }
             });
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/TourClubDialogFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/TourClubDialogFragment.java
index 4b1b538d..e8b39ade 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/TourClubDialogFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/TourClubDialogFragment.java
@@ -275,7 +275,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
             if (!isDrawing) {
                 isDrawing = true;
                 prepareForNewLottery();
-                num = "10";
+                num = "5";
                 MvpPre.xlhChou(roomId, num);
             } else {
 //                com.hjq.toast.ToastUtils.show("正在抽奖中...");
@@ -285,7 +285,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
             if (!isDrawing) {
                 isDrawing = true;
                 prepareForNewLottery();
-                num = "100";
+                num = "8";
                 MvpPre.xlhChou(roomId, num);
             } else {
 //                com.hjq.toast.ToastUtils.show("正在抽奖中...");
@@ -411,8 +411,8 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
     private void upTitle(int boxPrice) {
         this.mboxPrice = boxPrice;
         mBinding.tvOne.setText(boxPrice + "币一次");
-        mBinding.tvTen.setText((boxPrice * 10) + "币十次");
-        mBinding.tvHundred.setText((boxPrice * 100) + "币百次");
+        mBinding.tvTen.setText((boxPrice * 5) + "币五次");
+        mBinding.tvHundred.setText((boxPrice * 8) + "币八次");
     }
 
     // TODO: 2025/8/29 接收im推送过来的消息
@@ -619,12 +619,12 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
             mBinding.llOne.setClickable( false);
         }
 
-        if (icon>=mboxPrice*10){
+        if (icon>=mboxPrice*5){
             mBinding.llTen.setClickable( true);
         }else {
             mBinding.llTen.setClickable( false);
         }
-        if (icon>=mboxPrice*100){
+        if (icon>=mboxPrice*8){
             mBinding.llHundred.setClickable( true);
         }else {
             mBinding.llHundred.setClickable( false);
diff --git a/MainModule/src/main/res/layout/activity_phone_replacement.xml b/MainModule/src/main/res/layout/activity_phone_replacement.xml
index ce277d6c..a770e7b5 100644
--- a/MainModule/src/main/res/layout/activity_phone_replacement.xml
+++ b/MainModule/src/main/res/layout/activity_phone_replacement.xml
@@ -18,6 +18,98 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
+        <RelativeLayout
+            android:id="@+id/rel_the_old_phone"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_44"
+            android:layout_gravity="center"
+            android:layout_marginLeft="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_17"
+            android:layout_marginRight="@dimen/dp_16"
+            android:background="@drawable/bg_r16_ffeff2f8"
+            android:gravity="center">
+
+            <ImageView
+                android:id="@+id/iv_user1"
+                android:layout_width="@dimen/dp_20"
+                android:layout_height="@dimen/dp_20"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="20dp"
+                android:src="@mipmap/icon_login_user_new" />
+
+            <TextView
+                android:id="@+id/tv_phone"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_28"
+                android:layout_centerInParent="true"
+                android:layout_marginStart="13dp"
+                android:layout_marginRight="25dp"
+                android:layout_toEndOf="@+id/iv_user1"
+                android:background="@android:color/transparent"
+                android:hint="@string/login_hint_phion"
+                android:maxLength="11"
+                android:singleLine="true"
+                android:textColor="@color/black"
+                android:textColorHint="@color/color_FFCCCCCC"
+                android:textSize="@dimen/sp_17" />
+        </RelativeLayout>
+
+
+        <RelativeLayout
+            android:id="@+id/rl_the_old_code"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_44"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginRight="20dp"
+            android:background="@drawable/bg_r16_ffeff2f8">
+
+            <ImageView
+                android:id="@+id/iv_the_old_code"
+                android:layout_width="@dimen/dp_20"
+                android:layout_height="@dimen/dp_20"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="20dp"
+                android:src="@mipmap/icon_login_code" />
+
+
+            <EditText
+                android:id="@+id/ed_the_old_password"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_28"
+                android:layout_centerInParent="true"
+                android:layout_marginLeft="13dp"
+                android:layout_marginRight="25dp"
+                android:layout_toRightOf="@+id/iv_the_old_code"
+                android:background="@android:color/transparent"
+                android:hint="@string/login_hint_code"
+                android:inputType="textVisiblePassword "
+                android:maxLength="20"
+                android:singleLine="true"
+                android:textColor="@color/black"
+                android:textColorHint="@color/color_FFCCCCCC"
+                android:textSize="@dimen/sp_16" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:gravity="center">
+
+                <TextView
+                    android:id="@+id/tv_send_the_old_code"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/dp_30"
+                    android:gravity="right"
+                    android:text="@string/login_send_code"
+                    android:textColor="#FF8ACC"
+                    android:textSize="@dimen/sp_16"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/rel_phone"
             android:layout_width="match_parent"
@@ -84,7 +176,7 @@
                 android:layout_toRightOf="@+id/iv_code"
                 android:background="@android:color/transparent"
                 android:hint="@string/login_hint_code"
-                android:inputType="textPassword"
+                android:inputType="textVisiblePassword"
                 android:maxLength="20"
                 android:singleLine="true"
                 android:textColor="@color/black"
diff --git a/MainModule/src/main/res/layout/activity_setting.xml b/MainModule/src/main/res/layout/activity_setting.xml
index 4a950f97..80022fc5 100644
--- a/MainModule/src/main/res/layout/activity_setting.xml
+++ b/MainModule/src/main/res/layout/activity_setting.xml
@@ -145,10 +145,17 @@
                     android:background="@drawable/bg_r15_white">
 
                     <TextView
+                        android:id="@+id/tv_phone_title"
                         style="@style/My_Info_Item_Title_Style"
                         android:layout_width="0dp"
                         android:layout_weight="1"
                         android:text="@string/bind_phone" />
+                    <TextView
+                        android:id="@+id/tv_phone"
+                        style="@style/My_Info_Item_Title_Style"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:gravity="center|end"/>
 
                     <ImageView style="@style/My_Info_Item_Arrow_Style" />
                 </LinearLayout>
diff --git a/MainModule/src/main/res/layout/fragment_news.xml b/MainModule/src/main/res/layout/fragment_news.xml
index 9e09f486..db93bcca 100644
--- a/MainModule/src/main/res/layout/fragment_news.xml
+++ b/MainModule/src/main/res/layout/fragment_news.xml
@@ -154,7 +154,8 @@
         <com.xscm.moduleutil.widget.ScrollViewPager
             android:id="@+id/view_pager"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:background="@color/color_transparent" />
 
         <View
             android:layout_width="match_parent"
diff --git a/MainModule/src/main/res/layout/news_rv_item_system_news.xml b/MainModule/src/main/res/layout/news_rv_item_system_news.xml
index 73163b7a..5a373009 100644
--- a/MainModule/src/main/res/layout/news_rv_item_system_news.xml
+++ b/MainModule/src/main/res/layout/news_rv_item_system_news.xml
@@ -30,6 +30,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_16"
             android:background="@drawable/bg_r16_fff"
+            android:backgroundTint="#EFF2F8"
             android:gravity="left|center"
             android:padding="@dimen/dp_12"
             android:text="系统消息"
@@ -42,6 +43,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_16"
             android:background="@drawable/bg_r16_fff"
+            android:backgroundTint="#EFF2F8"
             android:orientation="vertical">
 
             <com.tencent.qcloud.tuikit.timcommon.component.RoundCornerImageView
@@ -113,6 +115,7 @@
         android:layout_height="wrap_content"
         android:background="@drawable/bg_r16_fff"
         android:orientation="vertical"
+        android:backgroundTint="#EFF2F8"
         android:padding="@dimen/dp_10"
         android:visibility="gone"
         tools:visibility="visible">