From f4f27c2c948dc64e6007c861e2c3c0fa618d9c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Wed, 14 Jan 2026 10:34:54 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E5=9C=A8=E5=85=85=E5=80=BC=E7=9A=84?=
 =?UTF-8?q?=E5=9C=B0=E6=96=B9=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dialog/RechargeDialogFragment.java        | 15 ++++++-
 .../res/layout/fragment_recharge_dialog.xml   | 40 ++++++++++++++++++
 .../user/activity/RechargeActivity.java       | 15 +++++++
 .../src/main/res/layout/activity_recharge.xml | 42 ++++++++++++++++++-
 4 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java b/BaseModule/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java
index 58303c26..7812c95e 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java
@@ -15,7 +15,9 @@ import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.alibaba.fastjson.JSON;
+import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xscm.moduleutil.R;
 import com.xscm.moduleutil.adapter.BalanceRechargeAdapter;
@@ -29,6 +31,7 @@ import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.databinding.FragmentRechargeDialogBinding;
 import com.xscm.moduleutil.presenter.RechargeDialogContacts;
 import com.xscm.moduleutil.presenter.RechargeDialogPresenter;
+import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.widget.PaymentUtil;
@@ -105,7 +108,7 @@ public class RechargeDialogFragment extends BaseMvpDialogFragment<RechargeDialog
     private void onClick(View view) {
         if (view.getId() == R.id.tv_payment) {
             if (money.equals("0")) {
-                money=mBinding.etCustomAmount.getText().toString().trim();
+                money = mBinding.etCustomAmount.getText().toString().trim();
                 if (TextUtils.isEmpty(money)) {
                     ToastUtils.showShort("请选择充值金额");
                     return;
@@ -116,16 +119,24 @@ public class RechargeDialogFragment extends BaseMvpDialogFragment<RechargeDialog
 //                return;
 //            }
 
+            if (!mBinding.cbPrivacy.isChecked()) {
+                ToastUtils.showShort("请先勾选服务条款");
+                return;
+            }
+
             if (selectedItem == null) {
                 ToastUtils.showShort("请选择支付方式");
                 return;
             }
-            MvpPre.appPay(SpUtil.getUserId() + "", money, coin, selectedItem.getType(),type_params,gift_bag_id);
+            MvpPre.appPay(SpUtil.getUserId() + "", money, coin, selectedItem.getType(), type_params, gift_bag_id);
+        } else if (view.getId() == R.id.tv_czxy) {//充值协议
+            ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl()+"/api/Page/page_show?id=37").withString("title", "充值协议").navigation();
         }
     }
     @Override
     protected void initView() {
         mBinding.tvPayment.setOnClickListener(this::onClick);
+        mBinding.tvCzxy.setOnClickListener(this::onClick);
         mBinding.recycleView1.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
         bindTypeAdapter = new PayMethodAdapter(R.layout.item_bind_type);
         mBinding.recycleView1.setAdapter(bindTypeAdapter);
diff --git a/BaseModule/src/main/res/layout/fragment_recharge_dialog.xml b/BaseModule/src/main/res/layout/fragment_recharge_dialog.xml
index 48a22c04..0b442432 100644
--- a/BaseModule/src/main/res/layout/fragment_recharge_dialog.xml
+++ b/BaseModule/src/main/res/layout/fragment_recharge_dialog.xml
@@ -217,6 +217,46 @@
                         android:textSize="@dimen/sp_14"
                         app:layout_constraintBottom_toBottomOf="parent"
                         />
+
+                <LinearLayout
+                    android:id="@+id/ll_agreement"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_payment"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:layout_marginVertical="@dimen/dp_10"
+                    android:layout_gravity="center_horizontal"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <CheckBox
+                        android:id="@+id/cb_privacy"
+                        android:layout_width="@dimen/dp_15"
+                        android:layout_height="@dimen/dp_15"
+                        android:layout_marginEnd="@dimen/dp_5"
+                        android:checked="false"
+                        android:background="@drawable/selector_login_agreement"
+                        android:button="@null" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="我已阅读并同意"
+                        android:textColor="@color/color_FFA8A8A8"
+                        android:textSize="@dimen/sp_11"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/tv_czxy"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="《充值协议》"
+                        android:textColor="#22BB79"
+                        android:textSize="@dimen/sp_11"
+                        android:textStyle="bold" />
+
+
+                </LinearLayout>
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
 
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/RechargeActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/RechargeActivity.java
index e62e6f3c..2fd7f151 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/RechargeActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/RechargeActivity.java
@@ -15,9 +15,11 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.fastjson.JSON;
+import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.WebViewActivity;
 import com.xscm.modulemain.databinding.ActivityRechargeBinding;
 import com.tencent.liteav.base.Log;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;
@@ -80,6 +82,8 @@ public class RechargeActivity extends BaseMvpActivity<RechargePresenter, Activit
 
 //        mBinding.rlThreePay.setOnClickListener(this::onClick);
 
+        mBinding.tvCzxy.setOnClickListener(this::onClick);
+
         mBinding.recycleView1.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
         bindTypeAdapter = new PayMethodAdapter(com.xscm.moduleutil.R.layout.item_bind_type);
         mBinding.recycleView1.setAdapter(bindTypeAdapter);
@@ -115,6 +119,12 @@ public class RechargeActivity extends BaseMvpActivity<RechargePresenter, Activit
                     return;
                 }
             }
+
+            if (!mBinding.cbPrivacy.isChecked()) {
+                ToastUtils.showShort("请先勾选服务条款");
+                return;
+            }
+
 //            if (Double.valueOf(money) < 6) {
 //                ToastUtils.showShort("最低充值6元以上");
 //                return;
@@ -128,6 +138,11 @@ public class RechargeActivity extends BaseMvpActivity<RechargePresenter, Activit
 
             LogUtils.d(TAG,"onClick,=--3------"+money);
             MvpPre.appPay(SpUtil.getUserId() + "", money, coin, selectedItem.getType(),"","");
+        }else if (view.getId() == R.id.tv_czxy) {
+            Intent intent = new Intent(ActivityUtils.getTopActivity(), WebViewActivity.class);
+            intent.putExtra("url", CommonAppContext.getInstance().getCurrentEnvironment().getServerUrl() + "/api/Page/page_show?id=37");
+            intent.putExtra("title", "充值协议");
+            ActivityUtils.startActivity(intent);
         }
     }
 
diff --git a/MainModule/src/main/res/layout/activity_recharge.xml b/MainModule/src/main/res/layout/activity_recharge.xml
index 52ae263b..2e8eca72 100644
--- a/MainModule/src/main/res/layout/activity_recharge.xml
+++ b/MainModule/src/main/res/layout/activity_recharge.xml
@@ -177,7 +177,7 @@
             android:layout_alignParentBottom="true"
             android:layout_marginLeft="@dimen/dp_38"
             android:layout_marginRight="@dimen/dp_38"
-            android:layout_marginBottom="@dimen/dp_27"
+            android:layout_marginBottom="@dimen/dp_47"
             android:background="@drawable/cs"
             android:gravity="center"
             android:text="确认支付"
@@ -185,6 +185,46 @@
             android:textSize="@dimen/sp_14"
             app:layout_constraintBottom_toBottomOf="parent" />
 
+        <LinearLayout
+            android:id="@+id/ll_agreement"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@+id/tv_payment"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginVertical="@dimen/dp_10"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <CheckBox
+                android:id="@+id/cb_privacy"
+                android:layout_width="@dimen/dp_15"
+                android:layout_height="@dimen/dp_15"
+                android:layout_marginEnd="@dimen/dp_5"
+                android:checked="false"
+                android:background="@drawable/selector_login_agreement"
+                android:button="@null" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="我已阅读并同意"
+                android:textColor="@color/color_FFA8A8A8"
+                android:textSize="@dimen/sp_11"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/tv_czxy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="《充值协议》"
+                android:textColor="#22BB79"
+                android:textSize="@dimen/sp_11"
+                android:textStyle="bold" />
+
+
+        </LinearLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>