2024-2-23 代码备份

红积分页面功能开发、接口调试完成
支付页面调整，增加好友代付选项
代付页面UI完成一部分

app/src/main/AndroidManifest.xml

@@ -78,10 +78,17 @@
         tools:replace="android:theme"
         tools:targetApi="31">
         <activity
+            android:name=".presentation.pay.ShareFriendsPayActivity"
+            android:label="代付详情"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.integral.NewRedIntegralActivity"
+            android:exported="false"
+            android:label="我的红积分" />
+        <activity
             android:name=".presentation.mine.TixianDetailActivity"
             android:exported="false"
-            android:label="详情"
-            />
+            android:label="详情" />
         <activity
             android:name=".presentation.mine.CommissionDetailActivity"
             android:exported="false"

app/src/main/java/com/yihucha/hbyhc/base/BaseActivity.java

@@ -2,6 +2,7 @@ package com.yihucha.hbyhc.base;
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
@@ -45,6 +46,8 @@ public abstract class BaseActivity extends AppCompatActivity  {
         ActivityStack.getScreenManager().pushActivity(this);
         //禁止大字体和显示大小
         DispUtil.disabledDisplayDpiChange(this.getResources());
+        //所有页面强制竖屏展示
+//        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         //禁止大字体
 //        DispUtil.disabledDisplayDpiChange(this.getResources());
 //        initView();

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

@@ -18,6 +18,7 @@ import com.yihucha.hbyhc.presentation.annuity.model.YanglaojinLogXXBean;
 import com.yihucha.hbyhc.presentation.integral.model.IntegralListBean;
 import com.yihucha.hbyhc.presentation.integral.model.RedIntegralBean;
 import com.yihucha.hbyhc.presentation.integral.model.RedIntegralBean2;
+import com.yihucha.hbyhc.presentation.integral.model.RedIntegralListBean;
 import com.yihucha.hbyhc.presentation.invitation.model.AccumulatedincomeBean;
 import com.yihucha.hbyhc.presentation.invitation.model.InviteFriendsClassifyBean;
 import com.yihucha.hbyhc.presentation.invitation.model.InviteFriendsPicBean;
@@ -557,6 +558,8 @@ public interface UserService {
     @POST("api/user/relation/batch/delete")
     Observable<DataResponse> cancleCollect(@Body CancleCollectBean body);
 
+    @GET("api/user/green_integral_list")
+    Observable<DataResponse<List<RedIntegralListBean>>> getRedIntegralBean(@QueryMap Map<String,Object> map);
 //    /**
 //     *检测用户年费状态
 //     * @param

app/src/main/java/com/yihucha/hbyhc/presentation/integral/NewRedIntegralActivity.java

@@ -0,0 +1,191 @@
+package com.yihucha.hbyhc.presentation.integral;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.View;
+
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter;
+import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout;
+
+import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity;
+import com.yihucha.hbyhc.config.Constants;
+import com.yihucha.hbyhc.databinding.ActivityRedIntegralNewBinding;
+import com.yihucha.hbyhc.presentation.integral.adapter.NewRedIntegralAdapter;
+import com.yihucha.hbyhc.presentation.integral.model.RedIntegralListBean;
+import com.yihucha.hbyhc.presentation.invitation.view_model.InviteViewModel;
+import com.yihucha.hbyhc.presentation.mine.view_model.MineSpreadInfo;
+import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
+import com.yihucha.hbyhc.utils.MVUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class NewRedIntegralActivity extends ViewBindingTitleBaseActivity<ActivityRedIntegralNewBinding>
+        implements View.OnClickListener {
+    private NewRedIntegralAdapter adapter;
+    private List<RedIntegralListBean> beans = new ArrayList<>();
+    private int page = 1;
+    private InviteViewModel mInviteViewModel;
+    private MineViewModel mMineViewModel;
+    private boolean isIncome = true;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        initView();
+        initData();
+        initListener();
+    }
+
+    private void initData() {
+        if (!"".equals(MVUtils.getString(Constants.TOKEN))) {
+            mMineViewModel.getSpreadInfoYhc();
+            loadData();
+        }
+        mMineViewModel.spreadInfo.observe(this, mineSpreadInfo -> {
+            mViewBinding.tvRedIntegral.setText(mineSpreadInfo.getGreenIntegral());
+        });
+        mInviteViewModel.redIntegralListBean.observe(this, datas -> {
+//            if (EmptyCheckUtils.isEmpty(datas)) page--; // 如果加载不成功，回滚分页
+            System.out.println(datas.size());
+            beans.addAll(datas);
+            System.out.println(beans.size());
+            if (EmptyCheckUtils.isNotEmpty(beans)) {
+                mViewBinding.layoutNoData.llNotFound.setVisibility(View.GONE);
+                mViewBinding.lvIntegral.setVisibility(View.VISIBLE);
+                adapter.setDataBeans(beans);
+            } else {
+                mViewBinding.layoutNoData.llNotFound.setVisibility(View.VISIBLE);
+                mViewBinding.lvIntegral.setVisibility(View.GONE);
+            }
+        });
+        mInviteViewModel.failed.observe(this, s -> {
+            if (EmptyCheckUtils.isNotEmpty(beans)) {
+                mViewBinding.layoutNoData.llNotFound.setVisibility(View.VISIBLE);
+                mViewBinding.lvIntegral.setVisibility(View.GONE);
+            }
+        });
+    }
+
+    private void loadData() {
+        //加载红积分列表数据
+        mInviteViewModel.getRedIntegralList(page, 10, isIncome ? 1 : 2);
+    }
+
+    private void initView() {
+        mInviteViewModel = new ViewModelProvider(this).get(InviteViewModel.class);
+        mMineViewModel = new ViewModelProvider(this).get(MineViewModel.class);
+        LinearLayoutManager manager = new LinearLayoutManager(this) {
+            @Override
+            public boolean canScrollVertically() {
+                return false;
+            }
+        };
+        mViewBinding.lvIntegral.setLayoutManager(manager);
+        mViewBinding.lvIntegral.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
+        if (adapter == null) {
+            adapter = new NewRedIntegralAdapter(beans);
+        }
+        mViewBinding.lvIntegral.setAdapter(adapter);
+        mViewBinding.refreshLayout.setEnableRefresh(false);
+        mViewBinding.refreshLayout.setOnRefreshListener(new RefreshListenerAdapter() {
+            @Override
+            public void onLoadMore(TwinklingRefreshLayout refreshLayout) {
+                super.onLoadMore(refreshLayout);
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        page++;
+                        if (!"".equals(MVUtils.getString(Constants.TOKEN)))
+                            loadData();
+                        refreshLayout.finishLoadmore();
+                    }
+                }, 1000);
+            }
+        });
+    }
+
+    private void initListener() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            mViewBinding.scrollView.setOnScrollChangeListener((View.OnScrollChangeListener) (v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
+                int[] location = new int[2];
+                mViewBinding.layoutCenterSelector.getLocationOnScreen(location);
+                System.out.println(location[0] + ":" + location[1]);
+                if (location[1] <= mTitleView.getBottom()) {
+                    mViewBinding.layoutTopSelector.setVisibility(View.VISIBLE);
+                } else {
+                    mViewBinding.layoutTopSelector.setVisibility(View.GONE);
+                }
+            });
+        }
+        mViewBinding.titleIncome.setOnClickListener(this);
+        mViewBinding.titleIncomeTop.setOnClickListener(this);
+        mViewBinding.titlePay.setOnClickListener(this);
+        mViewBinding.titlePayTop.setOnClickListener(this);
+    }
+
+    public static void launch(Context context, Bundle bundle) {
+        Intent intent = new Intent(context, NewRedIntegralActivity.class);
+        intent.putExtra("data", bundle);
+        context.startActivity(intent);
+    }
+
+    public static void launch(Context context) {
+        Intent intent = new Intent(context, NewRedIntegralActivity.class);
+        context.startActivity(intent);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v == mViewBinding.titleIncome || v == mViewBinding.titleIncomeTop) {
+            if (isIncome) return;
+            beans.clear();
+            isIncome = true;
+            resetSelector();
+            page = 1;
+            loadData();
+        } else if (v == mViewBinding.titlePay || v == mViewBinding.titlePayTop) {
+            if (!isIncome) return;
+            beans.clear();
+            isIncome = false;
+            resetSelector();
+            page = 1;
+            loadData();
+        }
+    }
+
+    private void resetSelector() {
+        if (isIncome) {
+            mViewBinding.titlePay.setTextColor(Color.parseColor("#333333"));
+            mViewBinding.linePay.setVisibility(View.INVISIBLE);
+            mViewBinding.titlePayTop.setTextColor(Color.parseColor("#333333"));
+            mViewBinding.linePayTop.setVisibility(View.INVISIBLE);
+
+            mViewBinding.titleIncome.setTextColor(Color.parseColor("#fe0032"));
+            mViewBinding.lineIncome.setVisibility(View.VISIBLE);
+            mViewBinding.titleIncomeTop.setTextColor(Color.parseColor("#fe0032"));
+            mViewBinding.lineIncomeTop.setVisibility(View.VISIBLE);
+
+        } else {
+            mViewBinding.titleIncome.setTextColor(Color.parseColor("#333333"));
+            mViewBinding.lineIncome.setVisibility(View.INVISIBLE);
+            mViewBinding.titleIncomeTop.setTextColor(Color.parseColor("#333333"));
+            mViewBinding.lineIncomeTop.setVisibility(View.INVISIBLE);
+
+            mViewBinding.titlePay.setTextColor(Color.parseColor("#fe0032"));
+            mViewBinding.linePay.setVisibility(View.VISIBLE);
+            mViewBinding.titlePayTop.setTextColor(Color.parseColor("#fe0032"));
+            mViewBinding.linePayTop.setVisibility(View.VISIBLE);
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/integral/adapter/NewRedIntegralAdapter.kt

@@ -0,0 +1,53 @@
+package com.yihucha.hbyhc.presentation.integral.adapter
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.yihucha.hbyhc.R
+import com.yihucha.hbyhc.databinding.ItemNewRedIntegralBinding
+import com.yihucha.hbyhc.presentation.integral.model.RedIntegralListBean
+import com.yihucha.hbyhc.utils.EmptyCheckUtils
+
+/**
+ *  author : zhangbing
+ *  time   : 2024/2/23 10:51
+ *  com.yihucha.hbyhc.presentation.integral.adapter
+ */
+class NewRedIntegralAdapter(var beans: List<RedIntegralListBean>) :
+    Adapter<NewRedIntegralAdapter.RedIntegralHolder>() {
+
+    fun setDataBeans(datas: List<RedIntegralListBean>){
+        this.beans = datas
+        notifyDataSetChanged()
+    }
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RedIntegralHolder {
+        return RedIntegralHolder(
+            LayoutInflater
+                .from(parent.context)
+                .inflate(R.layout.item_new_red_integral, parent, false)
+        )
+    }
+
+    override fun getItemCount(): Int {
+        return if (EmptyCheckUtils.isEmpty(beans)) 0 else beans.size*10
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: RedIntegralHolder, position: Int) {
+        val bean = beans[position%3]
+        holder.tvIntegral.text = "${if (bean.pm == "1") "+" else "-"}${bean.rewardSocre}"
+        holder.tvDescription.text = bean.mark
+        holder.tvTime.text = bean.createTime
+    }
+
+
+    class RedIntegralHolder(var itemView: View) : ViewHolder(itemView) {
+        var tvIntegral:TextView = itemView.findViewById(R.id.tv_integral)
+        var tvDescription:TextView = itemView.findViewById(R.id.tv_description)
+        var tvTime:TextView = itemView.findViewById(R.id.tv_time)
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/integral/model/RedIntegralListBean.java

@@ -0,0 +1,72 @@
+package com.yihucha.hbyhc.presentation.integral.model;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * author : zhangbing
+ * time   : 2024/2/23 10:35
+ * com.yihucha.hbyhc.presentation.integral.model
+ */
+public class RedIntegralListBean {
+
+    @SerializedName("id")
+    private String id;
+    @SerializedName("mark")
+    private String mark;
+    @SerializedName("reward_socre")
+    private String rewardSocre;
+    @SerializedName("pm")
+    private String pm;
+    @SerializedName("create_time")
+    private String createTime;
+    @SerializedName("order_id")
+    private String orderId;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public void setMark(String mark) {
+        this.mark = mark;
+    }
+
+    public String getRewardSocre() {
+        return rewardSocre;
+    }
+
+    public void setRewardSocre(String rewardSocre) {
+        this.rewardSocre = rewardSocre;
+    }
+
+    public String getPm() {
+        return pm;
+    }
+
+    public void setPm(String pm) {
+        this.pm = pm;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+}

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

@@ -17,6 +17,7 @@ import com.yihucha.hbyhc.network.request_bean.ClassifyImgesListRequest;
 import com.yihucha.hbyhc.network.request_bean.GenerateImagesRequest;
 import com.yihucha.hbyhc.network.request_bean.SpreadNumberRequest;
 import com.yihucha.hbyhc.network.service.UserService;
+import com.yihucha.hbyhc.presentation.integral.model.RedIntegralListBean;
 import com.yihucha.hbyhc.presentation.invitation.model.AccumulatedincomeBean;
 import com.yihucha.hbyhc.presentation.invitation.model.InviteFriendsClassifyBean;
 import com.yihucha.hbyhc.presentation.invitation.model.InviteFriendsPicBean;
@@ -51,6 +52,7 @@ import java.util.Map;
  * note:
  */
 public class InviteViewModel extends BaseViewModel {
+    public MutableLiveData<List<RedIntegralListBean>> redIntegralListBean = new MutableLiveData<>();//红积分收入、支出
     public MutableLiveData<UserInfoModel> userModel = new MutableLiveData<>();//用户资料
 
     public MutableLiveData<InviteJavaBean> mInviteJavaData = new MutableLiveData<>();//java我的邀请数据
@@ -657,6 +659,33 @@ public class InviteViewModel extends BaseViewModel {
     }
 
     /**
+     * 红积分收入、支出列表
+     */
+    @SuppressLint("CheckResult")
+    public void getRedIntegralList(int page,int limit,int pm) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("pm",pm);
+        map.put("page",page);
+        map.put("limit",limit);
+        UserService userService = NetworkApi.createService(UserService.class);
+        userService.getRedIntegralBean(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<List<RedIntegralListBean>>>() {
+            @Override
+            public void onSuccess(DataResponse<List<RedIntegralListBean>> response) {
+                if (response.responseCode == 200) {
+                    redIntegralListBean.postValue(response.getData());
+                }else {
+                    failed.postValue("getRedIntegralList");
+                }
+            }
+
+            @Override
+            public void onFailure(Throwable e) {
+                failed.postValue("getRedIntegralList");
+            }
+        }));
+    }
+
+    /**
      * 检测用户年费状态
      */
 //    public void getAccountServiceFee() {

app/src/main/java/com/yihucha/hbyhc/presentation/mine/MineFragment.java

@@ -19,6 +19,7 @@ import com.yihucha.hbyhc.config.HttpUrl;
 import com.yihucha.hbyhc.databinding.FragmentMineBinding;
 import com.yihucha.hbyhc.presentation.annuity.AnnuityActivity;
 import com.yihucha.hbyhc.presentation.integral.MyIntegralActivity;
+import com.yihucha.hbyhc.presentation.integral.NewRedIntegralActivity;
 import com.yihucha.hbyhc.presentation.integral.RedIntegralActivity;
 import com.yihucha.hbyhc.presentation.invitation.InviteFriendsActivity;
 import com.yihucha.hbyhc.presentation.invitation.MyInvitationActivity;
@@ -26,6 +27,7 @@ import com.yihucha.hbyhc.presentation.mine.model.MyInvitationBean;
 import com.yihucha.hbyhc.presentation.mine.model.OrderQuantityBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
 import com.yihucha.hbyhc.presentation.mine.model.YanglaojinBean;
+import com.yihucha.hbyhc.presentation.mine.view_model.MineSpreadInfo;
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel;
 import com.yihucha.hbyhc.presentation.order.AfterSalesOrderListActivity;
 import com.yihucha.hbyhc.presentation.order.OrderActivity;
@@ -65,7 +67,6 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
         initClick();
         return root;
     }
-
     private void initData() {
         if (!"".equals(MVUtils.getString(Constants.TOKEN))) {
             //用户信息
@@ -284,8 +285,8 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
 //            MyInvitationActivity.launch(getActivity());
             MyCommissionActivity.launch(getActivity());
         } else if (view == binding.tvMineLjf) {
-            //绿积分
-            MyIntegralActivity.launch(getActivity());
+            //绿积分  原红积分页面
+            NewRedIntegralActivity.launch(getActivity());
         } else if (view == binding.llConnectUs) {
 
             String appId = "wxbf753066ac8686ba";

app/src/main/java/com/yihucha/hbyhc/presentation/pay/PayActivity.java

@@ -130,6 +130,7 @@ public class PayActivity extends ViewBindingTitleBaseActivity<ActivityPayBinding
 
     private void initClick() {
         mViewBinding.ivWx.setOnClickListener(this);
+        mViewBinding.ivFrendsPay.setOnClickListener(this);
         mViewBinding.ivZfb.setOnClickListener(this);
         mViewBinding.tvImmediatePayment.setOnClickListener(this);
     }
@@ -144,11 +145,19 @@ public class PayActivity extends ViewBindingTitleBaseActivity<ActivityPayBinding
         if (v == mViewBinding.ivWx) {
             //点击微信
             mViewBinding.ivWx.setImageResource(R.mipmap.agreement_checked);
+            mViewBinding.ivFrendsPay.setImageResource(R.mipmap.agreement_unselected);
             mViewBinding.ivZfb.setImageResource(R.mipmap.agreement_unselected);
             mFlagPay = "1";
+        } else if (v == mViewBinding.ivFrendsPay) {
+            //好友代付
+            mViewBinding.ivFrendsPay.setImageResource(R.mipmap.agreement_checked);
+            mViewBinding.ivWx.setImageResource(R.mipmap.agreement_unselected);
+            mViewBinding.ivZfb.setImageResource(R.mipmap.agreement_unselected);
+            mFlagPay = "";
         } else if (v == mViewBinding.ivZfb) {
             //点击支付宝
             mViewBinding.ivWx.setImageResource(R.mipmap.agreement_unselected);
+            mViewBinding.ivFrendsPay.setImageResource(R.mipmap.agreement_unselected);
             mViewBinding.ivZfb.setImageResource(R.mipmap.agreement_checked);
             mFlagPay = "2";
         } else if (v == mViewBinding.tvImmediatePayment) {
@@ -156,12 +165,14 @@ public class PayActivity extends ViewBindingTitleBaseActivity<ActivityPayBinding
             //立即支付
             if (mFlagPay.equals("1")) {
                 payViewModel.getPayWx();
-            } else {
+            } else if (mFlagPay.equals("2")){
                 //支付宝支付
                 Map<String, Object> map = new HashMap<>();
                 map.put("oid", orderId);
                 map.put("type", "ALI");
                 payViewModel.getPay(map);
+            }else {
+                //好友代付
             }
         }
         super.onClick(v);

app/src/main/java/com/yihucha/hbyhc/presentation/pay/ShareFriendsPayActivity.kt

@@ -0,0 +1,12 @@
+package com.yihucha.hbyhc.presentation.pay
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
+import com.yihucha.hbyhc.databinding.ActivityShareFriendsPayBinding
+
+class ShareFriendsPayActivity : ViewBindingTitleBaseActivity<ActivityShareFriendsPayBinding>() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+}

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

@@ -108,6 +108,37 @@
             android:gravity="center_vertical"
             android:layout_marginRight="13dp"
             android:layout_marginLeft="13dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/icon_frends_pay"/>
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:textSize="15sp"
+                android:textColor="@color/black_333333"
+                android:text="好友代付"/>
+
+            <ImageView
+                android:id="@+id/iv_frends_pay"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="5dp"
+                android:src="@mipmap/agreement_unselected"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:gravity="center_vertical"
+            android:layout_marginRight="13dp"
+            android:layout_marginLeft="13dp"
             android:visibility="gone"
             android:orientation="horizontal">
 

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

@@ -0,0 +1,203 @@
+<?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_f8f8f8"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    tools:context=".presentation.integral.RedIntegralActivity">
+
+    <com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
+        android:id="@+id/refresh_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/scrollView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="16dp"
+                android:layout_below="@+id/imgv_top_bg">
+
+                <com.yihucha.hbyhc.view.RoundCornerImageView
+                    android:id="@+id/imgv_top_bg"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scaleType="centerCrop"
+                    android:src="@mipmap/bg_red_integral"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:rciv_radius="10dp" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingLeft="16dp"
+                    app:layout_constraintTop_toTopOf="@+id/imgv_top_bg"
+                    app:layout_constraintBottom_toBottomOf="@+id/imgv_top_bg"
+                    >
+
+                    <TextView
+                        android:id="@+id/tv_name_integral"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="30dp"
+                        android:text="红积分"
+                        android:textColor="@color/white"
+                        android:textSize="14sp" />
+
+                    <com.yihucha.hbyhc.view.BoldText
+                        android:id="@+id/tv_red_integral"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:ellipsize="end"
+                        android:text="0"
+                        android:textColor="@color/white"
+                        android:textSize="32sp" />
+                </LinearLayout>
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/layout_center_selector"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    app:layout_constraintTop_toBottomOf="@+id/imgv_top_bg">
+
+                    <com.yihucha.hbyhc.view.BoldText
+                        android:id="@+id/title_income"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:gravity="center"
+                        android:text="收入明细"
+                        android:textColor="@color/red_fe0032"
+                        android:textSize="15sp"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toLeftOf="@+id/title_pay"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <com.yihucha.hbyhc.view.BoldText
+                        android:id="@+id/title_pay"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="支出明细"
+                        android:textColor="@color/black_333333"
+                        android:textSize="15sp"
+                        app:layout_constraintLeft_toRightOf="@+id/title_income"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="@+id/title_income" />
+
+                    <View
+                        android:id="@+id/line_income"
+                        android:layout_width="0dp"
+                        android:layout_height="3dp"
+                        android:layout_marginLeft="60dp"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginRight="60dp"
+                        android:background="@color/red_fe0032"
+                        android:visibility="visible"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toLeftOf="@+id/line_pay"
+                        app:layout_constraintTop_toBottomOf="@+id/title_income" />
+
+                    <View
+                        android:id="@+id/line_pay"
+                        android:layout_width="0dp"
+                        android:layout_height="3dp"
+                        android:layout_marginLeft="60dp"
+                        android:layout_marginRight="60dp"
+                        android:background="@color/red_fe0032"
+                        android:visibility="invisible"
+                        app:layout_constraintLeft_toRightOf="@+id/line_income"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="@+id/line_income" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/lv_integral"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/layout_center_selector" />
+
+                <include
+                    android:id="@+id/layoutNoData"
+                    layout="@layout/search_not_found"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/layout_center_selector" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.core.widget.NestedScrollView>
+    </com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/layout_top_selector"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:visibility="invisible"
+        android:background="@color/white_f8f8f8"
+        >
+
+        <com.yihucha.hbyhc.view.BoldText
+            android:id="@+id/title_income_top"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:text="收入明细"
+            android:textColor="@color/red_fe0032"
+            android:textSize="15sp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/title_pay_top"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.yihucha.hbyhc.view.BoldText
+            android:id="@+id/title_pay_top"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="支出明细"
+            android:textColor="@color/black_333333"
+            android:textSize="15sp"
+            app:layout_constraintLeft_toRightOf="@+id/title_income_top"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/title_income_top" />
+
+        <View
+            android:id="@+id/line_income_top"
+            android:layout_width="0dp"
+            android:layout_height="3dp"
+            android:layout_marginLeft="60dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="60dp"
+            android:background="@color/red_fe0032"
+            android:visibility="visible"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/line_pay_top"
+            app:layout_constraintTop_toBottomOf="@+id/title_income_top" />
+
+        <View
+            android:id="@+id/line_pay_top"
+            android:layout_width="0dp"
+            android:layout_height="3dp"
+            android:layout_marginLeft="60dp"
+            android:layout_marginRight="60dp"
+            android:background="@color/red_fe0032"
+            android:visibility="invisible"
+            app:layout_constraintLeft_toRightOf="@+id/line_income_top"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/line_income_top" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>

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

@@ -0,0 +1,9 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".presentation.pay.ShareFriendsPayActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,60 @@
+<?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="80dp"
+    android:background="@color/white"
+    android:orientation="horizontal"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/tv_integral"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginRight="8dp"
+        android:gravity="center"
+        android:text="22222222"
+        android:textColor="@color/black_333333"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_description"
+        app:layout_constraintRight_toLeftOf="@+id/imgv_jiantou"
+        app:layout_constraintTop_toTopOf="@+id/tv_description" />
+
+    <TextView
+        android:id="@+id/tv_description"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_gravity="center_vertical"
+        android:gravity="center_vertical"
+        android:text="1111111111111111111"
+        android:textColor="@color/black"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toTopOf="@+id/tv_time"
+        app:layout_constraintHorizontal_weight="1"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/tv_integral"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/imgv_jiantou"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/order_store_entry_220624"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_description"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_description" />
+
+    <TextView
+        android:id="@+id/tv_time"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_gravity="center_vertical"
+        android:gravity="center"
+        android:text="2222222222222222222222222"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_description"
+        app:layout_constraintTop_toBottomOf="@+id/tv_description" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>