2024-2-22 代码备份

我的佣金页面及子页面基本开发完成，接口调试完成

app/src/main/AndroidManifest.xml

@@ -78,9 +78,18 @@
         tools:replace="android:theme"
         tools:targetApi="31">
         <activity
+            android:name=".presentation.mine.TixianDetailActivity"
+            android:exported="false"
+            android:label="详情"
+            />
+        <activity
+            android:name=".presentation.mine.CommissionDetailActivity"
+            android:exported="false"
+            android:label="收益详情" />
+        <activity
             android:name=".presentation.mine.FansDetailActivity"
-            android:label="粉丝详情"
-            android:exported="false" />
+            android:exported="false"
+            android:label="粉丝详情" />
         <activity
             android:name=".presentation.mine.MyTeamActivity"
             android:exported="false"

app/src/main/java/com/yihucha/hbyhc/callback/OnRvItemClickListener.kt

@@ -0,0 +1,10 @@
+package com.yihucha.hbyhc.callback
+
+/**
+ *  author : zhangbing
+ *  time   : 2024/2/22 14:25
+ *  com.yihucha.hbyhc.callback
+ */
+interface OnRvItemClickListener {
+    fun onItemClick(position:Int)
+}

app/src/main/java/com/yihucha/hbyhc/config/Constants.java

@@ -98,6 +98,8 @@ public class Constants {
      * 协议链接
      */
     public static final String PROTOCOL = "http://vod.bjtdba.com/agreement/";
+    //佣金规则
+    public static final String PROTOCOL_YHC_YONGJIN = "https://app.bjtdba.com/api/agreement?type=3";
     /**
      *
      */
@@ -107,7 +109,7 @@ public class Constants {
      */
     public static final String PRIVACY_AGREEMENT = "1";//隐私政策
     public static final String SERVICE_AGREEMENT = "2";//服务协议
-    public static final String MERCHANT_SETTLEMENT_AGREEMENT = "3";//商家入驻协议
+    public static final String SHANGHU_PINGTAI = "3";//商户平台协议
     public static final String AGENCY_APPLICATION_AGREEMENT = "4";//代理申请协议
     public static final String JINGDONG_REFUND_RULES = "5";//京东返金规则
     public static final String WITHDRAWAL_RULES = "6";//提现规则

app/src/main/java/com/yihucha/hbyhc/network/service/UserService.java

@@ -35,6 +35,7 @@ import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalServiceBean;
 import com.yihucha.hbyhc.presentation.mine.model.AddressListBean;
 import com.yihucha.hbyhc.presentation.mine.model.BangfuBean;
 import com.yihucha.hbyhc.presentation.mine.model.BindingStateBean;
+import com.yihucha.hbyhc.presentation.mine.model.CommissionBean;
 import com.yihucha.hbyhc.presentation.mine.model.FansDetailBean;
 import com.yihucha.hbyhc.presentation.mine.model.JiangjinBean;
 import com.yihucha.hbyhc.presentation.mine.model.MyEvaluateBean;
@@ -372,6 +373,15 @@ public interface UserService {
     Observable<DataJavaResponse<AccumulatedincomeBean>> getUserInviteProfitList(@QueryMap Map<String, Object> request);
 
     /**
+     * 收益详情页
+     * @param request
+     * @return
+     */
+    @GET("api/user/user_invite_profit_list")
+    Observable<DataJavaResponse<CommissionBean>> getCommissionDetail(@QueryMap Map<String, Object> request);
+
+
+    /**
      * 佣金信息
      *
      * @param

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/adapter/ItemAnnuitySelectorAdapter.kt

@@ -21,7 +21,11 @@ import com.yihucha.hbyhc.utils.ScreenUtils
  *  time   : 2024/1/30 20:44
  *  com.yihucha.hbyhc.presentation.annuity.adapter
  */
-class ItemAnnuitySelectorAdapter(var context: Context, var searchDatas: List<SelectorBean>) :
+class ItemAnnuitySelectorAdapter(
+    var context: Context,
+    var searchDatas: List<SelectorBean>,
+    var collomCount: Int = 3
+) :
     Adapter<ItemAnnuitySelectorAdapter.IASHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): IASHolder {
         return IASHolder(
@@ -70,7 +74,8 @@ class ItemAnnuitySelectorAdapter(var context: Context, var searchDatas: List<Sel
         init {
             binding.apply {
                 var params = tvItemName.layoutParams as RelativeLayout.LayoutParams
-                params.width = (ScreenUtils.getScreenWidth() - DensityUtils.dip2px(58f)) / 3
+                params.width =
+                    (ScreenUtils.getScreenWidth() - DensityUtils.dip2px(58f)) / collomCount
                 tvItemName.layoutParams = params
             }
 

app/src/main/java/com/yihucha/hbyhc/presentation/invitation/model/WithdrawalBean.java

@@ -1,11 +1,13 @@
 package com.yihucha.hbyhc.presentation.invitation.model;
 
+import java.io.Serializable;
+
 /**
  * @author qmzh
  * @date 2022/8/4
  * note:
  */
-public class WithdrawalBean {
+public class WithdrawalBean implements Serializable {
     private String extract_id;
     private String uid;
     private String real_name;//名称
@@ -17,6 +19,7 @@ public class WithdrawalBean {
     private String extract_pic;
     private String extract_price;//提现金额
     private String balance;
+    private String bank_info;
     private String mark;
     private String admin_id;
     private String fail_msg;
@@ -30,6 +33,14 @@ public class WithdrawalBean {
     private String service_money;//提现手续费
     private String title;//说明
 
+    public String getBankInfo() {
+        return bank_info;
+    }
+
+    public void setBankInfo(String bank_info) {
+        this.bank_info = bank_info;
+    }
+
     public String getExtract_id() {
         return extract_id == null ? "" : extract_id;
     }

app/src/main/java/com/yihucha/hbyhc/presentation/invitation/view_model/InviteViewModel.java

@@ -32,10 +32,12 @@ import com.yihucha.hbyhc.presentation.invitation.model.UserShareProductListBean;
 import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalBean;
 import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalConfigurationBean;
 import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalServiceBean;
+import com.yihucha.hbyhc.presentation.mine.model.CommissionBean;
 import com.yihucha.hbyhc.presentation.mine.model.UpdateAccountBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserAnnuityInfoBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
 import com.yihucha.hbyhc.presentation.mine.repository.UserRepository;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 import com.yihucha.hbyhc.utils.LogUtil;
 import com.yihucha.hbyhc.utils.MVUtils;
 
@@ -84,12 +86,12 @@ public class InviteViewModel extends BaseViewModel {
 
     public MutableLiveData<String> mSpreadNumberSucceed = new MutableLiveData<>();//绑定消息
 
-    public MutableLiveData<SpreadImageBean> mSpreadImageData=new MutableLiveData<>();//分享二维码图片
-
-    public MutableLiveData<List<SharePostersClassifyList>> mSharePostersClassifyListData=new MutableLiveData<>();//邀请好友分类
-    public MutableLiveData<List<InviteFriendsPicBean.PageInfo.PicList>> mPicListData=new MutableLiveData<>();//每条分类列表图片
-    public MutableLiveData<String> mShareImgsData=new MutableLiveData<>();//生成的图片
+    public MutableLiveData<SpreadImageBean> mSpreadImageData = new MutableLiveData<>();//分享二维码图片
 
+    public MutableLiveData<List<SharePostersClassifyList>> mSharePostersClassifyListData = new MutableLiveData<>();//邀请好友分类
+    public MutableLiveData<List<InviteFriendsPicBean.PageInfo.PicList>> mPicListData = new MutableLiveData<>();//每条分类列表图片
+    public MutableLiveData<String> mShareImgsData = new MutableLiveData<>();//生成的图片
+    public MutableLiveData<CommissionBean> commissionDetail = new MutableLiveData<>();//收益详情
 
 
 //    /**
@@ -137,7 +139,7 @@ public class InviteViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-               // failed.postValue(getString(R.string.failed_string));
+                // failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
@@ -160,7 +162,7 @@ public class InviteViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-              //  failed.postValue(getString(R.string.failed_string));
+                //  failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
@@ -174,7 +176,7 @@ public class InviteViewModel extends BaseViewModel {
         map.put("uid", MVUtils.getString(Constants.USER_ID));
         map.put("pageSize", pageSize);
         map.put("pageNum", page);
-        if (!TextUtils.isEmpty(nickname)){
+        if (!TextUtils.isEmpty(nickname)) {
             map.put("nickname", nickname);
         }
         UserService userService = NetworkApi.createService(UserService.class);
@@ -190,8 +192,8 @@ public class InviteViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-                LogUtil.LogInfo("Throwable",e.getMessage());
-            //    failed.postValue(getString(R.string.failed_string));
+                LogUtil.LogInfo("Throwable", e.getMessage());
+                //    failed.postValue(getString(R.string.failed_string));
                 failed.postValue(e.getMessage());
             }
         }));
@@ -211,7 +213,7 @@ public class InviteViewModel extends BaseViewModel {
             @Override
             public void onSuccess(DataResponse dataResponse) {
                 if (dataResponse.responseCode == 200) {
-                   mSpreadNumberSucceed.postValue(dataResponse.responseError);
+                    mSpreadNumberSucceed.postValue(dataResponse.responseError);
                 } else {
                     ToastUtils.showLong(dataResponse.responseError);
                 }
@@ -219,7 +221,7 @@ public class InviteViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-              //  failed.postValue(getString(R.string.failed_string));
+                //  failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
@@ -243,7 +245,7 @@ public class InviteViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-              //  failed.postValue(getString(R.string.failed_string));
+                //  failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
@@ -294,11 +296,45 @@ public class InviteViewModel extends BaseViewModel {
             @Override
             public void onFailure(Throwable e) {
                 LogUtil.LogInfo("Throwable", e.getMessage());
-              //  failed.postValue(getString(R.string.failed_string));
+                //  failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
 
+    /**
+     * 收益详情
+     */
+    @SuppressLint("CheckResult")
+    public void getCommissionDetail(String uid, String month, String commissionType) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("uid", uid);
+        map.put("limit", 1000);
+        if (EmptyCheckUtils.isNotEmpty(month)) {
+            map.put("month", month);
+        }
+        if (EmptyCheckUtils.isNotEmpty(commissionType)) {
+            map.put("commission_type", commissionType);
+        }
+
+        NetworkApi.createService(UserService.class)
+                .getCommissionDetail(map)
+                .compose(NetworkApi.applySchedulers(new BaseObserver<DataJavaResponse<CommissionBean>>() {
+                    @Override
+                    public void onSuccess(DataJavaResponse<CommissionBean> response) {
+                        if (response.responseCode == 200) {
+                            commissionDetail.postValue(response.getData());
+                        } else {
+                            failed.postValue(response.responseError);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Throwable e) {
+                        failed.postValue("");
+                    }
+                }));
+    }
+
     //提现佣金信息
     @SuppressLint("CheckResult")
     public void getSpreadInfo() {
@@ -315,7 +351,7 @@ public class InviteViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-             //   failed.postValue(getString(R.string.failed_string));
+                //   failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
@@ -338,7 +374,7 @@ public class InviteViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-            //    failed.postValue(getString(R.string.failed_string));
+                //    failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
@@ -353,9 +389,9 @@ public class InviteViewModel extends BaseViewModel {
             @Override
             public void onSuccess(DataResponse dataResponse) {
 //                if (dataResponse.responseCode ==200){
-                    if (TextUtils.isEmpty(flag)) {
-                        mBandAccountInfoSucceed.postValue(dataResponse.responseCode + "");
-                    }
+                if (TextUtils.isEmpty(flag)) {
+                    mBandAccountInfoSucceed.postValue(dataResponse.responseCode + "");
+                }
 //                    else {
 //                        ToastUtils.showLong(dataResponse.responseError);
 //                    }
@@ -367,7 +403,7 @@ public class InviteViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-              //  failed.postValue(getString(R.string.failed_string));
+                //  failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
@@ -421,7 +457,7 @@ public class InviteViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-             //   failed.postValue(getString(R.string.failed_string));
+                //   failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
@@ -433,12 +469,12 @@ public class InviteViewModel extends BaseViewModel {
      * @param extract_type
      */
     @SuppressLint("CheckResult")
-    public void getApplicationWithdrawal(String extract_price, String extract_type,boolean isRed) {
+    public void getApplicationWithdrawal(String extract_price, String extract_type, boolean isRed) {
         Map<String, Object> map = new HashMap<>();
         map.put("extract_price", extract_price);
         map.put("extract_type", extract_type);
         if (isRed)
-            map.put("type",2);
+            map.put("type", 2);
         UserService userService = NetworkApi.createService(UserService.class);
         userService.getApplicationWithdrawal(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse>() {
             @Override
@@ -452,7 +488,7 @@ public class InviteViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-             //   failed.postValue(getString(R.string.failed_string));
+                //   failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
@@ -510,7 +546,7 @@ public class InviteViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-              //  failed.postValue(getString(R.string.failed_string));
+                //  failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
@@ -541,9 +577,9 @@ public class InviteViewModel extends BaseViewModel {
         userService.getSpreadImage().compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<List<SpreadImageBean>>>() {
             @Override
             public void onSuccess(DataResponse<List<SpreadImageBean>> listDataResponse) {
-                if (listDataResponse.responseCode == 200){
+                if (listDataResponse.responseCode == 200) {
                     mSpreadImageData.postValue(listDataResponse.getData().get(0));
-                }else {
+                } else {
                     ToastUtils.showLong(listDataResponse.responseError);
                 }
 
@@ -551,8 +587,8 @@ public class InviteViewModel extends BaseViewModel {
 
             @Override
             public void onFailure(Throwable e) {
-                LogUtil.LogInfo("Throwable",e.getMessage());
-               // failed.postValue(getString(R.string.failed_string));
+                LogUtil.LogInfo("Throwable", e.getMessage());
+                // failed.postValue(getString(R.string.failed_string));
             }
         }));
     }
@@ -566,7 +602,7 @@ public class InviteViewModel extends BaseViewModel {
         userService.getClassifyList().compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<InviteFriendsClassifyBean>>() {
             @Override
             public void onSuccess(DataResponse<InviteFriendsClassifyBean> inviteFriendsClassifyBeanDataResponse) {
-                if (inviteFriendsClassifyBeanDataResponse.responseCode == 200){
+                if (inviteFriendsClassifyBeanDataResponse.responseCode == 200) {
                     mSharePostersClassifyListData.postValue(inviteFriendsClassifyBeanDataResponse.getData().getSharePostersClassifyList());
                 }
             }
@@ -577,6 +613,7 @@ public class InviteViewModel extends BaseViewModel {
             }
         }));
     }
+
     /**
      * 邀请好友分类
      */
@@ -586,9 +623,9 @@ public class InviteViewModel extends BaseViewModel {
         userService.getClassifyImgesList(request).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<InviteFriendsPicBean>>() {
             @Override
             public void onSuccess(DataResponse<InviteFriendsPicBean> inviteFriendsPicBeanDataResponse) {
-            if (inviteFriendsPicBeanDataResponse.responseCode == 200){
-                mPicListData.postValue(inviteFriendsPicBeanDataResponse.getData().getPageInfo().getList());
-            }
+                if (inviteFriendsPicBeanDataResponse.responseCode == 200) {
+                    mPicListData.postValue(inviteFriendsPicBeanDataResponse.getData().getPageInfo().getList());
+                }
             }
 
             @Override
@@ -607,7 +644,7 @@ public class InviteViewModel extends BaseViewModel {
         userService.getGenerateImages(request).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<ShareImgsBean>>() {
             @Override
             public void onSuccess(DataResponse<ShareImgsBean> shareImgsBeanDataResponse) {
-                if (shareImgsBeanDataResponse.responseCode==200){
+                if (shareImgsBeanDataResponse.responseCode == 200) {
                     mShareImgsData.postValue(shareImgsBeanDataResponse.getData().getShareImgs());
                 }
             }

app/src/main/java/com/yihucha/hbyhc/presentation/mine/CommissionDetailActivity.kt

@@ -0,0 +1,201 @@
+package com.yihucha.hbyhc.presentation.mine
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.Dialog
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.util.Log
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.lifecycle.ViewModelProvider
+import com.bigkoo.pickerview.R
+import com.bigkoo.pickerview.builder.TimePickerBuilder
+import com.bigkoo.pickerview.view.TimePickerView
+import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
+import com.yihucha.hbyhc.config.Constants
+import com.yihucha.hbyhc.databinding.ActivityCommissionDetailBinding
+import com.yihucha.hbyhc.presentation.invitation.view_model.InviteViewModel
+import com.yihucha.hbyhc.presentation.mine.adapter.CommissionDetailAdapter
+import com.yihucha.hbyhc.presentation.mine.model.CommissionBean
+import com.yihucha.hbyhc.utils.DateUtil
+import com.yihucha.hbyhc.utils.EmptyCheckUtils
+import com.yihucha.hbyhc.utils.MVUtils
+import com.yihucha.hbyhc.utils.StringUtils
+import com.yihucha.hbyhc.view.PopAnnuitySelector
+import com.yihucha.hbyhc.view.PopCommissionSelector
+import java.util.*
+
+/**
+ *  Author by 86175
+ *  Time is 2024/2/22 9:37
+ *  收益详情
+ */
+class CommissionDetailActivity : ViewBindingTitleBaseActivity<ActivityCommissionDetailBinding>() {
+    private var month = ""
+    private var dateTime = ""
+    private var commissionType = ""
+    private lateinit var popWindow: PopCommissionSelector
+    private lateinit var pvTime: TimePickerView
+    private val mInviteViewModel by lazy {
+        ViewModelProvider(this)[InviteViewModel::class.java]
+    }
+    private var data = mutableListOf<CommissionBean.PageInfoDTO.DataDTO>()
+    private lateinit var adapter: CommissionDetailAdapter
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        initView()
+        initData()
+        initListener()
+    }
+
+    private fun initView() {
+        adapter = CommissionDetailAdapter(this, data)
+        mViewBinding.lvCommission.adapter = adapter
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun initData() {
+        var calendar = Calendar.getInstance()
+        month =
+            "${calendar.get(Calendar.YEAR)}-${StringUtils.formatNumber(calendar.get(Calendar.MONTH) + 1)}"
+        dateTime =
+            "${calendar.get(Calendar.YEAR)}年${StringUtils.formatNumber(calendar.get(Calendar.MONTH) + 1)}月"
+        mViewBinding.tvDate.text = dateTime
+        loadCommissionDetail()
+        mInviteViewModel.commissionDetail.observe(this) {
+            it?.apply {
+                data.clear()
+                data.addAll(it.pageInfo.data)
+                if (EmptyCheckUtils.isNotEmpty(data)) {
+                    adapter.setDatas(data)
+                    mViewBinding.lvCommission.visibility = View.VISIBLE
+                    mViewBinding.layoutNoData.llNotFound.visibility = View.GONE
+                } else {
+                    mViewBinding.lvCommission.visibility = View.GONE
+                    mViewBinding.layoutNoData.llNotFound.visibility = View.VISIBLE
+                }
+                mViewBinding.tvMoney.text = "￥" + it.totelMoney
+            }
+
+        }
+        mInviteViewModel.failed.observe(this) {
+            mViewBinding.lvCommission.visibility = View.GONE
+            mViewBinding.layoutNoData.llNotFound.visibility = View.VISIBLE
+        }
+    }
+
+    private fun initListener() {
+        mViewBinding.tvSelector.setOnClickListener(this)
+        mViewBinding.tvDate.setOnClickListener(this)
+        initSelector()
+        initTimePicker()
+    }
+
+    private fun loadCommissionDetail() {
+        mInviteViewModel.getCommissionDetail(
+            MVUtils.getString(
+                Constants.USER_ID
+            ),
+            month,
+            commissionType
+        )
+    }
+
+    override fun onClick(v: View) {
+        when (v) {
+            mViewBinding.tvSelector -> {
+                //条件筛选
+                popWindow.showAsDropDown(mViewBinding.topLayout)
+                mViewBinding.viewBg.visibility = View.VISIBLE
+            }
+            mViewBinding.tvDate -> {
+                //日期筛选
+                pvTime.apply {
+                    if (!isShowing) {
+                        show()
+                    }
+                }
+            }
+            else -> {
+                super.onClick(v)
+            }
+        }
+
+    }
+
+
+    /**
+     * 条件选择器
+     */
+    private fun initSelector() {
+        popWindow = PopCommissionSelector(this)
+        popWindow.setOnDismissListener {
+            mViewBinding.viewBg.visibility = View.GONE
+        }
+        popWindow.setOnSelectListener { type ->
+            run {
+                commissionType = type
+                loadCommissionDetail()
+            }
+        }
+    }
+
+    /**
+     * 时间选择器
+     */
+    private fun initTimePicker() { //Dialog 模式下，在底部弹出
+        val startDate = Calendar.getInstance()
+        startDate[1900, 1] = 1
+        val endDate = Calendar.getInstance()
+        endDate[DateUtil.getYear().toInt(), DateUtil.getMonth().toInt() - 1] =
+            DateUtil.getDay().toInt()
+        pvTime = TimePickerBuilder(this) { date, _ ->
+            Log.i("pvTime", "onTimeSelect")
+            dateTime = DateUtil.getYearMonth(date.time)
+            mViewBinding.tvDate.text = dateTime
+            month = dateTime.replace("年", "-").replace("月", "")
+            loadCommissionDetail()
+        }
+            .setTimeSelectChangeListener { Log.i("pvTime", "onTimeSelectChanged") }
+            .setType(booleanArrayOf(true, true, false, false, false, false))
+            .isDialog(true) //默认设置false ，内部实现将DecorView 作为它的父控件。
+            .addOnCancelClickListener { Log.i("pvTime", "onCancelClickListener") }
+            .setItemVisibleCount(9) //若设置偶数，实际值会加1（比如设置6，则最大可见条目为7）
+            .setLineSpacingMultiplier(2.0f)
+            .isAlphaGradient(true)
+            .setSubmitText("确定")
+            .setCancelText("取消")
+            .setSubmitColor(Color.parseColor("#fe0032")) //确定按钮文字颜色
+            .setCancelColor(Color.parseColor("#333333")) //取消按钮文字颜色
+            .setContentTextSize(15)
+            .setDate(endDate)
+            .setRangDate(startDate, endDate) //起始终止年月日设定
+            .setTitleBgColor(Color.parseColor("#FFFFFF")) //标题背景颜色 Night mode
+            .build()
+        val mDialog: Dialog = pvTime.dialog
+        val params = FrameLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT,
+            Gravity.BOTTOM
+        )
+        params.leftMargin = 0
+        params.rightMargin = 0
+        pvTime.dialogContainerLayout.layoutParams = params
+        mDialog.window?.apply {
+            setWindowAnimations(R.style.picker_view_slide_anim) //修改动画样式
+            setGravity(Gravity.BOTTOM) //改成Bottom,底部显示
+            setDimAmount(0.3f)
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        fun launch(activity: Activity) {
+            activity.startActivity(Intent(activity, CommissionDetailActivity::class.java))
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/MyCommissionActivity.kt

@@ -5,16 +5,17 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.ViewModelProvider
-import com.blankj.utilcode.util.ToastUtils
 import com.bumptech.glide.Glide
-import com.yihucha.hbyhc.base.ViewBindingChangeTitleColorTitleBaseActivity
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
+import com.yihucha.hbyhc.base.WebViewTitleBaseActivity
+import com.yihucha.hbyhc.config.Constants
 import com.yihucha.hbyhc.databinding.ActivityMyCommissionBinding
-import com.yihucha.hbyhc.presentation.invitation.AccumulatedincomeActivity
+import com.yihucha.hbyhc.presentation.annuity.RealNameAuthenticationActivity
+import com.yihucha.hbyhc.presentation.invitation.ImmediateWithdrawalActivity
+import com.yihucha.hbyhc.presentation.invitation.InviteFriendsActivity
 import com.yihucha.hbyhc.presentation.invitation.view_model.InviteViewModel
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel
 import com.yihucha.hbyhc.utils.StringsUtil
-import org.jsoup.helper.StringUtil
 
 /**
  *  Author by zhangbing
@@ -23,6 +24,7 @@ import org.jsoup.helper.StringUtil
  */
 class MyCommissionActivity :
     ViewBindingTitleBaseActivity<ActivityMyCommissionBinding>(){
+    private var isCertification = "0" //是否实名人证  1表示实名认证
     private val mInviteViewModel by lazy {
         ViewModelProvider(this)[InviteViewModel::class.java]
     }
@@ -42,46 +44,39 @@ class MyCommissionActivity :
     }
 
     private fun initData() {
-        mInviteViewModel.selectUserInviteProfit()
-        mInviteViewModel.mInviteJavaData.observe(this) {
-            //未结算收益
-            mViewBinding.tvIncomeWjsValue.text = StringsUtil.getNumber(
-                it.userUnsettledInviteProfit
-            )
-        }
+        /* TODO 不确定该接口是否还有用
         mInviteViewModel.getAgentInfo()
-        mInviteViewModel.mInvitePHPBean.observe(this) { invitePHPBean ->
-            //当前
-            mViewBinding.tvIncomeYueValue.text =
-                StringsUtil.getNumber(invitePHPBean.brokerage_price)
-            //已提现
-            var extract = invitePHPBean.extract
-            if (StringUtil.isBlank(extract) || "0" == extract) {
-                extract = "0.00"
-            }
-            mViewBinding.tvIncomeYtxValue.text = "+" + StringsUtil.getNumber(extract)
+        mInviteViewModel.mInvitePHPBean.observe(this) {
 
-            //累计收益
-            mViewBinding.tvIncomeTotalValue.text = StringsUtil.getNumber(invitePHPBean.cumulative)
         }
+        mInviteViewModel.failed.observe(this) {
+            ToastUtils.showLong(it)
+        }
+        */
+        mInviteViewModel.getYanglaojinInfo()
+        mInviteViewModel.userAnnuityInfoBeanMutableLiveData.observe(
+            this
+        ) { userAnnuityInfoBean -> isCertification = userAnnuityInfoBean.is_certification }
 
-
-        //用户信息
-        mMineViewModel.getUserInfo()
-        mMineViewModel.userModel.observe(this) {
+        mMineViewModel.getSpreadInfoYhc()
+        mMineViewModel.spreadInfo.observe(this){
+            mViewBinding.tvIncomeTotalValue.text = StringsUtil.getNumber(it.totalBalance)
+            mViewBinding.tvIncomeYtxValue.text = StringsUtil.getNumber(it.withdrawnBalance)
+            mViewBinding.tvIncomeWjsValue.text = StringsUtil.getNumber(it.unsettledBalance)
+            mViewBinding.tvIncomeYueValue.text = StringsUtil.getNumber(it.currentBalance)
             Glide.with(this).load(it.avatar).into(mViewBinding.imgvHeadCommission)
             mViewBinding.tvNicknameCommission.text = it.nickname
         }
 
-        mInviteViewModel.failed.observe(this) {
-            ToastUtils.showLong(it)
-        }
+
     }
 
     private fun initListener() {
         mViewBinding.llInvitePartners.setOnClickListener(this)
         mViewBinding.llTixianRecords.setOnClickListener(this)
         mViewBinding.tvRules.setOnClickListener(this)
+        mViewBinding.tvInvitateFriends.setOnClickListener(this)
+        mViewBinding.tvGoTixian.setOnClickListener(this)
     }
 
 
@@ -90,7 +85,7 @@ class MyCommissionActivity :
         when (v) {
             mViewBinding.llInvitePartners -> {
                 //收益详情
-                AccumulatedincomeActivity.launch(this)
+                CommissionDetailActivity.launch(this)
             }
             mViewBinding.llTixianRecords -> {
                 //提现记录
@@ -98,6 +93,22 @@ class MyCommissionActivity :
             }
             mViewBinding.tvRules -> {
                 //规则
+                WebViewTitleBaseActivity.launch(this,"佣金规则",
+                    Constants.PROTOCOL_YHC_YONGJIN)
+            }
+            mViewBinding.tvInvitateFriends ->{
+                //邀请好友
+                InviteFriendsActivity.launch(this)
+            }
+            mViewBinding.tvGoTixian ->{
+                //去提现
+                if ("1" != isCertification) {
+                    //未实名认证
+                    RealNameAuthenticationActivity.launch(context)
+                } else {
+                    //已经实名
+                    ImmediateWithdrawalActivity.launch(context)
+                }
             }
         }
     }

app/src/main/java/com/yihucha/hbyhc/presentation/mine/MyTeamActivity.kt

@@ -11,6 +11,7 @@ import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter
 import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
 import com.yihucha.hbyhc.databinding.ActivityMyTeamBinding
+import com.yihucha.hbyhc.presentation.invitation.InviteFriendsActivity
 import com.yihucha.hbyhc.presentation.mine.adapter.TeamListAdapter
 import com.yihucha.hbyhc.presentation.mine.model.TeamBean
 import com.yihucha.hbyhc.presentation.mine.model.TeamViewModel
@@ -90,6 +91,9 @@ class MyTeamActivity : ViewBindingTitleBaseActivity<ActivityMyTeamBinding>() {
                 teamViewModel.requestTeamList(page)
             }
         })
+        mViewBinding.llTeamInvitate.setOnClickListener{
+            InviteFriendsActivity.launch(this)
+        }
     }
 
     companion object {

app/src/main/java/com/yihucha/hbyhc/presentation/mine/TiXianRecordActivity.kt

@@ -2,11 +2,10 @@ package com.yihucha.hbyhc.presentation.mine
 
 import android.app.Activity
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.lifecycle.ViewModelProvider
-import com.yihucha.hbyhc.base.ViewBindingChangeTitleColorTitleBaseActivity
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
+import com.yihucha.hbyhc.callback.OnRvItemClickListener
 import com.yihucha.hbyhc.databinding.ActivityTiXianRecordBinding
 import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalBean
 import com.yihucha.hbyhc.presentation.invitation.view_model.InviteViewModel
@@ -38,6 +37,12 @@ class TiXianRecordActivity :
     private fun initView() {
         adapter = TixianRecordAdapter(this, datas);
         mViewBinding.rvTixianRecords.adapter = adapter
+        adapter.setOnItemClickListener(object : OnRvItemClickListener{
+            override fun onItemClick(position: Int) {
+                TixianDetailActivity.launch(this@TiXianRecordActivity, datas[position])
+            }
+
+        })
     }
 
     companion object {

app/src/main/java/com/yihucha/hbyhc/presentation/mine/TixianDetailActivity.kt

@@ -0,0 +1,89 @@
+package com.yihucha.hbyhc.presentation.mine
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.core.content.ContextCompat
+import com.google.gson.Gson
+import com.yihucha.hbyhc.R
+import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
+import com.yihucha.hbyhc.databinding.ActivityTixianDetailBinding
+import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalBean
+import com.yihucha.hbyhc.presentation.mine.model.BankInfoBean
+import com.yihucha.hbyhc.utils.StringsUtil
+
+class TixianDetailActivity : ViewBindingTitleBaseActivity<ActivityTixianDetailBinding>() {
+    private var data: WithdrawalBean? = null
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        initData()
+    }
+
+    private fun initData() {
+        data = intent.getSerializableExtra("data") as WithdrawalBean
+        data?.apply {
+            mViewBinding.apply {
+                tvTimeValue.text = create_time
+                tvPaytimeValue.text = status_time
+                tvTitle.text = title
+                tvMoney.text = extract_price
+                if (title.contains("银行卡")) {
+                    val gsonStr = bankInfo.replace("\\", "").toString()
+                    println(gsonStr)
+                    var gson = Gson()
+                    val bankInfo = gson.fromJson(gsonStr, BankInfoBean::class.java)
+                    layoutBankInfo.visibility = View.VISIBLE
+                    tvBankTitle.text = bankInfo.bankName
+                    tvBankValue.text = StringsUtil.formatBankCard(bankInfo.account)
+                    tvUserTitle.text = bankInfo.userName
+                    tvUserValue.text = StringsUtil.encodeIdCard2(bankInfo.userCard)
+                }
+                when (status) {
+                    "-1" -> {
+                        //提现失败
+                        tvFailedTitle.visibility = View.VISIBLE
+                        tvFailedValue.visibility = View.VISIBLE
+                        tvStatusValue.text = "提现失败"
+                        tvStatusValue.setTextColor(
+                            ContextCompat.getColor(
+                                context,
+                                R.color.red_fe0032
+                            )
+                        )
+                        tvFailedValue.text = fail_msg
+                    }
+                    "0" -> {
+                        //提现中
+                        tvStatusValue.text = "提现中"
+                        tvStatusValue.setTextColor(
+                            ContextCompat.getColor(
+                                context,
+                                R.color.org_f88726
+                            )
+                        )
+                    }
+                    "1" -> {
+                        //已完成
+                        tvStatusValue.text = "已完成"
+                        tvStatusValue.setTextColor(
+                            ContextCompat.getColor(
+                                context,
+                                R.color.black_333333
+                            )
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        fun launch(activity: Activity, data: WithdrawalBean) {
+            val intent = Intent(activity, TixianDetailActivity::class.java)
+            intent.putExtra("data", data)
+            activity.startActivity(intent)
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/adapter/CommissionDetailAdapter.java

@@ -0,0 +1,130 @@
+package com.yihucha.hbyhc.presentation.mine.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import androidx.core.content.ContextCompat;
+
+import com.yihucha.hbyhc.R;
+import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalBean;
+import com.yihucha.hbyhc.presentation.mine.model.CommissionBean;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
+import com.yihucha.hbyhc.utils.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * author : zhangbing
+ * time   : 2024/2/1 23:16
+ * com.yihucha.hbyhc.presentation.mine.adapter
+ */
+public class CommissionDetailAdapter extends BaseAdapter {
+    List<String> typeArr = new ArrayList<>();
+    private Context context;
+    private List<CommissionBean.PageInfoDTO.DataDTO> datas;
+
+    public CommissionDetailAdapter(Context context, List<CommissionBean.PageInfoDTO.DataDTO> datas) {
+        this.context = context;
+        this.datas = datas;
+        //1代理费 2 消费佣金 3推广佣金 4辖区佣金5 养老金 6 广告费 7 商户跨店收入8平台奖励 9渠道商、
+        // 10 推广商户流水佣金 11分红 12区域管理收益 13消费循环佣金  14-会员专区管理奖，市场管理分红'
+        typeArr.add("");
+        typeArr.add("分享奖");
+        typeArr.add("业绩奖");
+        typeArr.add("代理商分红");
+        typeArr.add("推荐代理商收益");
+        typeArr.add("消费增值系统收益");
+        typeArr.add("运营中心收益");
+//        typeArr.add("代理费");
+//        typeArr.add("消费佣金");
+//        typeArr.add("推广佣金");
+//        typeArr.add("辖区佣金");
+//        typeArr.add("养老金");
+//        typeArr.add("广告费");
+//        typeArr.add("商户跨店收入");
+//        typeArr.add("平台奖励");
+//        typeArr.add("渠道商");
+//        typeArr.add("推广商户流水佣金");
+//        typeArr.add("分红");
+//        typeArr.add("区域管理收益");
+//        typeArr.add("消费循环佣金");
+//        typeArr.add("会员专区管理奖，市场管理分红");
+    }
+
+    public void setDatas(List<CommissionBean.PageInfoDTO.DataDTO> datas) {
+        this.datas = datas;
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getCount() {
+        return EmptyCheckUtils.isEmpty(datas) ? 0 : datas.size();
+    }
+
+    @Override
+    public CommissionBean.PageInfoDTO.DataDTO getItem(int position) {
+        return datas.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        TXRecordHolder holder = null;
+        if (convertView == null) {
+            convertView = LayoutInflater.from(context).inflate(R.layout.item_commission_detail, parent, false);
+            holder = new TXRecordHolder(convertView);
+            convertView.setTag(holder);
+        } else {
+            holder = (TXRecordHolder) convertView.getTag();
+        }
+        //此处设置数据
+        CommissionBean.PageInfoDTO.DataDTO item = getItem(position);
+        String commissionType = item.getType();
+        holder.tvName.setText(item.getTitle());
+        holder.tvTime.setText("结算时间："+item.getCreateTime());
+        holder.tvMoney.setText(item.getMoney());
+        TextView tvStatus = holder.tvStatus;
+        TextView tvTitle = holder.tvTitle;
+        if (StringUtils.isNumber(commissionType)) {
+            int i = Integer.parseInt(commissionType);
+            if (i > 0) tvTitle.setText(typeArr.get(i));
+        }
+        if ("0".equals(item.getStatus())) {
+            //未结算
+            tvStatus.setText("未结算");
+            tvStatus.setTextColor(ContextCompat.getColor(context, R.color.red_fe0032));
+            holder.tvTime.setVisibility(View.GONE);
+        } else if ("1".equals(item.getStatus())) {
+            //已结算
+            tvStatus.setText("已结算");
+            tvStatus.setTextColor(ContextCompat.getColor(context, R.color.black_333333));
+        }
+        return convertView;
+    }
+
+
+    static class TXRecordHolder {
+        public TextView tvName;
+        public TextView tvTime;
+        public TextView tvMoney;
+        public TextView tvStatus;
+        public TextView tvTitle;
+
+        public TXRecordHolder(View itemView) {
+            tvName = itemView.findViewById(R.id.tv_name);
+            tvTime = itemView.findViewById(R.id.t_time);
+            tvMoney = itemView.findViewById(R.id.tv_money);
+            tvStatus = itemView.findViewById(R.id.tv_status);
+            tvTitle = itemView.findViewById(R.id.tv_title);
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/adapter/TixianRecordAdapter.java

@@ -10,7 +10,7 @@ import android.widget.TextView;
 import androidx.core.content.ContextCompat;
 
 import com.yihucha.hbyhc.R;
-import com.yihucha.hbyhc.databinding.ItemTixianRecordsBinding;
+import com.yihucha.hbyhc.callback.OnRvItemClickListener;
 import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalBean;
 import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 
@@ -25,6 +25,7 @@ public class TixianRecordAdapter extends BaseAdapter {
     private Context context;
     private List<WithdrawalBean> datas;
 
+    private OnRvItemClickListener onRvItemClickListener;
     public TixianRecordAdapter(Context context, List<WithdrawalBean> datas) {
         this.context = context;
         this.datas = datas;
@@ -35,6 +36,10 @@ public class TixianRecordAdapter extends BaseAdapter {
         notifyDataSetChanged();
     }
 
+    public void setOnItemClickListener(OnRvItemClickListener onRvItemClickListener) {
+        this.onRvItemClickListener = onRvItemClickListener;
+    }
+
     @Override
     public int getCount() {
         return EmptyCheckUtils.isEmpty(datas) ? 0 : datas.size();
@@ -79,6 +84,11 @@ public class TixianRecordAdapter extends BaseAdapter {
             tvStatus.setText("已完成");
             tvStatus.setTextColor(ContextCompat.getColor(context, R.color.black_333333));
         }
+        holder.parent.setOnClickListener(v->{
+            if (EmptyCheckUtils.isNotEmpty(onRvItemClickListener)) {
+                onRvItemClickListener.onItemClick(position);
+            }
+        });
         return convertView;
     }
 
@@ -88,11 +98,13 @@ public class TixianRecordAdapter extends BaseAdapter {
         public TextView tvTime;
         public TextView tvMoney;
         public TextView tvStatus;
+        public ViewGroup parent;
         public TXRecordHolder(View itemView) {
             tvName = itemView.findViewById(R.id.tv_name);
             tvTime = itemView.findViewById(R.id.tv_time);
             tvMoney = itemView.findViewById(R.id.tv_money);
             tvStatus = itemView.findViewById(R.id.tv_status);
+            parent = itemView.findViewById(R.id.parent);
         }
     }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/mine/model/BankInfoBean.java

@@ -0,0 +1,182 @@
+package com.yihucha.hbyhc.presentation.mine.model;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * author : zhangbing
+ * time   : 2024/2/22 15:36
+ * com.yihucha.hbyhc.presentation.mine.model
+ */
+public class BankInfoBean {
+
+    @SerializedName("id")
+    private String id;
+    @SerializedName("user_id")
+    private String userId;
+    @SerializedName("account_type")
+    private String accountType;
+    @SerializedName("account")
+    private String account;
+    @SerializedName("is_default")
+    private String isDefault;
+    @SerializedName("create_time")
+    private String createTime;
+    @SerializedName("info")
+    private String info;
+    @SerializedName("update_time")
+    private String updateTime;
+    @SerializedName("status")
+    private String status;
+    @SerializedName("valid_date")
+    private String validDate;
+    @SerializedName("bank_name")
+    private String bankName;
+    @SerializedName("phone")
+    private String phone;
+    @SerializedName("bank_card_type")
+    private String bankCardType;
+    @SerializedName("user_name")
+    private String userName;
+    @SerializedName("user_card")
+    private String userCard;
+    @SerializedName("bank_open_name")
+    private String bankOpenName;
+    @SerializedName("pic")
+    private String pic;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getAccountType() {
+        return accountType;
+    }
+
+    public void setAccountType(String accountType) {
+        this.accountType = accountType;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getIsDefault() {
+        return isDefault;
+    }
+
+    public void setIsDefault(String isDefault) {
+        this.isDefault = isDefault;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getValidDate() {
+        return validDate;
+    }
+
+    public void setValidDate(String validDate) {
+        this.validDate = validDate;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getBankCardType() {
+        return bankCardType;
+    }
+
+    public void setBankCardType(String bankCardType) {
+        this.bankCardType = bankCardType;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserCard() {
+        return userCard;
+    }
+
+    public void setUserCard(String userCard) {
+        this.userCard = userCard;
+    }
+
+    public String getBankOpenName() {
+        return bankOpenName;
+    }
+
+    public void setBankOpenName(String bankOpenName) {
+        this.bankOpenName = bankOpenName;
+    }
+
+    public String getPic() {
+        return pic;
+    }
+
+    public void setPic(String pic) {
+        this.pic = pic;
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/model/CommissionBean.java

@@ -0,0 +1,170 @@
+package com.yihucha.hbyhc.presentation.mine.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+/**
+ * author : zhangbing
+ * time   : 2024/2/22 10:14
+ * com.yihucha.hbyhc.presentation.mine.model
+ */
+public class CommissionBean {
+
+    @SerializedName("totel_money")
+    private Double totelMoney;
+    @SerializedName("pageInfo")
+    private PageInfoDTO pageInfo;
+
+    public Double getTotelMoney() {
+        return totelMoney;
+    }
+
+    public void setTotelMoney(Double totelMoney) {
+        this.totelMoney = totelMoney;
+    }
+
+    public PageInfoDTO getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PageInfoDTO pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+
+    public static class PageInfoDTO {
+        @SerializedName("current_page")
+        private Integer currentPage;
+        @SerializedName("last_page")
+        private Integer lastPage;
+        @SerializedName("data")
+        private List<DataDTO> data;
+
+        public Integer getCurrentPage() {
+            return currentPage;
+        }
+
+        public void setCurrentPage(Integer currentPage) {
+            this.currentPage = currentPage;
+        }
+
+        public Integer getLastPage() {
+            return lastPage;
+        }
+
+        public void setLastPage(Integer lastPage) {
+            this.lastPage = lastPage;
+        }
+
+        public List<DataDTO> getData() {
+            return data;
+        }
+
+        public void setData(List<DataDTO> data) {
+            this.data = data;
+        }
+
+        public static class DataDTO {
+            @SerializedName("enterprise_user_bill")
+            private String enterpriseUserBill;
+            @SerializedName("mer_id")
+            private String merId;
+            @SerializedName("uid")
+            private String uid;
+            @SerializedName("money")
+            private String money;
+            @SerializedName("pm")
+            private String pm;
+            @SerializedName("title")
+            private String title;
+            @SerializedName("create_time")
+            private String createTime;
+            @SerializedName("type")
+            private String type;
+            @SerializedName("status")
+            private String status;
+            @SerializedName("order_sn")
+            private String orderSn;
+
+            public String getEnterpriseUserBill() {
+                return enterpriseUserBill;
+            }
+
+            public void setEnterpriseUserBill(String enterpriseUserBill) {
+                this.enterpriseUserBill = enterpriseUserBill;
+            }
+
+            public String getMerId() {
+                return merId;
+            }
+
+            public void setMerId(String merId) {
+                this.merId = merId;
+            }
+
+            public String getUid() {
+                return uid;
+            }
+
+            public void setUid(String uid) {
+                this.uid = uid;
+            }
+
+            public String getMoney() {
+                return money;
+            }
+
+            public void setMoney(String money) {
+                this.money = money;
+            }
+
+            public String getPm() {
+                return pm;
+            }
+
+            public void setPm(String pm) {
+                this.pm = pm;
+            }
+
+            public String getTitle() {
+                return title;
+            }
+
+            public void setTitle(String title) {
+                this.title = title;
+            }
+
+            public String getCreateTime() {
+                return createTime;
+            }
+
+            public void setCreateTime(String createTime) {
+                this.createTime = createTime;
+            }
+
+            public String getType() {
+                return type;
+            }
+
+            public void setType(String type) {
+                this.type = type;
+            }
+
+            public String getStatus() {
+                return status;
+            }
+
+            public void setStatus(String status) {
+                this.status = status;
+            }
+
+            public String getOrderSn() {
+                return orderSn;
+            }
+
+            public void setOrderSn(String orderSn) {
+                this.orderSn = orderSn;
+            }
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/view_model/MineSpreadInfo.java

@@ -12,7 +12,7 @@ public class MineSpreadInfo {
     @SerializedName("current_balance")
     private String currentBalance;
     @SerializedName("unsettled_balance")
-    private Integer unsettledBalance;
+    private String unsettledBalance;
     @SerializedName("withdrawn_balance")
     private String withdrawnBalance;
     @SerializedName("total_balance")
@@ -46,11 +46,11 @@ public class MineSpreadInfo {
         this.currentBalance = currentBalance;
     }
 
-    public Integer getUnsettledBalance() {
+    public String getUnsettledBalance() {
         return unsettledBalance;
     }
 
-    public void setUnsettledBalance(Integer unsettledBalance) {
+    public void setUnsettledBalance(String unsettledBalance) {
         this.unsettledBalance = unsettledBalance;
     }
 

app/src/main/java/com/yihucha/hbyhc/presentation/order/SubmitOrderActivity.java

@@ -31,6 +31,7 @@ import com.yihucha.hbyhc.presentation.order.model.OrderCreateBean;
 import com.yihucha.hbyhc.presentation.order.view_model.OrderViewModel;
 import com.yihucha.hbyhc.presentation.pay.PayActivity;
 import com.yihucha.hbyhc.utils.DoubleFormatTool;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 import com.yihucha.hbyhc.utils.LogUtil;
 import com.yihucha.hbyhc.utils.NumberUtil;
 import com.yihucha.hbyhc.utils.StringsUtil;
@@ -319,7 +320,7 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
             CreateOrderRequest createOrderRequest = new CreateOrderRequest();
             createOrderRequest.setPay_type("1");
             if (isChecked) {
-                if (!StringsUtil.isTel(account)) {
+                if (EmptyCheckUtils.isEmpty(account) || !StringsUtil.isTel(account)) {
                     Toast.makeText(context, "请正确输入开通账号", Toast.LENGTH_SHORT).show();
                     return;
                 } else {

app/src/main/java/com/yihucha/hbyhc/utils/StringUtils.kt

@@ -105,6 +105,21 @@ class StringUtils {
         }
 
         /**
+         * 判断字符串是否是数字
+         */
+        @JvmStatic
+        fun isNumber(number: String?): Boolean {
+            return number?.let {
+                try {
+                    Integer.parseInt(it)
+                    true
+                } catch (e: NumberFormatException) {
+                    false
+                }
+            } ?: false
+        }
+
+        /**
          * URL移除 http或https头部信息
          */
         @JvmStatic
@@ -205,5 +220,4 @@ class StringUtils {
     }
 
 
-
 }

app/src/main/java/com/yihucha/hbyhc/utils/StringsUtil.java

@@ -22,54 +22,58 @@ import anet.channel.util.StringUtils;
 @SuppressLint("SimpleDateFormat")
 public class StringsUtil {
 
-    public static boolean isEmpty(String str){
-        return str==null || "".equals(str);
+    public static boolean isEmpty(String str) {
+        return str == null || "".equals(str);
     }
-    public static boolean isEmpty(List lst){
-        return lst==null || lst.size()==0;
+
+    public static boolean isEmpty(List lst) {
+        return lst == null || lst.size() == 0;
     }
-    public static String getAllNumber(String str){
+
+    public static String getAllNumber(String str) {
         if (isEmpty(str)) {
             return "0";
         }
         if (str.contains("￥")) {
-            str = str.replace("￥","").trim();
+            str = str.replace("￥", "").trim();
         }
         try {
             double aFloat = Double.parseDouble(str);
             int num = (int) aFloat;
-            if (aFloat>num){
+            if (aFloat > num) {
                 return str;
             }
-            return num+"";
-        }catch (NumberFormatException e){
+            return num + "";
+        } catch (NumberFormatException e) {
             e.printStackTrace();
             return "0";
         }
     }
-    public static String getNumber(String str){
+
+    public static String getNumber(String str) {
         if (isEmpty(str)) {
             return "0.00";
         }
         try {
             double aFloat = Double.parseDouble(str);
-            if (aFloat>=10000&&false){
-                if (aFloat%10000==0){
-                    return (int)(aFloat / 10000)+"万";
+            if (aFloat >= 10000 && false) {
+                if (aFloat % 10000 == 0) {
+                    return (int) (aFloat / 10000) + "万";
                 }
-                return String.format("%.2f万",aFloat / 10000);
-            }else {
+                return String.format("%.2f万", aFloat / 10000);
+            } else {
                 int num = (int) aFloat;
-                if (aFloat>num){
+                if (aFloat > num) {
                     return str;
                 }
-                return num+"";
+                return num + "";
             }
-        }catch (NumberFormatException e){
+        } catch (NumberFormatException e) {
             e.printStackTrace();
             return "0.00";
         }
     }
+
     /**
      * 获取当前应用程序的版本号
      */
@@ -86,6 +90,7 @@ public class StringsUtil {
             return "1";
         }
     }
+
     /**
      * 如果版本1 大于 版本2 返回true 否则返回fasle 支持 2.2 2.2.1 比较
      * 支持不同位数的比较  2.0.0.0.0.1  2.0 对比
@@ -161,6 +166,7 @@ public class StringsUtil {
         }
         return false;
     }
+
     /**
      * 是否为电话号
      */
@@ -197,7 +203,7 @@ public class StringsUtil {
                     temp.append("*");
                 }
                 temp.append(string.subSequence(start_size, string.length()));
-            } else if (string.length() > 3){
+            } else if (string.length() > 3) {
                 int start_size = string.length() - 3;
                 for (int i = 0; i < start_size; i++) {
                     temp.append("*");
@@ -213,14 +219,29 @@ public class StringsUtil {
     }
 
     /**
+     * 身份证加密显示
+     */
+    public static String encodeIdCard2(String string) {
+        StringBuilder temp = new StringBuilder();
+        if (!TextUtils.isEmpty(string)) {
+            temp.append(string.substring(0,1));
+            temp.append("****************");
+            temp.append(string.substring(string.length()-1,string.length()));
+        } else {
+            return "";
+        }
+        return temp.toString();
+    }
+
+
+    /**
      * 银行卡取后4位
      */
     public static String getBankCard4(String string) {
         StringBuffer temp = new StringBuffer("");
-        if(string!=null && string.length() >= 4)
-        {
-        	temp.append(string.subSequence(string.length() - 4, string.length()));
-        } else if (string != null){
+        if (string != null && string.length() >= 4) {
+            temp.append(string.subSequence(string.length() - 4, string.length()));
+        } else if (string != null) {
             temp.append(string);
         }
         return temp.toString();
@@ -258,6 +279,26 @@ public class StringsUtil {
     }
 
     /**
+     * 银行卡格式化
+     */
+    public static String formatBankCard(String card) {
+        if (EmptyCheckUtils.isEmpty(card)) {
+            return card + "";
+        }
+        StringBuffer sb = new StringBuffer();
+        char[] chars = card.toCharArray();
+        int count = 1;
+        for (int i = 0; i < chars.length; i++) {
+            sb.append(chars[i]);
+            if (count % 4 == 0 && i != chars.length - 1) {
+                sb.append(" ");
+            }
+            count++;
+        }
+        return sb.toString();
+    }
+
+    /**
      * 银行卡加密显示
      */
     public static String longEncodeBankCard(String string) {
@@ -277,7 +318,7 @@ public class StringsUtil {
 
         String result = "";
         String origin = temp.toString();
-        for (int i = 0; i < origin.length(); i ++) {
+        for (int i = 0; i < origin.length(); i++) {
             result += temp.charAt(i);
             if ((i + 1) % 4 == 0) {
                 result += "  ";
@@ -289,7 +330,8 @@ public class StringsUtil {
 
     /**
      * 银行卡加密显示
-     * @param string 银行卡号
+     *
+     * @param string    银行卡号
      * @param eightFlag 是否展示8位，1-是，其他-否
      */
     public static String longEncodeBankCard(String string, String eightFlag) {
@@ -314,7 +356,7 @@ public class StringsUtil {
 
         String result = "";
         String origin = temp.toString();
-        for (int i = 0; i < origin.length(); i ++) {
+        for (int i = 0; i < origin.length(); i++) {
             result += temp.charAt(i);
             if ((i + 1) % 4 == 0) {
                 result += "  ";
@@ -323,7 +365,7 @@ public class StringsUtil {
 
         return result;
     }
-    
+
 //    /**
 //     * 银行卡加密显示
 //     */
@@ -524,13 +566,13 @@ public class StringsUtil {
             }
             if (sbstr.length() > 8) {
                 sbstr.insert(8, " ");
-            }            
+            }
             return sbstr.toString();
         } else {
             return "";
         }
     }
-    
+
     public static String getBankCard(String string) {
         if (string != null && string.length() > 0) {
             StringBuilder sbstr = new StringBuilder(string);
@@ -563,7 +605,7 @@ public class StringsUtil {
 
     /**
      * 计算剩余时间
-     * 
+     *
      * @param temp1：开盘时间
      * @param temp2：系统时间
      * @return
@@ -585,33 +627,35 @@ public class StringsUtil {
         }
         return date1 - date2;
     }
+
     //根据时间戳字符串获取格式化时间
-    public static String getTime(String time){
-        if (time == null||"".equals(time)) {
+    public static String getTime(String time) {
+        if (time == null || "".equals(time)) {
             return "";
         }
         try {
             long ltime = Long.parseLong(time);
             return dateFormater.format(ltime);
-        }catch (Exception e){
+        } catch (Exception e) {
             return "";
         }
     }
 
-    public static long getEndTime(String timeStr){
+    public static long getEndTime(String timeStr) {
         if (StringUtils.isBlank(timeStr)) {
             return 0;
         }
         try {
             long endTime = dateFormater.parse(timeStr).getTime();
             long curr = System.currentTimeMillis();
-            return endTime-curr;
-        }catch (Exception e){
+            return endTime - curr;
+        } catch (Exception e) {
             return 0;
         }
 
     }
-    public static String getTimeNoYear(long time){
+
+    public static String getTimeNoYear(long time) {
         if (time <= 0) {
             return "";
         }
@@ -620,16 +664,17 @@ public class StringsUtil {
     }
 
     //根据时间字符串获取时间值
-    public static long getLongTime(String timeStr){
-    	long time = 0;
-    	try {
-    		time = dateFormater.parse(timeStr).getTime();
+    public static long getLongTime(String timeStr) {
+        long time = 0;
+        try {
+            time = dateFormater.parse(timeStr).getTime();
         } catch (Exception e) {
             e.printStackTrace();
         }
         return time;
     }
-    public static long getLongTime2(String timeStr){
+
+    public static long getLongTime2(String timeStr) {
         long time = 0;
         try {
             time = dateFormater2.parse(timeStr).getTime();
@@ -638,6 +683,7 @@ public class StringsUtil {
         }
         return time;
     }
+
     public static long getHour(long tempTime) {
         long timeCount = tempTime / (1000 * 60 * 60);
         return timeCount;

app/src/main/java/com/yihucha/hbyhc/view/PopAnnuitySelector.java

@@ -80,8 +80,8 @@ public class PopAnnuitySelector extends PopupWindow implements View.OnClickListe
         GridLayoutManager statusManager = new GridLayoutManager(context, 3);
         binding.rvSourceItem.setLayoutManager(sourceManager);
         binding.rvStatusItem.setLayoutManager(statusManager);
-        sourceAdapter = new ItemAnnuitySelectorAdapter(context, sourceBeans);
-        statusAdapter = new ItemAnnuitySelectorAdapter(context, statusBeans);
+        sourceAdapter = new ItemAnnuitySelectorAdapter(context, sourceBeans,3);
+        statusAdapter = new ItemAnnuitySelectorAdapter(context, statusBeans,3);
 //        binding.rvSourceItem.addItemDecoration(new SpaceItemDecoration(DensityUtil.dp2px(context, 13)));
 //        binding.rvStatusItem.addItemDecoration(new SpaceItemDecoration(DensityUtil.dp2px(context, 13)));
         binding.rvSourceItem.setAdapter(sourceAdapter);

app/src/main/java/com/yihucha/hbyhc/view/PopCommissionSelector.java

@@ -0,0 +1,108 @@
+package com.yihucha.hbyhc.view;
+
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.PopupWindow;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.yihucha.hbyhc.R;
+import com.yihucha.hbyhc.databinding.PopwindowAnnuityRecordsSelectorBinding;
+import com.yihucha.hbyhc.databinding.PopwindowCommissionSelectorBinding;
+import com.yihucha.hbyhc.presentation.annuity.adapter.ItemAnnuitySelectorAdapter;
+import com.yihucha.hbyhc.presentation.annuity.model.SelectorBean;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * author : zhangbing
+ * time   : 2023/10/21 20:47
+ * com.laolaixiang.bjtdba.view
+ */
+public class PopCommissionSelector extends PopupWindow implements View.OnClickListener {
+    private PopwindowCommissionSelectorBinding binding;
+    private List<SelectorBean> sourceBeans = new ArrayList<>();
+    private List<SelectorBean> statusBeans = new ArrayList<>();
+    private Context context;
+    private ItemAnnuitySelectorAdapter sourceAdapter;
+
+    private int sourcePos = 0;
+    private int sourcePosL = 0;
+    public PopCommissionSelector(Context context) {
+        super(context);
+        this.context = context;
+        View view = LayoutInflater.from(context).inflate(R.layout.popwindow_commission_selector, null);
+        binding = PopwindowCommissionSelectorBinding.bind(view);
+        //设置SelectPicPopupWindow的View
+        this.setContentView(view);
+        //设置SelectPicPopupWindow弹出窗体的宽
+        this.setWidth(WindowManager.LayoutParams.MATCH_PARENT);
+        //设置SelectPicPopupWindow弹出窗体的高
+        this.setHeight(WindowManager.LayoutParams.WRAP_CONTENT);
+        //设置SelectPicPopupWindow弹出窗体可点击
+        this.setFocusable(true);
+
+        //设置SelectPicPopupWindow弹出窗体动画效果
+//        this.setAnimationStyle(R.style.mystyle);
+        //实例化一个ColorDrawable颜色为半透明
+        ColorDrawable dw = new ColorDrawable(0x00000000);
+        //设置SelectPicPopupWindow弹出窗体的背景
+        this.setBackgroundDrawable(dw);
+        initView();
+        initClick();
+    }
+
+    private void initView() {
+        sourceBeans.add(new SelectorBean("全部", "", true));
+        sourceBeans.add(new SelectorBean("分享奖", "1", false));
+        sourceBeans.add(new SelectorBean("业绩奖", "2", false));
+        sourceBeans.add(new SelectorBean("代理商分红", "3", false));
+        sourceBeans.add(new SelectorBean("推荐代理商收益", "4", false));
+        sourceBeans.add(new SelectorBean("消费增值系统收益", "5", false));
+        sourceBeans.add(new SelectorBean("运营中心收益", "5", false));
+        GridLayoutManager sourceManager = new GridLayoutManager(context, 2);
+        binding.rvTypeItem.setLayoutManager(sourceManager);
+        sourceAdapter = new ItemAnnuitySelectorAdapter(context, sourceBeans,2);
+        binding.rvTypeItem.setAdapter(sourceAdapter);
+        sourceAdapter.setOnItemClickListener(itemPos -> {
+            sourcePosL = itemPos;
+        });
+    }
+
+    private void initClick() {
+        binding.tvReset.setOnClickListener(this::onClick);
+        binding.tvConfirm.setOnClickListener(this::onClick);
+        binding.viewBg.setOnClickListener(this::onClick);
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == binding.tvReset) {
+            sourcePos = sourcePosL = 0;
+            sourceAdapter.onClick(sourcePos);
+        } else if (view == binding.tvConfirm) {
+            sourcePos = sourcePosL;
+            if (EmptyCheckUtils.isNotEmpty(onSelectListener)) {
+                onSelectListener.onSelect(sourceBeans.get(sourcePos).getKey());
+            }
+            dismiss();
+        } else if (view == binding.viewBg) {
+            dismiss();
+        }
+    }
+
+    private OnSelectListener onSelectListener;
+
+    public void setOnSelectListener(OnSelectListener onSelectListener) {
+        this.onSelectListener = onSelectListener;
+    }
+
+    public interface OnSelectListener {
+        void onSelect(String type);
+    }
+}

app/src/main/res/layout/activity_commission_detail.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white_f7f7f7"
+    tools:context=".presentation.mine.CommissionDetailActivity">
+
+    <LinearLayout
+        android:id="@+id/top_layout"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:background="@color/yellow_fff9ed"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:paddingLeft="16dp"
+            android:text="当日分红奖次日1时结算，推荐奖实时结算"
+            android:textColor="@color/red_ff6010" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:background="@color/gray_e5e5e5" />
+
+        <TextView
+            android:id="@+id/tv_selector"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:drawableRight="@mipmap/tuijian_xiala"
+            android:drawablePadding="5dp"
+            android:gravity="center_vertical"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:text="筛选"
+            android:textColor="@color/black_333333"
+            android:textSize="13sp" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tv_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/top_layout"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:drawableRight="@mipmap/tuijian_xiala"
+        android:drawablePadding="5dp"
+        android:text="2023年12月"
+        android:textColor="@color/black_333333"
+        android:textSize="15sp" />
+
+    <TextView
+        android:id="@+id/tv_money"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/tv_date"
+        android:layout_alignBottom="@+id/tv_date"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="16dp"
+        android:text="￥123.45" />
+
+    <ListView
+        android:id="@+id/lv_commission"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:layout_below="@+id/tv_date"
+        android:scrollbars="none"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp" />
+    <View
+        android:id="@+id/view_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/black"
+        android:alpha="0.5"
+        android:visibility="gone"
+        android:layout_below="@+id/tv_date"
+        />
+    <include
+        android:id="@+id/layout_no_data"
+        layout="@layout/search_not_found"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:visibility="gone" />
+</RelativeLayout>

app/src/main/res/layout/activity_my_commission.xml

@@ -176,7 +176,7 @@
         android:layout_height="wrap_content"
         android:drawableLeft="@mipmap/icon_invitate_friends"
         android:drawablePadding="5dp"
-        android:text="申请提现"
+        android:text="邀请好友"
         android:textColor="@color/black_333333"
         android:textSize="15sp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_go_tixian"

app/src/main/res/layout/activity_tixian_detail.xml

@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white_f8f8f8"
+    android:orientation="vertical"
+    tools:context=".presentation.mine.TixianDetailActivity">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:padding="16dp">
+
+                <ImageView
+                    android:id="@+id/imgv_withdraw"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="20dp"
+                    android:src="@mipmap/icon_withdraw" />
+
+                <TextView
+                    android:id="@+id/tv_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/imgv_withdraw"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="10dp"
+                    android:text="提现至微信"
+                    android:textColor="@color/black_333333"
+                    android:textSize="16sp" />
+
+                <com.yihucha.hbyhc.view.BoldText
+                    android:id="@+id/tv_money"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_title"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="10dp"
+                    android:text="200"
+                    android:textColor="@color/black_333333"
+                    android:textSize="30sp" />
+
+                <View
+                    android:id="@+id/view_line"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_below="@+id/tv_money"
+                    android:layout_marginTop="45dp"
+                    android:background="@color/gray_e5e5e5" />
+
+                <com.yihucha.hbyhc.view.BoldText
+                    android:id="@+id/tv_info_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/view_line"
+                    android:layout_marginTop="16dp"
+                    android:text="交易信息"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_status_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_info_title"
+                    android:layout_marginTop="16dp"
+                    android:text="提现状态"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_status_value"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_info_title"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="16dp"
+                    android:text="已完成"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_time_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_status_title"
+                    android:layout_marginTop="16dp"
+                    android:text="提现时间"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_time_value"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_status_title"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="16dp"
+                    android:text="2023-11-15 18:30:00"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_paytime_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_time_title"
+                    android:layout_marginTop="16dp"
+                    android:text="打款时间"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_paytime_value"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_time_title"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="16dp"
+                    android:text="2023-11-15 18:30:00"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_failed_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_paytime_title"
+                    android:layout_marginTop="16dp"
+                    android:text="失败原因"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp"
+                    android:visibility="gone"
+                    />
+
+                <TextView
+                    android:id="@+id/tv_failed_value"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_failed_title"
+                    android:layout_marginTop="16dp"
+                    android:background="@color/white_f8f8f8"
+                    android:minLines="5"
+                    android:padding="5dp"
+                    android:text="此处显示失败原因，有后台大款人员备注的信息，有多少展示多少此处显示失败原因，有后台大款人员备注的信息，有多少展示多少此处显示失败原因，有后台大款人员备注的信息，有多少展示多少"
+                    android:textColor="@color/gray_999999"
+                    android:textSize="15sp"
+                    android:visibility="gone"
+                    android:layout_marginBottom="12dp"
+                    />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/layout_bank_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:padding="16dp"
+                android:visibility="gone"
+                android:layout_marginTop="10dp"
+                >
+
+                <com.yihucha.hbyhc.view.BoldText
+                    android:id="@+id/tv_bank_info_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="银行卡信息"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_bank_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_bank_info_title"
+                    android:layout_marginTop="16dp"
+                    android:text="中国银行"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_bank_value"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_bank_info_title"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="16dp"
+                    android:text="6227 0002 1005 0777 888"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_user_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_bank_title"
+                    android:layout_marginTop="16dp"
+                    android:text="打款时间"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/tv_user_value"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_bank_title"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="16dp"
+                    android:text="2023-11-15 18:30:00"
+                    android:textColor="@color/black_333333"
+                    android:textSize="15sp" />
+            </RelativeLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="30dp"
+                android:layout_marginBottom="30dp"
+                android:text="客服电话：400-600-8888"
+                android:textColor="@color/gray_999999"
+                android:textSize="12sp" />
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>

app/src/main/res/layout/item_commission_detail.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp">
+
+    <com.yihucha.hbyhc.view.BoldText
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="推荐奖"
+        android:textColor="@color/black_333333"
+        android:textSize="14sp" />
+
+    <TextView
+        android:id="@+id/tv_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/tv_title"
+        android:layout_alignBottom="@+id/tv_title"
+        android:layout_alignParentRight="true"
+        android:text="已结算"
+        android:textColor="@color/black_333333"
+        android:textSize="12sp" />
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_title"
+        android:layout_marginTop="4dp"
+        android:text="光头强购买微电商品"
+        android:textColor="@color/black_333333"
+        android:textSize="12sp" />
+
+    <TextView
+        android:id="@+id/tv_money"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/tv_name"
+        android:layout_alignBottom="@+id/tv_name"
+        android:layout_alignParentRight="true"
+        android:text="￥200.00"
+        android:textColor="@color/black_333333"
+        android:textSize="15sp" />
+
+    <TextView
+        android:id="@+id/t_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="2023-08-26 18:30:30"
+        android:textColor="@color/gray_999999"
+        android:textSize="12sp"
+        android:layout_below="@+id/tv_name"
+        android:layout_marginTop="4dp"
+        />
+
+</RelativeLayout>

app/src/main/res/layout/item_tixian_records.xml

@@ -6,6 +6,7 @@
     android:background="@color/white"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
+    android:id="@+id/parent"
     >
     <TextView
         android:id="@+id/tv_name"

app/src/main/res/layout/popwindow_commission_selector.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:paddingTop="16dp">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_type_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_reset"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="3dp"
+        android:background="@drawable/shape_line_999999_50dp"
+        android:gravity="center"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:text="重置"
+        android:textColor="@color/black_333333"
+        android:textSize="17sp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/tv_confirm"
+        app:layout_constraintTop_toBottomOf="@+id/rv_type_item" />
+
+    <TextView
+        android:id="@+id/tv_confirm"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="3dp"
+        android:layout_marginRight="16dp"
+        android:background="@drawable/shape_fe0032_50dp"
+        android:gravity="center"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:text="确定"
+        android:textColor="@color/white"
+        android:textSize="17sp"
+        app:layout_constraintLeft_toRightOf="@+id/tv_reset"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_reset" />
+
+    <View
+        android:id="@+id/view_bg"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="25dp"
+        android:alpha="0.5"
+        android:background="@color/black"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_reset"
+        app:layout_constraintVertical_weight="1" />
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -17,6 +17,7 @@
     <color name="black_737373">#737373</color>
     <color name="white">#FFFFFFFF</color>
     <color name="white_f8f8f8">#F8F8F8</color>
+    <color name="white_f7f7f7">#F7F7F7</color>
     <color name="org_f88726">#f88726</color>
 
     <color name="translate">#00000000</color>