订单功能逻辑调整,2023.4.19 9:20

app/src/main/AndroidManifest.xml

@@ -75,13 +75,7 @@
         tools:ignore="AllowBackup,LockedOrientationActivity"
         tools:replace="android:allowBackup,android:supportsRtl,android:label"
         tools:targetApi="n">
-        <activity
-            android:name=".SignUpActivity"
-            android:exported="false">
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
-        </activity>
+
         <!-- 表示当前已经适配了分区存储 -->
         <meta-data
             android:name="ScopedStorage"
@@ -263,6 +257,12 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait"> <!-- 业务满意度评价 -->
         </activity>
+        <activity
+            android:name=".project.ui.activity.SignUpActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:exported="false"><!-- 支付方式签约 -->
+        </activity>
         <activity
             android:name=".project.ui.activity.evaluate.YWYServicePJActivity"
             android:exported="false"

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

@@ -5,8 +5,10 @@ import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.alibaba.fastjson.JSONObject;
 import com.blankj.utilcode.util.LogUtils;
 import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
 import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
 import com.huntersun.vkyes.etcopencard.project.api.bean.SendTheVerificationCodeBean;
@@ -90,7 +92,10 @@ public class MyRetrofit implements ToastAction {
     }
 
     public static void newInstance(Context context, Boolean start, String code, Object bean, ReturnResult result) {
-        RequestParameters parameters = new RequestParameters(code, new Gson().toJson(bean));
+        LinkedTreeMap<String,Object> linkedTreeMap = JSONObject.parseObject(new Gson().toJson(bean), LinkedTreeMap.class);
+        linkedTreeMap.put("openId",(String) MyShared.getInstance().get(MyShared.OPENID,""));
+        linkedTreeMap.put("loginSource","3e4b3a53cf0f4172b23dccd95d3e99a0");
+        RequestParameters parameters = new RequestParameters(code, new Gson().toJson(linkedTreeMap));
         String loadHint = "加载中...";
         //通过IFCODE
         if (context != null) {
@@ -154,6 +159,7 @@ public class MyRetrofit implements ToastAction {
         Interceptor headerInterceptor = chain -> {
             HttpUrl httpUrl = chain.request().url().newBuilder()
                     .addQueryParameter("signType", "MD5") //验签类型
+//                    .addQueryParameter("loginSource","3e4b3a53cf0f4172b23dccd95d3e99a0")
                     .build();
             /*添加响应头，以json的形式去传世数据*/
             Request build = chain.request()

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

@@ -18,11 +18,14 @@ public class RequestParameters {
     private final String encryptType = "NONE";
 //    private final String encryptType = "SM4";
     private final String signType = "MD5";
+
+
     private String sign;
     @SuppressLint("SimpleDateFormat")
     private final String timestamp = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss").format(new Date());
     private final String reqId = "12345";
     private String bizContent;
+//    private String loginSource = "3e4b3a53cf0f4172b23dccd95d3e99a0";
 
     public String getBizContent() {
         return bizContent;

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

@@ -0,0 +1,31 @@
+package com.huntersun.vkyes.etcopencard.project.api.bean;
+
+public class EquityBean {
+    private int image;
+    private String title;
+    private String money;
+
+    public int getImage() {
+        return image;
+    }
+
+    public void setImage(int image) {
+        this.image = image;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMoney() {
+        return money;
+    }
+
+    public void setMoney(String money) {
+        this.money = money;
+    }
+}

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

@@ -84,6 +84,7 @@ public class IFCode {
     public static final String IFCODE36 = "36"; //订单分页查询
     public static final String IFCODE530 = "530"; //订单分页查询
     public static final String IFCODE48 = "48"; //根据订单编号获取可选择产品信息
+    public static final String IFCODE_PRODUCTGET = "098bff3fc88e48bf9cafc3b5679b4d07";//产品查询
     public static final String IFCODE56 = "56"; //订单支付下单接口
     public static final String IFCODE57 = "57"; //订单支付结果查询接口
     public static final String IFCODE148 = "148"; //apk 版本查询接口

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

@@ -257,6 +257,7 @@ public class ResultBean<T> {
     }
 
     public static class BizContent<T> {
+        public String productSeriesId;
         public String registeredTime;//录入时间
         public boolean isSelected; //是否选中 （本地添加）
         public OrderInfoExt orderInfoExt;//额外信息
@@ -276,6 +277,7 @@ public class ResultBean<T> {
         public String status; //申请单状态 APPLY-申请中 AUDIT-审核中 CANCEL-已取消 END-结束
         public String applyType; //申请单类型
         public String damageMode; //0-人为损坏 1-自然损坏
+        public List<BizContent> csmsnProducts;//产品选择列表
         public List<BizContent> list; //申请单列表（更换ETC时使用）
         public List<BizContent> customers; //用户信息查询列表
         public List<BizContent> vehicles; //车辆信息查询列表

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

@@ -10,10 +10,13 @@ import android.widget.LinearLayout;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.blankj.utilcode.util.LogUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.google.gson.Gson;
+import com.google.gson.JsonParseException;
+import com.google.gson.internal.LinkedTreeMap;
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityEtchandleBinding;
 import com.huntersun.vkyes.etcopencard.project.api.Api;
@@ -35,6 +38,7 @@ import com.huntersun.vkyes.etcopencard.src.action.StatusAction;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 import com.huntersun.vkyes.etcopencard.src.widget.StatusLayout;
+import com.jeremyliao.liveeventbus.LiveEventBus;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 
@@ -54,8 +58,6 @@ import retrofit2.Response;
 public class ETCHandleActivity extends AppActivity implements OnRefreshLoadMoreListener, StatusAction {
     private ActivityEtchandleBinding binding;
 
-    private String orderId;
-
     @Override
     protected View getLayoutView() {
         binding = ActivityEtchandleBinding.inflate(getLayoutInflater());
@@ -64,9 +66,7 @@ public class ETCHandleActivity extends AppActivity implements OnRefreshLoadMoreL
 
     @Override
     protected void initView() {
-        orderId = getIntent().getStringExtra("orderId");
-
-        setTitle("订单支付");
+        setTitle("产品选择");
         CommonItemDecoration commonItemDecoration = new CommonItemDecoration(0,40,0,40,0,0);
         binding.recycler.addItemDecoration(commonItemDecoration);
         binding.recycler.setAdapter(adapter);
@@ -80,17 +80,23 @@ public class ETCHandleActivity extends AppActivity implements OnRefreshLoadMoreL
         //5.35.CSMSN-根据订单编号获取可选择产品信息
         FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
         fatherBean.bizContent = new SendTheVerificationCodeBean();
-        fatherBean.bizContent.setOrderId(orderId);
-        MyRetrofit.newInstance(true, IFCode.IFCODE48, fatherBean.bizContent, new MyRetrofit.ReturnResult() {
+        fatherBean.bizContent.setProductType(getIntent().getStringExtra("type"));
+        MyRetrofit.newInstance(true, IFCode.IFCODE_PRODUCTGET, fatherBean.bizContent, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-                List<ResultBean.BizContent> list =
-                        JSONArray.parseArray(resultBean.getBizContent() + "", ResultBean.BizContent.class);
-                if (list.size() == 0) {
-                    showEmpty();
-                } else {
-                    adapter.replaceData(list);
-                    showComplete();
+//                List<ResultBean.BizContent> list =
+//                        JSONArray.parseArray(resultBean.getBizContent() + "", ResultBean.BizContent.class);
+                try {
+                    LinkedTreeMap<String, Object> result = JSONObject.parseObject(resultBean.getBizContent().toString(), LinkedTreeMap.class);
+                    List<ResultBean.BizContent> list = JSONArray.parseArray(result.get("csmsnProducts").toString(), ResultBean.BizContent.class);
+                    if (list.size() == 0) {
+                        showEmpty();
+                    } else {
+                        adapter.replaceData(list);
+                        showComplete();
+                    }
+                }catch (JsonParseException e){
+                    toast(e);
                 }
             }
 
@@ -133,39 +139,108 @@ public class ETCHandleActivity extends AppActivity implements OnRefreshLoadMoreL
      * 订单产品选择接口
      */
     private void chooseProduct(ResultBean.BizContent items) {
-        showDialog("产品信息提交中...");
-        Map<String, String> params = new HashMap<>();
-        params.put("orderId", orderId);
-        params.put("productId", items.getId());
-        MyRetrofit.newInstance(IFCode.IFCODE914, params, new MyRetrofit.ReturnResult() {
-            @Override
-            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-                hideDialog();
+//        showDialog("产品信息提交中...");
+//        Map<String, String> params = new HashMap<>();
+//        params.put("orderId", orderId);
+//        params.put("productId", items.getId());
+//        MyRetrofit.newInstance(IFCode.IFCODE914, params, new MyRetrofit.ReturnResult() {
+//            @Override
+//            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+//                hideDialog();
                 gotoNextPage(items);
-            }
-
-            @Override
-            public void onError(Response<Result> resp) {
-                hideDialog();
-                new ConfirmDialog.Builder(ETCHandleActivity.this).setMsg(resp.body().errorMsg, "无法选择产品", "确定", "", R.mipmap.icon_lotgout_etc_hint, 0, true)
-                        .onClick(new ConfirmDialog.Result() {
-                            @Override
-                            public void confirm() {
-                            }
-                        }).show();
-            }
-        });
+//            }
+//
+//            @Override
+//            public void onError(Response<Result> resp) {
+//                hideDialog();
+//                new ConfirmDialog.Builder(ETCHandleActivity.this).setMsg(resp.body().errorMsg, "无法选择产品", "确定", "", R.mipmap.icon_lotgout_etc_hint, 0, true)
+//                        .onClick(new ConfirmDialog.Result() {
+//                            @Override
+//                            public void confirm() {
+//                            }
+//                        }).show();
+//            }
+//        });
     }
 
     private void gotoNextPage(ResultBean.BizContent items) {
-        Bundle bundle = new Bundle();
-        bundle.putString("bizContent", JSON.toJSONString(items));
-        bundle.putString("orderId", orderId);
-        if ("2".equals(items.getIsValueCard())) {//储值卡-无需签约
-            jumpToPage(ETCHandleSonActivity.class, bundle);
-        } else if ("1".equals(items.getIsValueCard())) {//记账卡-需要签约
-            jumpToPage(ContractActivity.class, bundle);
+        if (null!=getIntent().getStringExtra("orderId")
+                &&!("".equals(getIntent().getStringExtra("orderId")))){//是否已存在订单
+            ResultBean.BizContent biz = JSON.parseObject(getIntent().getStringExtra("bizContent"), ResultBean.BizContent.class);
+            Map<String, String> params = new HashMap<>();
+            params.put("orderId", getIntent().getStringExtra("orderId"));
+            params.put("productId", items.getId());
+            MyRetrofit.newInstance(IFCode.IFCODE914, params, new MyRetrofit.ReturnResult(){
+                @Override
+                public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                    LiveEventBus.get("homeOneUpdateData").post("");
+                    switch (Integer.parseInt(biz.getOrderStep())){
+                        case Constants.ORDER_STATUS_BASE://完成填写基本信息
+                            biz.setProductId(items.getProductId());
+                            biz.setIsValueCard(items.getIsValueCard());
+                            Intent intent = new Intent();
+                            intent.putExtra("vehiclePlate", biz.getVehiclePlate()); //车牌号
+                            intent.putExtra("vehiclePlateColor", biz.getVehiclePlateColor() + ""); //车牌颜色
+                            intent.putExtra("type", biz.getType()); //根据不同的车牌类型进行传参(车型) 0 客车 1 货车
+                            intent.putExtra("orderId", biz.getOrderId() + ""); //订单号
+                            intent.putExtra("isValueCard",items.getIsValueCard());//1记账卡 2储值卡
+                            intent.putExtra("id",biz.getId());//订单Id
+                            intent.putExtra("bizContent",JSON.toJSONString(biz));
+                            intent.setClass(ETCHandleActivity.this, IdentityInformationUploadActivity.class);
+                            ETCHandleActivity.this.startActivity(intent);
+                            ETCHandleActivity.this.finish();
+                            break;
+                        case Constants.ORDER_STATUS_INFO://完成个人/单位信息上传
+                            biz.setProductId(items.getProductId());
+                            biz.setIsValueCard(items.getIsValueCard());
+                            Intent intent1 = new Intent();
+                            intent1.putExtra("vehiclePlate", biz.getVehiclePlate()); //车牌号
+                            intent1.putExtra("vehiclePlateColor", biz.getVehiclePlateColor() + ""); //车牌颜色
+                            intent1.putExtra("type", biz.getType()); //根据不同的车牌类型进行传参(车型) 0 客车 1 货车
+                            intent1.putExtra("orderId", biz.getOrderId() + ""); //订单号
+                            intent1.putExtra("isValueCard",items.getIsValueCard());//1记账卡 2储值卡
+                            intent1.putExtra("id",biz.getId());//订单Id
+                            intent1.putExtra("bizContent",JSON.toJSONString(biz));
+                            intent1.setClass(ETCHandleActivity.this, VehicleInformationActivity.class);
+                            ETCHandleActivity.this.startActivity(intent1);
+                            ETCHandleActivity.this.finish();
+                            break;
+                        case Constants.ORDER_STATUS_CAR://完成车辆信息上传
+                            biz.setProductId(items.getProductId());
+                            biz.setIsValueCard(items.getIsValueCard());
+                            Intent intent2 = new Intent();
+                            intent2.putExtra("type",biz.getType());
+                            intent2.putExtra("orderId",biz.getOrderId());
+                            intent2.putExtra("bizContent",JSON.toJSONString(biz));
+                            intent2.putExtra("isValueCard",biz.getIsValueCard());
+                            intent2.putExtra("id",biz.getId());
+                            intent2.setClass(ETCHandleActivity.this,InformationConfirmedActivity.class);
+                            ETCHandleActivity.this.startActivity(intent2);
+                            ETCHandleActivity.this.finish();
+                            break;
+                    }
+                }
+
+                @Override
+                public void onError() {
+                    MyRetrofit.ReturnResult.super.onError();
+                }
+            });
+        }else {
+            Bundle bundle = new Bundle();
+            bundle.putString("bizContent", JSON.toJSONString(items));
+            bundle.putString("isValueCard",items.getIsValueCard());
+            bundle.putString("type",getIntent().getStringExtra("type"));
+//        bundle.putString("orderId", orderId);
+            jumpToPage(FillOutMessage.class,bundle);
+            finish();
         }
+
+//        if ("2".equals(items.getIsValueCard())) {//储值卡-无需签约
+//            jumpToPage(ETCHandleSonActivity.class, bundle);
+//        } else if ("1".equals(items.getIsValueCard())) {//记账卡-需要签约
+//            jumpToPage(ContractActivity.class, bundle);
+//        }
     }
 
     @Override

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

@@ -2,14 +2,33 @@ package com.huntersun.vkyes.etcopencard.project.ui.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityEtchandleSonBinding;
+import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit;
+import com.huntersun.vkyes.etcopencard.project.api.bean.EquityBean;
+import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
+import com.huntersun.vkyes.etcopencard.project.ui.adapter.EquityChooseAdapter;
+import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
+import com.huntersun.vkyes.etcopencard.project.view.CommonItemDecoration;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+import com.huntersun.vkyes.etcopencard.src.http.glide.GlideApp;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 订单支付确认页
@@ -18,6 +37,7 @@ import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
  */
 public class ETCHandleSonActivity extends AppActivity {
     private ActivityEtchandleSonBinding binding;
+    private EquityChooseAdapter adapter;
 
     @Override
     protected View getLayoutView() {
@@ -29,22 +49,43 @@ public class ETCHandleSonActivity extends AppActivity {
     @Override
     protected void initView() {
         setTitle("订单支付");
+        initRecyclerview();
         binding.rrelative.getHelper().setBackgroundColorNormalArray(this.getResources().getIntArray(R.array.green_bg_arr));
-        ResultBean.BizContent bizContent =
+        ResultBean.BizContent biz =
                 JSON.parseObject(getIntent().getStringExtra("bizContent"), ResultBean.BizContent.class);
-        binding.text1.setText(bizContent.getName());
+
+        if("2".equals(getIntent().getStringExtra("isValueCard"))){//储值卡不签约
+            binding.lyQiany.setVisibility(View.GONE);
+        }else {//记账卡签约
+            binding.lyQiany.setVisibility(View.VISIBLE);
+        }
+
+        Map<String, String> params = new HashMap<>();
+        params.put("id", biz.getId() + "");
+        MyRetrofit.newInstance(IFCode.IFCODE9, params, new MyRetrofit.ReturnResult() {
+            @Override
+            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                binding.text1.setText(bizContent.getProductName());
 //        binding.text2.setText("基础服务");
-        binding.text3.setText(bizContent.getProductMsg());
-        binding.text4.setText(bizContent.getFee() * 0.01 + "");
-        binding.text6.setText("￥" + bizContent.getFee() * 0.01 + "");
-        binding.text5.setText("￥" + bizContent.getFee() * 0.01 + "");
+                binding.text3.setText(bizContent.product.productMsg);
+                binding.text4.setText(bizContent.product.fee * 0.01 + "");
+                binding.text6.setText("￥" + bizContent.product.fee * 0.01);
+                binding.text5.setText("￥" + bizContent.product.fee * 0.01);
+            }
+
+            @Override
+            public void onError() {
+                MyRetrofit.ReturnResult.super.onError();
+            }
+        });
+
         binding.nextStep.setOnClickListener(new View.OnClickListener() {
             @Override
             @SingleClick
             public void onClick(View v) {
                 Intent intent = new Intent();
-                intent.putExtra("orderId", getIntent().getStringExtra("orderId") + "");
-                intent.putExtra("id", bizContent.getId() + "");
+                intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
+                intent.putExtra("id", biz.getId() + "");
                 intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
                 startActivity(intent);
                 finish();
@@ -52,9 +93,49 @@ public class ETCHandleSonActivity extends AppActivity {
         });
     }
 
+    private void initRecyclerview() {
+        adapter = new EquityChooseAdapter(this, R.layout.item_equity_1, new EquityChooseAdapter.OnCBCheckedChangedListener() {
+            @Override
+            public void onCheckChanged(EquityBean bean, boolean b) {
+                if (b){
+                    Double m = Double.valueOf(bean.getMoney());
+                    Double m1 = Double.valueOf(binding.tvMoneyJg.getText().toString().replace("￥",""));
+                    Double m2 = Double.valueOf(binding.text6.getText().toString().replace("￥",""));
+                    m1 += m;
+                    m2 += m;
+                    binding.tvMoneyJg.setText("￥"+ FunHelper.getPriceWith2Num(m1));
+                    binding.text6.setText("￥"+FunHelper.getPriceWith2Num(m2));
+                }else {
+                    Double m = Double.valueOf(bean.getMoney());
+                    Double m1 = Double.valueOf(binding.tvMoneyJg.getText().toString().replace("￥",""));
+                    Double m2 = Double.valueOf(binding.text6.getText().toString().replace("￥",""));
+                    m1 -= m;
+                    m2 -= m;
+                    binding.tvMoneyJg.setText("￥"+FunHelper.getPriceWith2Num(m1));
+                    binding.text6.setText("￥"+FunHelper.getPriceWith2Num(m2));
+                }
+            }
+        });
+        LinearLayoutManager layoutManager = new LinearLayoutManager(this, RecyclerView.VERTICAL,false);
+        CommonItemDecoration itemDecoration = new CommonItemDecoration(0,40,0,0,0,0);
+        binding.recyclerJg.setLayoutManager(layoutManager);
+        binding.recyclerJg.addItemDecoration(itemDecoration);
+        binding.recyclerJg.setAdapter(adapter);
+    }
+
     @Override
     protected void initData() {
-
+        ArrayList<EquityBean> list = new ArrayList<>();
+        EquityBean bean1= new EquityBean();
+        bean1.setImage(R.mipmap.ic_car_stopping);
+        bean1.setTitle("64停车卷");
+        bean1.setMoney("44.00");
+        EquityBean bean2= new EquityBean();
+        bean2.setImage(R.mipmap.ic_car_wash);
+        bean2.setTitle("10次停车卷");
+        bean2.setMoney("44.00");
+        list.add(bean1);
+        list.add(bean2);
+        adapter.replaceData(list);
     }
-
 }

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

@@ -7,6 +7,7 @@ import android.util.Log;
 import android.view.View;
 import android.view.animation.AnimationUtils;
 
+import com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityFillOutMessageBinding;
@@ -20,6 +21,7 @@ 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.api.bean.SendTheVerificationCodeBean;
+import com.huntersun.vkyes.etcopencard.project.dialog.ConfirmDialog;
 import com.huntersun.vkyes.etcopencard.project.dialog.EnumListDialog;
 import com.huntersun.vkyes.etcopencard.project.tool.MyShared;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
@@ -28,6 +30,8 @@ import com.huntersun.vkyes.etcopencard.src.ui.dialog.AddressDialog;
 import com.parkingwang.keyboard.OnInputChangedListener;
 import com.parkingwang.keyboard.PopupKeyboard;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 import retrofit2.Response;
@@ -52,6 +56,11 @@ public class FillOutMessage extends AppActivity {
     @Override
     protected void initView() {
         setTitle("基本信息");
+        if ("2".equals(getIntent().getStringExtra("isValueCard"))){//储值卡不需要签约
+            binding.lyQiany.setVisibility(View.GONE);
+        }else {//记账卡需要签约
+            binding.lyQiany.setVisibility(View.VISIBLE);
+        }
         binding.isMail.setOnCheckedChangeListener((button, checked) -> {
             if (checked) {
                 binding.mail.setVisibility(View.VISIBLE);
@@ -190,16 +199,8 @@ public class FillOutMessage extends AppActivity {
                             @Override
                             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                                 hideDialog();
-                                binding.nextStep.setEnabled(true);
                                 MyShared.getInstance().put(MyShared.ORDERID, bizContent.getId() + ""); //存贮订单ID
-                                Intent intent = new Intent();
-                                intent.putExtra("vehiclePlate", binding.inputView.getNumber()); //车牌号
-                                intent.putExtra("vehiclePlateColor", licensePlateColor + ""); //车牌颜色
-                                intent.putExtra("type", getIntent().getStringExtra("type")); //根据不同的车牌类型进行传参(车型) 0 客车 1 货车
-                                intent.putExtra("orderId", bizContent.getOrderId() + ""); //订单号
-                                intent.setClass(FillOutMessage.this, IdentityInformationUploadActivity.class);
-                                startActivity(intent);
-                                finish();
+                                linkProduct(bizContent);
                             }
 
                             @Override
@@ -219,7 +220,44 @@ public class FillOutMessage extends AppActivity {
     protected void initData() {
 
     }
+    public void linkProduct(ResultBean.BizContent bizContent1){
+        showDialog("产品信息提交中...");
+        ResultBean.BizContent bizContent2 =
+                JSON.parseObject(getIntent().getStringExtra("bizContent"), ResultBean.BizContent.class);
+        Map<String, String> params = new HashMap<>();
+        params.put("orderId", bizContent1.getOrderId());
+        params.put("productId", bizContent2.getId());
+        MyRetrofit.newInstance(IFCode.IFCODE914, params, new MyRetrofit.ReturnResult() {
+            @Override
+            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                hideDialog();
+                binding.nextStep.setEnabled(true);
+                Intent intent = new Intent();
+                intent.putExtra("vehiclePlate", binding.inputView.getNumber()); //车牌号
+                intent.putExtra("vehiclePlateColor", licensePlateColor + ""); //车牌颜色
+                intent.putExtra("type", getIntent().getStringExtra("type")); //根据不同的车牌类型进行传参(车型) 0 客车 1 货车
+                intent.putExtra("orderId", bizContent1.getOrderId() + ""); //订单号
+                intent.putExtra("isValueCard",bizContent2.getIsValueCard());//1记账卡 2储值卡
+                intent.putExtra("id",bizContent1.getId());//订单Id
+                bizContent2.setId(bizContent1.getId());
+                intent.putExtra("bizContent",JSON.toJSONString(bizContent2));
+                intent.setClass(FillOutMessage.this, IdentityInformationUploadActivity.class);
+                startActivity(intent);
+                finish();
+            }
 
+            @Override
+            public void onError(Response<Result> resp) {
+                hideDialog();
+                new ConfirmDialog.Builder(FillOutMessage.this).setMsg(resp.body().errorMsg, "无法选择产品", "确定", "", R.mipmap.icon_lotgout_etc_hint, 0, true)
+                        .onClick(new ConfirmDialog.Result() {
+                            @Override
+                            public void confirm() {
+                            }
+                        }).show();
+            }
+        });
+    }
     @SuppressLint("UseCompatLoadingForDrawables")
     @Override
     @SingleClick

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

@@ -44,6 +44,8 @@ import com.huntersun.vkyes.etcopencard.src.ui.activity.ImageCropActivity;
 import com.huntersun.vkyes.etcopencard.src.ui.activity.ImageSelectActivity;
 import com.huntersun.vkyes.etcopencard.src.ui.dialog.DateDialog;
 import com.jeremyliao.liveeventbus.LiveEventBus;
+import com.parkingwang.keyboard.OnInputChangedListener;
+import com.parkingwang.keyboard.PopupKeyboard;
 
 import java.io.File;
 import java.io.IOException;
@@ -69,6 +71,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
     private String imgUrl4 = "";
     private String imgUrl5 = "";
     private String identifyIdCard = ""; //识别出的身份证号
+    private ResultBean.BizContent biz;
 
     @Override
     protected View getLayoutView() {
@@ -81,6 +84,11 @@ public class IdentityInformationUploadActivity extends AppActivity {
     @Permissions({Permission.READ_EXTERNAL_STORAGE, Permission.WRITE_EXTERNAL_STORAGE})
     protected void initView() {
         setTitle("身份证信息上传");
+        if ("2".equals(getIntent().getStringExtra("isValueCard"))){
+            binding.lyQiany.setVisibility(View.GONE);
+        }else {
+            binding.lyQiany.setVisibility(View.VISIBLE);
+        }
         //根据订单信息查所有信息接口
         if (getIntent().getBooleanExtra("start", false)) {
             binding.layout9.setVisibility(View.GONE);
@@ -233,6 +241,9 @@ public class IdentityInformationUploadActivity extends AppActivity {
                             intent.putExtra("orderId", getIntent().getStringExtra("orderId")); //车牌号
                             intent.putExtra("vehiclePlateColor", getIntent().getStringExtra("vehiclePlateColor")); //车牌颜色
                             intent.putExtra("type",getIntent().getStringExtra("type"));//车辆类型 1货车 0客车
+                            intent.putExtra("isValueCard",getIntent().getStringExtra("isValueCard"));
+                            intent.putExtra("id",getIntent().getStringExtra("id"));
+                            intent.putExtra("bizContent",getIntent().getStringExtra("bizContent"));
                             intent.setClass(IdentityInformationUploadActivity.this, VehicleInformationActivity.class);
                             startActivity(intent);
                         }

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

@@ -113,8 +113,15 @@ public class InformationConfirmedActivity extends AppActivity implements StatusA
             public void onClick(View v) {
                 Bundle bundle = new Bundle();
                 bundle.putString("orderId", getIntent().getStringExtra("orderId"));
-                jumpToPage(ETCHandleActivity.class,bundle);
-                finish();
+                bundle.putString("bizContent",getIntent().getStringExtra("bizContent"));
+                bundle.putString("isValueCard",getIntent().getStringExtra("isValueCard"));
+                if ("2".equals(getIntent().getStringExtra("isValueCard"))){//储值卡不签约
+                    jumpToPage(ETCHandleSonActivity.class,bundle);
+                    finish();
+                }else {//1记账卡签约
+                    jumpToPage(SignUpActivity.class,bundle);
+                    finish();
+                }
 
                 /*if ("1".equals(start)) {//存储卡
                     //订单支付

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

@@ -167,14 +167,15 @@ public class MainActivity extends AppActivity implements
             @Override
             public void success() {
                 intent.putExtra("type", "1"); //货车
-                intent.setClass(MainActivity.this, FillOutMessage.class);
+//                intent.setClass(MainActivity.this, FillOutMessage.class);
+                intent.setClass(MainActivity.this, ETCHandleActivity.class);
                 startActivity(intent);
             }
 
             @Override
             public void fail() {
                 intent.putExtra("type", "0"); //客车
-                intent.setClass(MainActivity.this, FillOutMessage.class);
+                intent.setClass(MainActivity.this, ETCHandleActivity.class);
                 startActivity(intent);
             }
         }).show();

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

@@ -1,19 +1,34 @@
 package com.huntersun.vkyes.etcopencard.project.ui.activity;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivitySignUpBinding;
+import com.huntersun.vkyes.etcopencard.project.api.bean.EquityBean;
+import com.huntersun.vkyes.etcopencard.project.api.bean.LoginBean;
+import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
+import com.huntersun.vkyes.etcopencard.project.view.CommonItemDecoration;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /*
     签约页面
  */
 public class SignUpActivity extends AppActivity {
     private ActivitySignUpBinding binding;
+    private ArrayList<EquityBean> list = new ArrayList<>();
 
     @Override
     protected View getLayoutView() {
@@ -23,11 +38,51 @@ public class SignUpActivity extends AppActivity {
 
     @Override
     protected void initView() {
+        binding.tvSkip.getHelper().setBackgroundColorNormalArray(this.getResources().getIntArray(R.array.green_bg_arr));
+        initRecyclerview();
+    }
 
+    private void initRecyclerview() {
+        LinearLayoutManager layoutManager = new LinearLayoutManager(this, RecyclerView.VERTICAL,false);
+        CommonItemDecoration commonItemDecoration = new CommonItemDecoration(0,40,40,0,40,0);
+        binding.recycler.setLayoutManager(layoutManager);
+        binding.recycler.addItemDecoration(commonItemDecoration);
+        binding.recycler.setAdapter(adapter);
     }
 
     @Override
     protected void initData() {
+        EquityBean item1 = new EquityBean();
+        item1.setMoney("1");
+        EquityBean item2 = new EquityBean();
+        item1.setMoney("1");
+        EquityBean item3 = new EquityBean();
+        item1.setMoney("1");
+        list.add(item1);
+        list.add(item2);
+        list.add(item3);
+        adapter.replaceData(list);
+        ResultBean.BizContent bizContent =
+                JSON.parseObject(getIntent().getStringExtra("bizContent"), ResultBean.BizContent.class);
+        adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
+                if (view.getId()==R.id.btn_sign){
 
+                    Bundle bundle = new Bundle();
+                    bundle.putString("orderId", getIntent().getStringExtra("orderId"));
+                    bundle.putString("bizContent",getIntent().getStringExtra("bizContent"));
+                    bundle.putString("isValueCard",getIntent().getStringExtra("isValueCard"));
+                    jumpToPage(ETCHandleSonActivity.class,bundle);
+                    finish();
+                }
+            }
+        });
     }
+    BaseQuickAdapter<EquityBean, BaseViewHolder> adapter = new BaseQuickAdapter<EquityBean, BaseViewHolder>(R.layout.item_sign_up_bank) {
+        @Override
+        protected void convert(@NonNull BaseViewHolder holder, EquityBean equityBean) {
+            holder.addOnClickListener(R.id.btn_sign);
+        }
+    };
 }

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

@@ -67,6 +67,11 @@ public class VehicleInformationActivity extends AppActivity {
     @Override
     protected void initView() {
         setTitle("车辆信息上传");
+        if ("2".equals(getIntent().getStringExtra("isValueCard"))){
+            binding.lyQiany.setVisibility(View.GONE);
+        }else {
+            binding.lyQiany.setVisibility(View.VISIBLE);
+        }
         updateData();
         binding.image1.setOnClickListener(this::onImage);
         binding.image2.setOnClickListener(this::onImage);
@@ -121,7 +126,10 @@ public class VehicleInformationActivity extends AppActivity {
                         return;
                     }
                 }
-
+                if (!getIntent().getStringExtra("vehiclePlate").equals(binding.text1.getText().toString().trim())){
+                    toast("填写的车牌号与"+getIntent().getStringExtra("vehiclePlate")+"不一致");
+                    return;
+                }
 //                if(!inputVehiclePlate.equals(binding.text1.getText().toString())){
 //                    toast("输入的车牌与上传的行驶证车牌不一致，请重新输入或者上传！");
 //                    return;
@@ -308,6 +316,9 @@ public class VehicleInformationActivity extends AppActivity {
             intent.putExtra("vehiclePlateColor", getIntent().getStringExtra("vehiclePlateColor")); //车辆颜色
             intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
             intent.putExtra("type",getIntent().getStringExtra("type"));
+            intent.putExtra("id",getIntent().getStringExtra("id"));
+            intent.putExtra("isValueCard",getIntent().getStringExtra("isValueCard"));//2是储值卡1记账卡
+            intent.putExtra("bizContent",getIntent().getStringExtra("bizContent"));
             intent.setClass(VehicleInformationActivity.this, InformationConfirmedActivity.class);
             startActivity(intent);
         }

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

@@ -25,6 +25,8 @@ import com.huntersun.vkyes.etcopencard.project.copapply.ObuActivateRequester;
 import com.huntersun.vkyes.etcopencard.project.copapply.ObuActivation;
 import com.huntersun.vkyes.etcopencard.project.dialog.ConfirmDialog;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.ETCHandleActivity;
+import com.huntersun.vkyes.etcopencard.project.ui.activity.ETCHandleSonActivity;
+import com.huntersun.vkyes.etcopencard.project.ui.activity.FillOutMessage;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.IdentityInformationUploadActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.InformationConfirmedActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.VehicleInformationActivity;
@@ -190,6 +192,14 @@ public class OrderUtils {
         }
     }
 
+    /**
+     * 检测是否绑定产品
+     * true绑定了，false未绑定
+     * @return
+     */
+    private boolean checkLinkProduct(){
+        return !(null==orderData.getProductId()||"".equals(orderData.getProductId()));
+    }
     /**
      * 设置点击事件
      */
@@ -199,7 +209,20 @@ public class OrderUtils {
             @Override
             @SingleClick
             public void onClick(View view) {
-                startActivity(IdentityInformationUploadActivity.class);
+                Intent intent = new Intent();
+                intent.putExtra("vehiclePlate", orderData.getVehiclePlate()); //车牌号
+                intent.putExtra("vehiclePlateColor", orderData.getVehiclePlateColor() + ""); //车牌颜色
+                intent.putExtra("type", orderData.getType()); //根据不同的车牌类型进行传参(车型) 0 客车 1 货车
+                intent.putExtra("orderId", orderData.getOrderId() + ""); //订单号
+                intent.putExtra("isValueCard",orderData.getIsValueCard());//1记账卡 2储值卡
+                intent.putExtra("id",orderData.getId());//订单Id
+                intent.putExtra("bizContent",JSON.toJSONString(orderData));
+                if (null==orderData.getProductId()||"".equals(orderData.getProductId())){//未绑定成功订单，重新跳转绑定
+                    intent.setClass(context,ETCHandleActivity.class);
+                }else {
+                    intent.setClass(context, IdentityInformationUploadActivity.class);
+                }
+                context.startActivity(intent);
             }
         });
 
@@ -209,8 +232,18 @@ public class OrderUtils {
             @SingleClick
             public void onClick(View view) {
                 Intent intent = new Intent();
-                intent.putExtra("type",orderData.getType());
-                intent.setClass(context,VehicleInformationActivity.class);
+                intent.putExtra("vehiclePlate", orderData.getVehiclePlate()); //车牌号
+                intent.putExtra("vehiclePlateColor", orderData.getVehiclePlateColor() + ""); //车牌颜色
+                intent.putExtra("type", orderData.getType()); //根据不同的车牌类型进行传参(车型) 0 客车 1 货车
+                intent.putExtra("orderId", orderData.getOrderId() + ""); //订单号
+                intent.putExtra("isValueCard",orderData.getIsValueCard());//1记账卡 2储值卡
+                intent.putExtra("id",orderData.getId());//订单Id
+                intent.putExtra("bizContent",JSON.toJSONString(orderData));
+                if (null==orderData.getProductId()||"".equals(orderData.getProductId())){//未绑定成功订单，重新跳转绑定
+                    intent.setClass(context,ETCHandleActivity.class);
+                }else {
+                    intent.setClass(context,VehicleInformationActivity.class);
+                }
                 context.startActivity(intent);
             }
         });
@@ -220,9 +253,25 @@ public class OrderUtils {
             @Override
             @SingleClick
             public void onClick(View view) {
+//                ResultBean.BizContent productBean = new ResultBean.BizContent();
+//                productBean.setId(orderData.productId);
+//                productBean.setName(orderData.getProductName());
+//                if (orderData.product != null) {
+//                    productBean.setProductMsg(orderData.product.productMsg);
+//                    productBean.setFee(orderData.product.fee);
+//                    productBean.setIsValueCard(orderData.getIsValueCard());
+//                }
                 Intent intent = new Intent();
                 intent.putExtra("type",orderData.getType());
-                intent.setClass(context,InformationConfirmedActivity.class);
+                intent.putExtra("orderId",orderData.getOrderId());
+                intent.putExtra("bizContent",JSON.toJSONString(orderData));
+                intent.putExtra("isValueCard",orderData.getIsValueCard());
+                intent.putExtra("id",orderData.getId());
+                if (null==orderData.getProductId()||"".equals(orderData.getProductId())){//未绑定成功订单，重新跳转绑定
+                    intent.setClass(context,ETCHandleActivity.class);
+                }else {
+                    intent.setClass(context,InformationConfirmedActivity.class);
+                }
                 context.startActivity(intent);
 //                startActivity(InformationConfirmedActivity.class);
             }
@@ -239,13 +288,18 @@ public class OrderUtils {
                 if (orderData.product != null) {
                     productBean.setProductMsg(orderData.product.productMsg);
                     productBean.setFee(orderData.product.fee);
+                    productBean.setIsValueCard(orderData.getIsValueCard());
                 }
                 Bundle bundle = new Bundle();
                 bundle.putString("bizContent", JSON.toJSONString(productBean));
                 bundle.putString("orderId", orderData.getOrderId());
 
                 Intent intent = new Intent();
-                intent.setClass(context, ETCHandleActivity.class);
+                if (null==orderData.getProductId()||"".equals(orderData.getProductId())){//未绑定成功订单，重新跳转绑定
+                    intent.setClass(context,ETCHandleActivity.class);
+                }else {
+                    intent.setClass(context, ETCHandleSonActivity.class);
+                }
                 intent.putExtras(bundle);
                 context.startActivity(intent);
             }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/adapter/EquityChooseAdapter.java

@@ -0,0 +1,43 @@
+package com.huntersun.vkyes.etcopencard.project.ui.adapter;
+
+import android.app.Activity;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.huntersun.vkyes.etcopencard.R;
+import com.huntersun.vkyes.etcopencard.project.api.bean.EquityBean;
+import com.huntersun.vkyes.etcopencard.project.ui.activity.ETCHandleSonActivity;
+import com.huntersun.vkyes.etcopencard.src.http.glide.GlideApp;
+import com.ruffian.library.widget.RCheckBox;
+
+public class EquityChooseAdapter extends BaseQuickAdapter<EquityBean, BaseViewHolder> {
+    private OnCBCheckedChangedListener listener;
+    private Activity context;
+    public interface OnCBCheckedChangedListener{
+        void onCheckChanged(EquityBean bean,boolean b);
+    }
+    public EquityChooseAdapter(Activity context,int layoutResId,OnCBCheckedChangedListener listener) {
+        super(layoutResId);
+        this.context = context;
+        this.listener = listener;
+    }
+
+    @Override
+    protected void convert(@NonNull BaseViewHolder helper, EquityBean equityBean) {
+        helper.setText(R.id.equity_title,equityBean.getTitle());//权益
+        helper.setText(R.id.tv_money_num,equityBean.getMoney());//金额
+        ImageView img1 = helper.getView(R.id.img1);
+        GlideApp.with(context).load(equityBean.getImage()).into(img1);//权益图标
+        RCheckBox rcb = helper.getView(R.id.cb_equity);
+        rcb.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                listener.onCheckChanged(equityBean,b);
+            }
+        });
+    }
+}

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentSonOne.java

@@ -161,6 +161,7 @@ public class FragmentSonOne extends TitleBarFragment<MainActivity>
         MyRetrofit.newInstance(IFCode.IFCODE36, parameters, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                Log.e("resssssssssss",resultBean+"");
                 int totalSize = Integer.parseInt(bizContent.getTotalCount()); // 获取总的数据条数
                 if (page == 1) {
                     adapter.replaceData(bizContent.getData());

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

@@ -128,7 +128,7 @@ public final class LoginActivity extends AppActivity implements KeyboardWatcher.
         mPasswordView.setOnEditorActionListener(this);
 
         setDataToView();
-        updateApp();
+//        updateApp();
     }
 
     private void updateApp() {

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

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.ruffian.library.widget.RRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:background_normal="@mipmap/ic_equity_bg"
+    app:corner_radius="@dimen/dp_10"
+    android:layout_height="@dimen/dp_70">
+    <com.ruffian.library.widget.RLinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:background_normal="@color/green05"
+        android:padding="@dimen/dp_8"
+        android:layout_margin="@dimen/dp_15"
+        android:layout_marginLeft="@dimen/dp_15"
+        android:layout_centerVertical="true"
+        android:id="@+id/ly_tb"
+        app:corner_radius="@dimen/dp_20"
+        android:orientation="vertical">
+        <ImageView
+            android:layout_width="@dimen/dp_24"
+            android:layout_height="@dimen/dp_24"
+            android:id="@+id/img1"
+            android:src="@mipmap/ic_car_stopping"/>
+    </com.ruffian.library.widget.RLinearLayout>
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:src="@mipmap/ic_equity_dash"
+        android:layout_toRightOf="@+id/ly_tb"
+        android:id="@+id/img_dash"
+        />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="64停车卷"
+        android:textSize="@dimen/sp_13"
+        android:layout_toRightOf="@+id/img_dash"
+        android:layout_marginLeft="@dimen/dp_15"
+        android:layout_marginTop="@dimen/dp_15"
+        android:id="@+id/equity_title"/>
+    <TextView
+        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:id="@+id/tv_money_icon"
+        android: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:id="@+id/tv_money_num"
+        android:text="44.00"/>
+    <com.ruffian.library.widget.RCheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:button="@null"
+        android:id="@+id/cb_equity"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        app:background_normal="@color/green04"
+        app:icon_normal_left="@drawable/compound_normal_ic"
+        app:icon_checked_left="@drawable/checkbox_checked_ic"
+        android:layout_marginRight="@dimen/dp_15"/>
+</com.ruffian.library.widget.RRelativeLayout>

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

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.ruffian.library.widget.RRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:corner_radius="@dimen/dp_10"
+    xmlns:tools="http://schemas.android.com/tools"
+    app:background_normal="@color/blue02"
+    android:layout_height="wrap_content">
+    <ImageView
+        android:layout_width="@dimen/dp_50"
+        android:layout_height="@dimen/dp_50"
+        android:background="@color/white"
+        android:layout_marginLeft="@dimen/dp_12"
+        android:layout_centerVertical="true"
+        android:id="@+id/img_sign"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/WhiteTextStyleBold16"
+        tools:text="微信支付"
+        android:text="微信支付"
+        android:layout_toRightOf="@+id/img_sign"
+        android:layout_marginTop="@dimen/dp_13"
+        android:layout_marginLeft="@dimen/dp_13"
+        android:id="@+id/tv_sign_title"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/tv_sign_title"
+        android:layout_toLeftOf="@+id/btn_sign"
+        android:layout_below="@+id/tv_sign_title"
+        tools:text="服务费是每笔交易金额的0.05%"
+        android:text="服务费是每笔交易金额的0"
+        android:layout_marginRight="@dimen/dp_5"
+        android:id="@+id/tv_sign_info"
+        style="@style/whiteTextStyle12"
+        android:layout_marginTop="@dimen/dp_8"/>
+    <com.ruffian.library.widget.RTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/tv_sign_info"
+        android:layout_below="@+id/tv_sign_info"
+        tools:text="微信代付"
+        android:text="微信代付"
+        app:background_normal="@color/blue"
+        android:id="@+id/tv_sign_name"
+        app:corner_radius="@dimen/dp_3"
+        android:padding="@dimen/dp_3"
+        android:layout_marginBottom="@dimen/dp_10"
+        style="@style/whiteTextStyle11"
+        android:layout_marginTop="@dimen/dp_8"/>
+    <com.ruffian.library.widget.RTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/tv_sign_name"
+        android:layout_below="@+id/tv_sign_info"
+        tools:text="微信便捷支付"
+        android:text="微信便捷支付"
+        app:corner_radius="@dimen/dp_3"
+        app:background_normal="@color/blue"
+        android:id="@+id/tv_sign_remark"
+        android:padding="@dimen/dp_3"
+        android:layout_marginLeft="@dimen/dp_5"
+        android:layout_marginBottom="@dimen/dp_10"
+        style="@style/whiteTextStyle11"
+        android:layout_marginTop="@dimen/dp_8"/>
+    <com.ruffian.library.widget.RTextView
+        android:layout_width="@dimen/dp_60"
+        android:layout_height="@dimen/dp_30"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:id="@+id/btn_sign"
+        android:layout_marginRight="@dimen/dp_15"
+        app:border_color_normal="@color/white"
+        app:border_width_normal="@dimen/dp_0_5"
+        app:corner_radius="@dimen/dp_15"
+        tools:text="签约"
+        android:text="签约"
+        style="@style/whiteTextStyle15"
+        android:gravity="center"
+        app:background_normal="@color/white20"/>
+
+</com.ruffian.library.widget.RRelativeLayout>

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

@@ -192,6 +192,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:id="@+id/ly_qiany"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
 
@@ -310,8 +311,8 @@
                 android:layout_height="wrap_content"
                 android:id="@+id/rrelative"
                 app:gradient_type="linear"
-                app:gradient_orientation="TOP_BOTTOM"
-                app:gradient_centerY="0.5"
+                app:gradient_orientation="LEFT_RIGHT"
+                app:gradient_centerX="0.5"
                 android:padding="@dimen/dp_10"
                 app:corner_radius="@dimen/dp_10">
                 <ImageView
@@ -345,6 +346,7 @@
                     android:textSize="@dimen/sp_10"
                     android:layout_below="@id/tv_xtx"
                     android:layout_alignLeft="@+id/tv_xtx"
+                    android:layout_marginTop="@dimen/dp_5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="ETC设备与卡片\t\t设备质保一年\n开具通行费发票  高速通行9.5折" />
@@ -473,7 +475,27 @@
 <!--                </LinearLayout>-->
 
 <!--            </LinearLayout>-->
-
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/sp_12"
+                android:text="加购权益"
+                android:textColor="#333333"
+                android:textSize="@dimen/sp_16" />
+            <androidx.recyclerview.widget.RecyclerView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:listitem="@layout/item_equity_1"
+                tools:itemCount="2"
+                android:id="@+id/recycler_jg"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/gray07"
+                android:layout_marginTop="@dimen/dp_15"
+                android:layout_gravity="center_horizontal"
+                android:drawableRight="@mipmap/ic_next_gray"
+                android:text="查看更多"/>
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -519,7 +541,36 @@
                     android:layout_width="wrap_content"
                     android:layout_height="1dp"
                     android:layout_marginHorizontal="@dimen/dp_10" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_44"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:layout_width="@dimen/dp_110"
+                        android:layout_height="match_parent"
+                        android:gravity="center_vertical"
+                        android:text="加购权益"
+                        android:textSize="@dimen/sp_14"
+                        tools:ignore="UseCompatTextViewDrawableXml" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical|right"
+                        android:id="@+id/tv_money_jg"
+                        android:text="￥0.00"
+                        android:textColor="#333333"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
 
+                <View
+                    style="@style/VerticalLineStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="1dp"
+                    android:layout_marginHorizontal="@dimen/dp_10" />
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dp_44"

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

@@ -157,6 +157,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:id="@+id/ly_qiany"
                 android:gravity="center"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">

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

@@ -169,6 +169,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:id="@+id/ly_qiany"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
 

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

@@ -9,11 +9,11 @@
     <com.hjq.bar.TitleBar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/white"
-        app:leftIcon="@mipmap/back_black"
+        android:background="@drawable/video_ball_bg12"
+        app:leftIcon="@mipmap/back_three"
         app:title="支付账户签约"
         app:lineVisible="false"
-        app:titleColor="@color/black" />
+        app:titleColor="@color/white" />
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -301,7 +301,8 @@
     <com.scwang.smart.refresh.layout.SmartRefreshLayout
         android:id="@+id/rl_status_refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         app:srlEnablePreviewInEditMode="false">
 
         <com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
@@ -315,9 +316,30 @@
                 android:layout_height="wrap_content"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:itemCount="2"
-                tools:listitem="@layout/item_product" />
+                tools:listitem="@layout/item_sign_up_bank" />
 
         </com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>
     </com.scwang.smart.refresh.layout.SmartRefreshLayout>
-
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="@dimen/dp_5"
+        android:layout_gravity="bottom"
+        android:background="@color/white">
+        <com.ruffian.library.widget.RTextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
+            android:layout_marginBottom="@dimen/dp_20"
+            android:layout_marginLeft="@dimen/dp_20"
+            android:layout_marginRight="@dimen/dp_20"
+            app:gradient_centerX="0.5"
+            android:id="@+id/tv_skip"
+            app:gradient_orientation="LEFT_RIGHT"
+            app:gradient_type="linear"
+            app:corner_radius="@dimen/dp_20"
+            style="@style/whiteTextStyleBold18"
+            android:gravity="center"
+            android:text="已有签约,跳过"/>
+    </LinearLayout>
 </LinearLayout>

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

@@ -180,6 +180,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:id="@+id/ly_qiany"
                 android:orientation="vertical"
                 tools:ignore="UseCompoundDrawables">
 

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

@@ -74,6 +74,7 @@
                 android:background="@null"
                 android:hint="@string/common_phone_input_hint"
                 android:inputType="phone"
+                android:text="15764350434"
                 tools:text="15764350434"
                 app:regexType="mobile" />
 
@@ -105,6 +106,7 @@
                 android:imeOptions="actionDone"
                 android:maxLength="20"
                 android:singleLine="true"
+                android:text="Huting123*"
                 tools:text="Huting123*"
                 android:visibility="visible" />
 

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

@@ -86,6 +86,8 @@
     <color name="green01">#00B38B</color>
     <color name="green02">#39CC81</color>
     <color name="green03">#13E7C1</color>
+    <color name="green04">#C0FFEC</color>
+    <color name="green05">#89FCDB</color>
 
     <!--    黑色-->
     <color name="black01">#333333</color>

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

@@ -159,6 +159,10 @@
         <item name="android:textColor" >@color/white</item>
         <item name="android:textSize"> @dimen/sp_12</item>
     </style>
+    <style name="whiteTextStyle11">
+        <item name="android:textColor" >@color/white</item>
+        <item name="android:textSize"> @dimen/sp_11</item>
+    </style>
     <style name="whiteTextStyle13">
         <item name="android:textColor" >@color/white</item>
         <item name="android:textSize"> @dimen/sp_13</item>
@@ -167,6 +171,11 @@
         <item name="android:textColor" >@color/white</item>
         <item name="android:textSize"> @dimen/sp_15</item>
     </style>
+    <style name="WhiteTextStyleBold16">
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">@dimen/sp_16</item>
+        <item name="android:textStyle">bold</item>
+    </style>
     <style name="whiteTextStyleBold18">
         <item name="android:textColor" >@color/white</item>
         <item name="android:textSize"> @dimen/sp_18</item>
@@ -232,6 +241,7 @@
         <item name="android:textSize">@dimen/sp_16</item>
         <item name="android:textStyle">bold</item>
     </style>
+
     <style name="blackTextStyleBold17">
         <item name="android:textColor">@color/black01</item>
         <item name="android:textSize">@dimen/sp_17</item>