补缴单查询

app/release/output-metadata.json

@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 10,
-      "versionName": "1.3.3",
-      "outputFile": "jz_app_v1.3.3_release_0430.apk"
+      "versionCode": 11,
+      "versionName": "1.3.4",
+      "outputFile": "jz_app_v1.3.4_release_0519.apk"
     }
   ]
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java

@@ -251,8 +251,13 @@ public class MyRetrofit implements ToastAction {
         linkedTreeMap.put("opId", MyShared.getInstance().get(MyShared.OPENID, ""));
         linkedTreeMap.put("staffId", MyShared.getInstance().get(MyShared.STAFFID, ""));
         linkedTreeMap.put("terminalId", "999999999999");
-        Log.i("querybean", JSONObject.toJSONString(linkedTreeMap) + "~~ifcode~" + code);
 //        RequestParameters parameters = new RequestParameters(code, new Gson().toJson(linkedTreeMap));
+//        if (code.equals(IFCode.IFCODE148)){
+//            linkedTreeMap.put("agentId", "123");
+//            linkedTreeMap.put("channelId", "123");
+//            linkedTreeMap.put("openId", "123");
+//        }
+        Log.i("querybean", JSONObject.toJSONString(linkedTreeMap) + "~~ifcode~" + code);
         String loadHint = "加载中...";
         //通过IFCODE
         if (context != null) {
@@ -261,7 +266,7 @@ public class MyRetrofit implements ToastAction {
         //加密
 //        parameters.setBizContent(SM4Utils.encryptCBC(parameters.getBizContent(), SM4_KEY));
         new MyRetrofit().getRetrofitGZ(code).create(Api.class)
-                .message3GZ(linkedTreeMap)
+                .message2GZ(linkedTreeMap)
                 .enqueue(new ConverterGZ<Result>(context, start, false, loadHint) {
                     @Override
                     protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/EnumBean.java

@@ -487,6 +487,13 @@ public class EnumBean {
             Add("1","是"),
     };
 
+    //补缴单状态 0-未补缴，1-已补缴，2-已关闭
+    public static EnumBean[] ARREARSSTATUS = {
+            Add("0","未补缴"),
+            Add("1","已补缴"),
+            Add("2","已关闭"),
+    };
+
     //MIME类型
     public static EnumBean[] MIME_TYPE = {
             Add("3gp","video/3gpp"),

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/IFCode.java

@@ -350,5 +350,8 @@ public class IFCode {
     public static final String IFCODE_VEHICLE_INFO_QUERY = "iaw/aftersale/vehicleInformationChange/vehicleView";//车辆信息查询new
     public static final String IFCODE_COMPUTE_VEHICLE_TYPE = "iaw/aftersale/vehicleInformationChange/vehicleTypeCount";//收费车型计算
 
+    public static final String IFCODE_ARREARS_APPLY_QUERY = "iaw/api/afterSale/reimburse/page";//补缴申请单查询
+    public static final String IFCODE_ARREARS_DETAIL = "iaw/api/afterSale/reimburse/view";//补缴申请单详情
+
 
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/ResultBean.java

@@ -395,6 +395,9 @@ public class ResultBean<T> {
         private int isTransfer;
         public int transfer;
         public String adress;
+        public String payOrderId;
+        public String reimburseStatus;
+        public long reimburseFee;
         public String newType;
         public String etcUser;
         public String eventOccurrenceDate;

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/ETCHandleSonActivity.java

@@ -88,11 +88,9 @@ public class ETCHandleSonActivity extends AppActivity {
                 LinkedTreeMap<String,Object> data = JSONObject.parseObject(resultBean.getData().toString(),LinkedTreeMap.class);
                 ResultBean.BizContent bizContent = JSONObject.parseObject(JSONObject.toJSONString(data.get("data")), ResultBean.BizContent.class);
                 binding.text1.setText(bizContent.getProductName());
-                if (null!=biz.product){
-                    binding.text3.setText(bizContent.product.productMsg);
-                    binding.text4.setText(bizContent.product.fee * 0.01 + "");
-                    binding.text5.setText("￥" + bizContent.product.fee * 0.01);
-                }
+//                    binding.text3.setText(bizContent.product.productMsg);
+                    binding.text4.setText(null!=bizContent.getAmount() ? Long.parseLong(bizContent.getAmount()) * 0.01 + "":"0");
+                    binding.text5.setText("￥" +(null!=bizContent.getAmount() ? Long.parseLong(bizContent.getAmount()) * 0.01 + "":"0"));
 
                 Log.e("result11111", JSONObject.toJSONString(bizContent.singleEquity));
                 if (bizContent.multipleeEquity.size() > 0) {

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/arrearsquery/ArrearsQueryInfoActivity.java

@@ -7,8 +7,16 @@ import android.view.View;
 
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityArrearsQueryInfoBinding;
+import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit;
+import com.huntersun.vkyes.etcopencard.project.api.Result;
+import com.huntersun.vkyes.etcopencard.project.api.bean.EnumBean;
+import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
+import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
+import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 
+import java.util.HashMap;
+
 /**
   *
   * @ClassName:      ArrearsQueryInfoActivity
@@ -20,15 +28,47 @@ import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 public class ArrearsQueryInfoActivity extends AppActivity {
 
     private ActivityArrearsQueryInfoBinding binding;
+    private String orderId;
 
     @Override
     protected View getLayoutView() {
+        binding = ActivityArrearsQueryInfoBinding.inflate(getLayoutInflater());
         return binding.getRoot();
     }
 
     @Override
     protected void initView() {
+        orderId = getIntent().getStringExtra("orderId");
+        getData();
+    }
+
+    private void getData() {
+        HashMap<String,String> params = new HashMap<>();
+        params.put("orderId",orderId);
+        MyRetrofit.newInstanceGZ(this, IFCode.IFCODE_ARREARS_DETAIL, params, new MyRetrofit.ReturnResult() {
+            @Override
+            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                if (null != bizContent.order){
+                    binding.tvUsername.setText(bizContent.order.userName);
+                    binding.tvArrearsPlateNum.setText(bizContent.order.vehicleId.split("_")[0]);
+                    binding.tvArrearsPayOrder.setText(bizContent.order.payOrderId);
+                    binding.tvAllMoney.setText(FunHelper.changeF2Y(bizContent.order.reimburseFee));
+                    binding.tvArrearsStatus.setText(EnumBean.backValue(bizContent.order.reimburseStatus,EnumBean.ARREARSSTATUS));
+                    binding.tvArrearsNum.setText(bizContent.order.listNo);
+                    binding.tvStationIn.setText(bizContent.order.enStationName);
+                    binding.tvStationInTime.setText(bizContent.order.enTime);
+                    binding.tvStationOut.setText(bizContent.order.exStationName);
+                    binding.tvStationOutTime.setText(bizContent.order.exTime);
+                    binding.tvRunMoney.setText(null != bizContent.order.fee ? FunHelper.changeF2Y(Long.parseLong(bizContent.order.fee)) : "0");
+                    binding.tvArrearsMoney.setText(FunHelper.changeF2Y(bizContent.order.reimburseFee));
+                }
+            }
 
+            @Override
+            public void onError(Result resp) {
+                MyRetrofit.ReturnResult.super.onError(resp);
+            }
+        });
     }
 
     @Override

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/arrearsquery/ArrearsQueryInputActivity.java

@@ -1,9 +1,40 @@
 package com.huntersun.vkyes.etcopencard.project.ui.activity.after.arrearsquery;
 
+import android.content.Intent;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
+import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.alibaba.fastjson.JSONObject;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.google.gson.internal.LinkedTreeMap;
+import com.huntersun.vky.obublelib.util.ToastUtil;
+import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityArrearsQueryStep1Binding;
+import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit;
+import com.huntersun.vkyes.etcopencard.project.api.Result;
+import com.huntersun.vkyes.etcopencard.project.api.bean.EnumBean;
+import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
+import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
+import com.huntersun.vkyes.etcopencard.project.dialog.EnumListDialog;
+import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
+import com.huntersun.vkyes.etcopencard.project.view.CommonItemDecoration;
+import com.huntersun.vkyes.etcopencard.project.view.KeyboardUtil;
+import com.huntersun.vkyes.etcopencard.src.action.StatusAction;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+import com.huntersun.vkyes.etcopencard.src.widget.StatusLayout;
+import com.scwang.smart.refresh.layout.api.RefreshLayout;
+import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 /**
   *
@@ -13,9 +44,15 @@ import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
   * @CreateDate:     2025/5/12 11:06
   */
 
-public class ArrearsQueryInputActivity extends AppActivity {
+public class ArrearsQueryInputActivity extends AppActivity implements OnRefreshLoadMoreListener, StatusAction {
 
     private ActivityArrearsQueryStep1Binding binding;
+    private int pageNo = 1;
+    private int pageSize = 10;
+    private List<ResultBean.BizContent> arrearsList;
+    private String plateColor = "";
+    private KeyboardUtil keyboardUtil = null;
+    private String arrearsStatus = "0";//补缴单状态 0-未补缴，1-已补缴，2-已关闭
 
     @Override
     protected View getLayoutView() {
@@ -25,11 +62,161 @@ public class ArrearsQueryInputActivity extends AppActivity {
 
     @Override
     protected void initView() {
+        binding.refresh.setOnRefreshLoadMoreListener(this);
+        arrearsList = new ArrayList<>();
+        keyboardUtil = new KeyboardUtil(ArrearsQueryInputActivity.this, binding.etPlateNum);
+        keyboardUtil.hideSysKeyboard(binding.etPlateNum);
+        binding.tvArrearsStatus.setText(EnumBean.backValue(arrearsStatus,EnumBean.ARREARSSTATUS));
+        initRecyclerview();
+        initClick();
+    }
+
+    private void initClick() {
+        binding.btnQuery.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                binding.lyContent.requestFocus();
+                pageNo = 1;
+                getData();
+            }
+        });
+
+        binding.tvPlateColor.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                binding.lyContent.requestFocus();
+                EnumListDialog.showEnumListSingleDialog(ArrearsQueryInputActivity.this, EnumBean.VEHICLE_COLOR, new EnumListDialog.OnResultCallback() {
+                    @Override
+                    public void onResultCallback(String code, String name) {
+                        plateColor = code;
+                        binding.tvPlateColor.setText(name);
+                    }
+                });
+            }
+        });
+
+        binding.tvArrearsStatus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                binding.lyContent.requestFocus();
+                EnumListDialog.showEnumListSingleDialog(ArrearsQueryInputActivity.this, EnumBean.ARREARSSTATUS, new EnumListDialog.OnResultCallback() {
+                    @Override
+                    public void onResultCallback(String code, String name) {
+                        arrearsStatus = code;
+                        binding.tvArrearsStatus.setText(name);
+                    }
+                });
+            }
+        });
+
+        binding.etPlateNum.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View view, boolean b) {
+                if (b){
+                    keyboardUtil.hideSoftInputMethod();
+                    keyboardUtil.showKeyboard();
+                }else {
+                    keyboardUtil.hideKeyboard();
+                }
+            }
+        });
+
+    }
+
+    private void getData() {
+        if (pageNo == 1 && arrearsList.size()>0){
+            arrearsList.clear();
+        }
+        if (!TextUtils.isEmpty(binding.etPlateNum.getText().toString().trim())){
+            if (binding.tvPlateColor.getText().toString().isEmpty()){
+                ToastUtil.showS(this,"请选择车牌颜色");
+                return;
+            }
+        }
+        HashMap<String,String> params = new HashMap<>();
+        params.put("userName",binding.etUsername.getText().toString().trim());
+        params.put("vehicleId",binding.etPlateNum.getText().toString().trim()+"_"+plateColor);
+        params.put("reimburseStatus",arrearsStatus);
+        params.put("payOrderId",binding.etPayOrderNum.getText().toString().trim());
+        params.put("listNo",binding.etArrearsOrder.getText().toString().trim());
+        params.put("pageNo",pageNo+"");
+        params.put("pageSize",pageSize+"");
+        MyRetrofit.newInstanceGZ(this, true,IFCode.IFCODE_ARREARS_APPLY_QUERY, params, new MyRetrofit.ReturnResult() {
+            @Override
+            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                LinkedTreeMap<String,Object> linkedTreeMap = JSONObject.parseObject(resultBean.getData().toString(),LinkedTreeMap.class);
+                List<ResultBean.BizContent> result = JSONObject.parseArray(linkedTreeMap.get("result").toString(), ResultBean.BizContent.class);
+                if (result.size()>0){
+                    if (arrearsList.size() < Integer.parseInt(linkedTreeMap.get("totalCount").toString())){
+                        arrearsList.addAll(result);
+                        adapter.replaceData(arrearsList);
+                    }
+                }
+                if (arrearsList.size() == 0){
+                    showEmpty();
+                }else {
+                    showComplete();
+                }
+                binding.refresh.finishRefresh();
+                binding.refresh.finishLoadMore();
+            }
+
+            @Override
+            public void onError(Result resp) {
+                binding.refresh.finishRefresh();
+                binding.refresh.finishLoadMore();
+            }
+        });
+    }
 
+    private void initRecyclerview() {
+        LinearLayoutManager layoutManager = new LinearLayoutManager(this, RecyclerView.VERTICAL,false);
+        CommonItemDecoration itemDecoration = new CommonItemDecoration(0,40,40,40,40,40);
+        binding.recycler.setLayoutManager(layoutManager);
+        binding.recycler.addItemDecoration(itemDecoration);
+        binding.recycler.setAdapter(adapter);
+        adapter.setNewData(arrearsList);
     }
 
     @Override
     protected void initData() {
 
     }
+
+    @Override
+    public StatusLayout getStatusLayout() {
+        return binding.statusLayout;
+    }
+
+    @Override
+    public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
+        pageNo++;
+        getData();
+    }
+
+    @Override
+    public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+        pageNo = 1;
+        getData();
+    }
+
+    private BaseQuickAdapter<ResultBean.BizContent, BaseViewHolder> adapter = new BaseQuickAdapter<ResultBean.BizContent, BaseViewHolder>(R.layout.item_arrears_1_layout) {
+        @Override
+        protected void convert(@NonNull BaseViewHolder holder, ResultBean.BizContent bizContent) {
+            holder.setText(R.id.tv_name,bizContent.userName);
+            holder.setText(R.id.tv_plateNum,bizContent.vehicleId.split("_")[0]);
+            holder.setText(R.id.tv_arrears_money, FunHelper.changeF2Y(bizContent.reimburseFee));
+            holder.setText(R.id.tv_arrears_reason,bizContent.getReason());
+            holder.getView(R.id.tv_detail).setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Log.e("订单号:::::",bizContent.getId());
+                    Intent intent = new Intent();
+                    intent.setClass(ArrearsQueryInputActivity.this,ArrearsQueryInfoActivity.class);
+                    intent.putExtra("orderId",bizContent.getId());
+                    startActivity(intent);
+                }
+            });
+        }
+    };
 }

app/src/main/res/layout-v2/fragment_home_four.xml

@@ -108,7 +108,7 @@
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:visibility="invisible"
+        android:visibility="visible"
         android:layout_margin="@dimen/dp_20"
         android:id="@+id/btn_test"
         android:background="@color/green01"

app/src/main/res/layout-v5/item_equity_1.xml

@@ -5,7 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     app:background_normal="@color/white"
     app:corner_radius="@dimen/dp_10"
-    android:paddingBottom="@dimen/dp_5"
     android:paddingRight="@dimen/dp_5"
     android:layout_height="wrap_content">
     <com.ruffian.library.widget.RRelativeLayout
@@ -18,7 +17,7 @@
             android:padding="@dimen/dp_8"
             android:layout_marginRight="@dimen/dp_15"
             android:layout_marginLeft="@dimen/dp_15"
-            android:layout_marginBottom="@dimen/dp_15"
+            android:layout_marginBottom="@dimen/dp_5"
             android:layout_marginTop="@dimen/dp_5"
             android:gravity="center"
             android:layout_alignTop="@+id/equity_title"
@@ -46,7 +45,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             tools:text="64停车卷"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/sp_15"
             android:textColor="@color/black"
             android:layout_toRightOf="@+id/img_dash"
             android:layout_marginLeft="@dimen/dp_15"
@@ -56,19 +55,20 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignLeft="@+id/equity_title"
-            android:layout_marginTop="@dimen/dp_5"
             android:layout_below="@+id/equity_title"
-            android:textSize="@dimen/sp_16"
+            android:textSize="@dimen/sp_12"
             android:textColor="@color/black"
             android:id="@+id/tv_money_icon"
+            android:visibility="invisible"
             tools:text="￥"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toRightOf="@+id/tv_money_icon"
             android:layout_alignTop="@+id/tv_money_icon"
-            android:textSize="@dimen/sp_16"
+            android:textSize="@dimen/sp_12"
             android:textColor="@color/black"
+            android:visibility="invisible"
             android:id="@+id/tv_money_num"
             tools:text="44.00"/>
         <TextView
@@ -76,9 +76,10 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@+id/equity_title"
             android:layout_below="@+id/tv_money_icon"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/sp_12"
             android:textColor="@color/black"
             android:id="@+id/tv_productIntro"
+            android:visibility="invisible"
             tools:text="44.00"/>
         <com.ruffian.library.widget.RTextView
             android:layout_width="wrap_content"

app/src/main/res/layout-v5/item_euqity_2.xml

@@ -79,6 +79,7 @@
                 android:layout_below="@+id/equity_title"
                 android:textSize="@dimen/sp_16"
                 android:textColor="@color/black"
+                android:visibility="invisible"
                 android:id="@+id/tv_money_icon"
                 android:text="￥"/>
             <TextView
@@ -88,6 +89,7 @@
                 android:layout_alignTop="@+id/tv_money_icon"
                 android:textSize="@dimen/sp_16"
                 android:id="@+id/tv_money_num"
+                android:visibility="invisible"
                 android:textColor="@color/black"
                 android:text="44.00"/>
             <TextView

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

@@ -1,9 +1,208 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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/background_color"
+    android:orientation="vertical"
     tools:context=".project.ui.activity.after.arrearsquery.ArrearsQueryInfoActivity">
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <com.hjq.bar.TitleBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:id="@+id/title"
+        app:leftIcon="@mipmap/back_black"
+        app:lineVisible="false"
+        app:title="补缴单详情"
+        app:titleColor="@color/black" />
+    <com.ruffian.library.widget.RLinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/dp_15"
+        android:padding="@dimen/dp_15"
+        app:background_normal="@color/white"
+        app:corner_radius="@dimen/dp_10"
+        android:orientation="vertical">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="用户姓名:"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dp_5"
+                android:id="@+id/tv_username"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="车牌号码:"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dp_5"
+                android:id="@+id/tv_arrears_plateNum"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="支付单号:"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dp_5"
+                android:id="@+id/tv_arrears_payOrder"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="总金额:"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dp_5"
+                android:id="@+id/tv_all_money"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="补缴状态:"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dp_5"
+                android:id="@+id/tv_arrears_status"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="流水编号:"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dp_5"
+                android:id="@+id/tv_arrears_num"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="入站名称:"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dp_5"
+                android:id="@+id/tv_station_in"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="入站时间:"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dp_5"
+                android:id="@+id/tv_station_inTime"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="出站名称:"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dp_5"
+                android:id="@+id/tv_station_out"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="出站时间:"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dp_5"
+                android:id="@+id/tv_station_outTime"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="通行金额:"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dp_5"
+                android:id="@+id/tv_run_money"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="补缴金额:"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/dp_5"
+                android:id="@+id/tv_arrears_money"/>
+        </LinearLayout>
+    </com.ruffian.library.widget.RLinearLayout>
+</LinearLayout>

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

@@ -1,9 +1,273 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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=".project.ui.activity.after.arrearsquery.ArrearsQueryInputActivity">
+    android:layout_height="match_parent">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/background_color"
+        android:focusableInTouchMode="true"
+        android:id="@+id/ly_content"
+        android:orientation="vertical"
+        tools:context=".project.ui.activity.after.arrearsquery.ArrearsQueryInputActivity">
+
+        <com.hjq.bar.TitleBar
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:leftIcon="@mipmap/back_black"
+            app:lineVisible="false"
+            app:title="补缴单查询"
+            app:titleColor="@color/black" />
+
+
+        <LinearLayout
+            android:id="@+id/ly_idnum"
+            style="@style/MatchWrap.Vertical"
+            android:layout_below="@+id/title"
+            android:layout_marginHorizontal="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_15"
+            android:background="@drawable/bg_white_radius"
+            android:padding="@dimen/dp_8">
+
+            <LinearLayout
+                style="@style/MatchWrap.Horizontal"
+                android:background="#FFFFFF"
+                android:minHeight="@dimen/dp_45">
+
+                <TextView
+                    android:layout_width="@dimen/dp_80"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:text="用户姓名"
+                    android:textSize="@dimen/sp_14" />
+
+                <com.hjq.widget.view.ClearEditText
+                    android:id="@+id/et_username"
+                    style="@style/EditTextStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:drawablePadding="@dimen/dp_15"
+                    android:hint="请输入用户姓名"
+                    android:minHeight="@dimen/dp_45"
+                    android:singleLine="false" />
+
+            </LinearLayout>
+
+            <TextView style="@style/MatchOne.HorLine" />
+
+            <LinearLayout
+                style="@style/MatchWrap.Horizontal"
+                android:background="#FFFFFF"
+                android:gravity="center_vertical"
+                android:minHeight="@dimen/dp_45">
+
+                <TextView
+                    android:layout_width="@dimen/dp_80"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:text="车牌号码"
+                    android:textSize="@dimen/sp_14" />
+
+                <com.hjq.widget.view.ClearEditText
+                    android:id="@+id/et_plateNum"
+                    style="@style/EditTextStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/white"
+                    android:drawablePadding="@dimen/dp_15"
+                    android:gravity="center_vertical"
+                    android:hint="请输入车牌号码"
+                    android:minWidth="@dimen/dp_45"
+                    android:singleLine="false" />
+            </LinearLayout>
+
+            <TextView style="@style/MatchOne.HorLine" />
+
+            <LinearLayout
+                style="@style/MatchWrap.Horizontal"
+                android:background="#FFFFFF"
+                android:gravity="center_vertical"
+                android:minHeight="@dimen/dp_45">
+
+                <TextView
+                    android:layout_width="@dimen/dp_80"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:text="车牌颜色"
+                    android:textSize="@dimen/sp_14" />
+
+                <TextView
+                    android:id="@+id/tv_plate_color"
+                    style="@style/EditTextStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/white"
+                    android:drawablePadding="@dimen/dp_15"
+                    android:gravity="center_vertical"
+                    android:hint="请选择车牌颜色"
+                    android:minWidth="@dimen/dp_45"
+                    android:singleLine="false" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/ic_next_gray" />
+            </LinearLayout>
+
+            <TextView style="@style/MatchOne.HorLine" />
+
+            <LinearLayout
+                style="@style/MatchWrap.Horizontal"
+                android:background="#FFFFFF"
+                android:gravity="center_vertical"
+                android:minHeight="@dimen/dp_45">
+
+                <TextView
+                    android:layout_width="@dimen/dp_80"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:text="流水编号"
+                    android:textSize="@dimen/sp_14" />
+
+                <com.hjq.widget.view.ClearEditText
+                    android:id="@+id/et_arrears_order"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/white"
+                    android:drawablePadding="@dimen/dp_15"
+                    android:gravity="center_vertical"
+                    android:hint="请输入流水编号"
+                    android:minWidth="@dimen/dp_45"
+                    android:padding="@dimen/dp_10"
+                    android:paddingHorizontal="@dimen/dp_20"
+                    android:singleLine="false"
+                    android:textColor="@color/gray03" />
+            </LinearLayout>
+
+            <TextView style="@style/MatchOne.HorLine" />
+
+            <LinearLayout
+                style="@style/MatchWrap.Horizontal"
+                android:background="#FFFFFF"
+                android:gravity="center_vertical"
+                android:minHeight="@dimen/dp_45">
+
+                <TextView
+                    android:layout_width="@dimen/dp_80"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:text="支付单号"
+                    android:textSize="@dimen/sp_14" />
+
+                <com.hjq.widget.view.ClearEditText
+                    android:id="@+id/et_pay_orderNum"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/white"
+                    android:drawablePadding="@dimen/dp_15"
+                    android:gravity="center_vertical"
+                    android:hint="请输入支付单号"
+                    android:minWidth="@dimen/dp_45"
+                    android:padding="@dimen/dp_10"
+                    android:paddingHorizontal="@dimen/dp_20"
+                    android:singleLine="false"
+                    android:textColor="@color/gray03" />
+            </LinearLayout>
+
+            <TextView style="@style/MatchOne.HorLine" />
+
+            <LinearLayout
+                style="@style/MatchWrap.Horizontal"
+                android:background="#FFFFFF"
+                android:gravity="center_vertical"
+                android:minHeight="@dimen/dp_45">
+
+                <TextView
+                    android:layout_width="@dimen/dp_80"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:text="补缴状态"
+                    android:textSize="@dimen/sp_14" />
+
+                <TextView
+                    android:id="@+id/tv_arrears_status"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@color/white"
+                    android:drawablePadding="@dimen/dp_15"
+                    android:gravity="center_vertical"
+                    android:hint="请选择补缴状态"
+                    android:minWidth="@dimen/dp_45"
+                    android:padding="@dimen/dp_10"
+                    android:paddingHorizontal="@dimen/dp_20"
+                    android:singleLine="false"
+                    android:textColor="@color/black" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/ic_next_gray" />
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/btn_query"
+                style="@style/BtnShortStyle"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_40"
+                android:layout_below="@+id/ly_idnum"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center"
+                android:layout_marginTop="@dimen/dp_10"
+                android:gravity="center"
+                android:text="查询"
+                android:textSize="@dimen/sp_14" />
+        </LinearLayout>
+
+        <com.scwang.smart.refresh.layout.SmartRefreshLayout
+            android:id="@+id/refresh"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:srlEnableAutoLoadMore="true">
+
+            <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
+                android:id="@+id/status_layout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+            </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
+        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+    </LinearLayout>
+
+    <android.inputmethodservice.KeyboardView
+        android:id="@+id/keyboard_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom"
+        android:background="#DCDCDC"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:keyBackground="@drawable/selector_key"
+        android:keyTextColor="#000"
+        android:keyTextSize="18sp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:shadowColor="#FFFFFF"
+        android:shadowRadius="0.0"
+        android:visibility="gone" />
+</FrameLayout>

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

@@ -331,6 +331,7 @@
                     android:text="【客车】微信车主服务"
                     android:textColor="@color/white"
                     android:layout_marginLeft="@dimen/dp_7"
+                    android:layout_marginTop="@dimen/dp_8"
                     android:id="@+id/text1"/>
 <!--                <TextView-->
 <!--                    android:layout_width="wrap_content"-->
@@ -348,6 +349,7 @@
                     android:textSize="@dimen/sp_10"
                     android:layout_below="@id/text1"
                     android:layout_alignLeft="@+id/text1"
+                    android:visibility="gone"
                     android:layout_marginTop="@dimen/dp_5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -558,10 +560,12 @@
                     style="@style/VerticalLineStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="1dp"
+                    android:visibility="gone"
                     android:layout_marginHorizontal="@dimen/dp_10" />
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_44"
+                    android:visibility="gone"
                     android:gravity="center_vertical">
 
                     <TextView
@@ -617,6 +621,7 @@
                     style="@style/VerticalLineStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="1dp"
+                    android:visibility="gone"
                     android:layout_marginHorizontal="@dimen/dp_10" />
 
                 <LinearLayout

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

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.ruffian.library.widget.RLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    app:background_normal="@color/white"
+    app:corner_radius="@dimen/dp_10"
+    android:padding="@dimen/dp_10"
+    android:layout_height="wrap_content">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_5"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="用户姓名:"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/dp_5"
+            android:id="@+id/tv_name"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_5"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="车牌号码:"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/dp_5"
+            android:id="@+id/tv_plateNum"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_5"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="补缴金额:"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/dp_5"
+            android:id="@+id/tv_arrears_money"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_5"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="补缴原因:"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/dp_5"
+            android:id="@+id/tv_arrears_reason"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_5"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textColor="@color/blue01"
+            android:id="@+id/tv_detail"
+            android:text="查看详情"/>
+        <ImageView
+            android:layout_width="@dimen/dp_14"
+            android:layout_height="@dimen/dp_14"
+            android:src="@mipmap/icon_right_black"/>
+    </LinearLayout>
+</com.ruffian.library.widget.RLinearLayout>

common.gradle

@@ -9,8 +9,8 @@ android {
         // 目标适配版本
         //noinspection ExpiredTargetSdkVersion,OldTargetApi
         targetSdkVersion 30
-        versionName '1.3.3'
-        versionCode 10
+        versionName '1.3.4'
+        versionCode 11
         //当前线上版本 103 5
     }