Merge branch 'master' of http://192.168.40.220/dmc/jz_app

app/build.gradle

@@ -12,7 +12,6 @@ android {
     }
     // 资源目录存放指引：https://developer.android.google.cn/guide/topics/resources/providing-resources
     defaultConfig {
-
         // 无痛修改包名：https://www.jianshu.com/p/17327e191d2e
         applicationId 'com.huntersun.vkyes.etcopencard'
         ndk {

app/debug/output-metadata.json

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.huntersun.vkyes.etcopencard",
+  "variantName": "processDebugResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 11,
+      "versionName": "1.1.1",
+      "outputFile": "KyushuETC1.0_v1.1.1_debug.apk"
+    }
+  ]
+}

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "versionCode": 11,
       "versionName": "1.0.9",
-      "outputFile": "jz_app_v1.0.9_release_1007.apk"
+      "outputFile": "KyushuETC1.0_v1.0.9_release_1008.apk"
     }
   ]
 }

app/src/main/AndroidManifest.xml

@@ -130,8 +130,8 @@
             android:windowSoftInputMode="adjustPan" /> <!-- 引导页 -->
         <activity
             android:name=".project.ui.activity.RealUserAuthenticationActivity"
-            android:screenOrientation="portrait"
-            android:exported="false"><!-- 实名认证 -->
+            android:exported="false"
+            android:screenOrientation="portrait"> <!-- 实名认证 -->
         </activity>
         <activity
             android:name="com.huntersun.vkyes.etcopencard.src.ui.activity.GuideActivity"
@@ -262,7 +262,7 @@
             android:name=".project.ui.activity.after.ExtraCreditStep3Activity"
             android:exported="false"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"></activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".project.ui.activity.KnowledgeInfoActivity"
             android:exported="false"
@@ -764,6 +764,9 @@
             android:name=".project.ui.activity.after.AddObuStep2Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <activity android:name=".project.ui.activity.PaymentList"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"/>
 
         <service android:name="com.amap.api.location.APSService" /> <!-- Since JCore2.0.0 Required SDK核心功能 -->
         <!-- 可配置android:process参数将Service放在其他进程中；android:enabled属性不能是false -->

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

@@ -62,10 +62,18 @@ public class MyRetrofit implements ToastAction {
      * 试运行环境
      */
     public static final String Urls = "https://qtzl.etcjz.cn";
-    private final String BaseUrl = "https://qtzl.etcjz.cn"+"/api/"; //VPN访问请求地址 8087
+    private final String BaseUrl = "https://qtzl.etcjz.cn" + "/api/"; //VPN访问请求地址 8087
     public static final String URL_DOWNLOAD_FILE = "https://qtzl.etcjz.cn/user-export-excel/";//通行流水下载路径前缀
     public static final String URL_APP_IMG = "https://qtzl.etcjz.cn";//APP图标路径前缀
 
+    /**
+     * 试运行环境
+     */
+//    public static final String Urls = "https://trial.etcjz.cn";
+//    private final String BaseUrl = "https://trial.etcjz.cn"+"/api/"; //VPN访问请求地址 8087
+//    public static final String URL_DOWNLOAD_FILE = "https://trial.etcjz.cn/user-export-excel/";//通行流水下载路径前缀
+//    public static final String URL_APP_IMG = "https://trial.etcjz.cn";//APP图标路径前缀
+
     /**
      * 修改文件上传地址：VPN访问：192.168.101.145:6001、办公网络访问：222.85.144.89:19003
      * 回显地址：222.85.144.89:19002/xxxxxx
@@ -86,7 +94,7 @@ public class MyRetrofit implements ToastAction {
     public final static String SM4_KEY = "5dc11f854ceca147";
     public final static String SM3_KEY = "WVdSdGFXNHdNREZmTWpBeU16QTRNRE09";
     private final String appId = "9ea6ac6cb8f246ffb2e8ce37bcc98ee3";
-//    private final String appId = "admin001";
+    //    private final String appId = "admin001";
     private final String IFCODE = "";
     private final String bizContent = "";
 
@@ -115,9 +123,9 @@ public class MyRetrofit implements ToastAction {
     }
 
     public static void newInstance(Context context, Boolean start, String code, Object bean, ReturnResult result) {
-        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");
+        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
@@ -184,7 +192,7 @@ public class MyRetrofit implements ToastAction {
             HttpUrl httpUrl = chain.request().url().newBuilder()
                     .addQueryParameter("signType", "MD5") //验签类型
 //                    .addQueryParameter("loginSource","3e4b3a53cf0f4172b23dccd95d3e99a0")
-                    .addQueryParameter("rbacSource","APP")
+                    .addQueryParameter("rbacSource", "APP")
                     .build();
             /*添加响应头，以json的形式去传世数据*/
             Request build = chain.request()

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

@@ -95,6 +95,8 @@ public class IFCode {
     public static final String IFCODE171 = "171"; //根据车辆ID获取正常的状态储值卡
     public static final String IFCODE9 = "9"; //根据订单ID查询订单详情
     public static final String IFCODE8 = "8"; //根据订单编号orderId查询订单详情
+    public static final String IFCODE_DETECTION = "7d240e2034f94da399fb0e3775f87a62"; //订单支付检测接口
+    public static final String IFCODE_PLACE_AN_ORDER = "377421d6ed4f48a29575aa126838a4d2"; //订单下单接口
 
     public static final String IFCODE50 = "50"; //写卡指令申请
     public static final String IFCODE51 = "51"; //写卡指令返回

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

@@ -309,6 +309,8 @@ public class ResultBean<T> {
         public String isAnonymity;
         public String time;
         public String score;
+        public String payType;
+        public String payStatus;
         public String suggestion;
         public String pictureUrl;
         public String equityName;
@@ -317,6 +319,7 @@ public class ResultBean<T> {
         public Result result;
         public ReleaseProductInfo releaseProduct;
         public String remarks;
+        public String paymentStatus;
         public String promoteId;
         public String productIntro;
         private String isSign;
@@ -347,6 +350,7 @@ public class ResultBean<T> {
         public String status; //申请单状态 APPLY-申请中 AUDIT-审核中 CANCEL-已取消 END-结束
         public String applyType; //申请单类型
         public String damageMode; //0-人为损坏 1-自然损坏
+        public List<BizContent> datas;
         public List<UserInfo> appUserInfoQueryModels;//用户列表
         public List<BizContent> csmsnProducts;//产品选择列表
         public List<BizContent> multipleeEquity;//多项权益

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

@@ -141,6 +141,7 @@ public class SendTheVerificationCodeBean {
     private String region;
     private String reason;
     private String payConfigId;
+    private String payType;
     private String postalCode;
     private String trackingNumber;
     private String courierCompany;
@@ -154,6 +155,13 @@ public class SendTheVerificationCodeBean {
     private String openId = (String) MyShared.getInstance().get(MyShared.OPENID, "");
     private String detailedAddress;
 
+    public String getPayType() {
+        return payType;
+    }
+
+    public void setPayType(String payType) {
+        this.payType = payType;
+    }
 
     public String getDetailedAddress() {
         return detailedAddress;

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

@@ -62,7 +62,9 @@ public class AddPurchaseChooseActivity extends AppActivity {
                 if (list.size()>0){
                     intent.putExtra("purchase", JSON.toJSONString(list));
                 }
-                intent.setClass(AddPurchaseChooseActivity.this,ETCHandleSonActivity.class);
+                intent.putExtra("start", getIntent().getStringExtra("start"));
+//                intent.setClass(AddPurchaseChooseActivity.this,ETCHandleSonActivity.class);
+                intent.setClass(AddPurchaseChooseActivity.this,PaymentList.class);
                 AddPurchaseChooseActivity.this.startActivity(intent);
                 finish();
             }

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

@@ -49,7 +49,10 @@ public class ContractActivity extends AppActivity {
     protected void initView() {
         setTitle("签约");
         binding.nextStep.setOnClickListener(this);
-        Bitmap bitmap = QRCode.createQRCodeBitmap("https://file.etcjz.cn/file/web/app.html?orderId="
+//        Bitmap bitmap = QRCode.createQRCodeBitmap("https://file.etcjz.cn/file/web/app.html?orderId="
+//                        + getIntent().getStringExtra("orderId"), 800, 800,
+//                "UTF-8", "H", "1", Color.BLACK, Color.WHITE);
+        Bitmap bitmap = QRCode.createQRCodeBitmap("https://file.etcjz.cn/file/web/mini.html?orderId="
                         + getIntent().getStringExtra("orderId"), 800, 800,
                 "UTF-8", "H", "1", Color.BLACK, Color.WHITE);
         Drawable drawable = new BitmapDrawable(bitmap);
@@ -96,12 +99,17 @@ public class ContractActivity extends AppActivity {
 //                    intent.setClass(ContractActivity.this, ETCHandleActivity.class);
 //                    startActivity(intent);
 //                    finish();
+
+//                    LiveEventBus.get("homeOneUpdateData").post("");
+//                    Bundle bundle = new Bundle();
+//                    bundle.putString("bizContent", getIntent().getStringExtra("bizContent"));
+//                    bundle.putString("orderId", getIntent().getStringExtra("orderId"));
+//                    bundle.putString("isValueCard",getIntent().getStringExtra("isValueCard"));
+//                    jumpToPage(AddPurchaseChooseActivity.class,bundle);
+//                    finish();
+
                     LiveEventBus.get("homeOneUpdateData").post("");
-                    Bundle bundle = new Bundle();
-                    bundle.putString("bizContent", getIntent().getStringExtra("bizContent"));
-                    bundle.putString("orderId", getIntent().getStringExtra("orderId"));
-                    bundle.putString("isValueCard",getIntent().getStringExtra("isValueCard"));
-                    jumpToPage(AddPurchaseChooseActivity.class,bundle);
+                    startActivity(ETCHandleCompleteActivity.class);
                     finish();
                 } else if ("OVERDUE".equals(bizContent1.getUserState())) {
                     showDilog("用户已开通车主服务，但存在欠费，请用户于微信车主服务补缴费用后再次办理。");

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

@@ -41,7 +41,7 @@ import retrofit2.Response;
  *
  * @author admin
  */
-public class DefrayActivity extends AppActivity  {//implements StatusAction
+public class DefrayActivity extends AppActivity {//implements StatusAction
 
     private ActivityDefrayBinding binding;
 
@@ -66,9 +66,10 @@ public class DefrayActivity extends AppActivity  {//implements StatusAction
         fatherBean.bizContent.setOrderId(getIntent().getStringExtra("orderId")); //设置订单Id
         fatherBean.bizContent.setProductId(getIntent().getStringExtra("id")); //产品Id
         fatherBean.bizContent.setBody("下单支付");
-        fatherBean.bizContent.setPayConfigId(Constants.PAY_CONFIG_ID); //支付配置编号
-        //提交车辆信息
-        MyRetrofit.newInstance(this, IFCode.IFCODE56, fatherBean.bizContent, new MyRetrofit.ReturnResult() {
+//        fatherBean.bizContent.setPayConfigId(Constants.PAY_CONFIG_ID); //支付配置编号
+        fatherBean.bizContent.setPayType(getIntent().getStringExtra("payType"));
+        //提交车辆信息 IFCODE56
+        MyRetrofit.newInstance(this, IFCode.IFCODE_PLACE_AN_ORDER, fatherBean.bizContent, new MyRetrofit.ReturnResult() {
             @SuppressLint("SetTextI18n")
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
@@ -94,44 +95,87 @@ public class DefrayActivity extends AppActivity  {//implements StatusAction
         FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
         fatherBean.bizContent = new SendTheVerificationCodeBean();
         fatherBean.bizContent.setOrderId(getIntent().getStringExtra("orderId"));
-        fatherBean.bizContent.setPayConfigId(Constants.PAY_CONFIG_ID); //支付配置编号
+//        fatherBean.bizContent.setPayConfigId(Constants.PAY_CONFIG_ID); //支付配置编号
+        fatherBean.bizContent.setPayType(getIntent().getStringExtra("payType"));
         binding.paid.setEnabled(false);
-        //提交车辆信息
-        MyRetrofit.newInstance(this, IFCode.IFCODE57, fatherBean.bizContent, new MyRetrofit.ReturnResult() {
+        //提交车辆信息 57
+        MyRetrofit.newInstance(this, IFCode.IFCODE_DETECTION, fatherBean.bizContent, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                 hideDialog();
                 binding.paid.setEnabled(true);
                 String msg = "";
-                switch (bizContent.getTradeState()) {
-                    case "SUCCESS": //支付成功
-                        LiveEventBus.get("homeOneUpdateData").post("");
-                        startActivity(ETCHandleCompleteActivity.class);
-                        finish();
-                        break;
-                    case "PAYING": //支付中
-                        msg = "订单支付中...";
-                        break;
-                    case "FAILED": //支付失败
-                        msg = "支付失败";
-                        break;
-                    case "UNPAY": //未支付
-                        msg = "未支付";
-                        break;
-                    case "CLOSED": //已关闭
-                        msg = "已关闭";
-                        break;
-                    case "CANCELED": //已撤销
-                        msg = "已撤销";
-                        break;
-                    case "REFUND": //转入退费
-                        msg = "转入退费";
-                        break;
+                Boolean start = true;
+
+                for (int i = 0; i < bizContent.datas.size(); i++) {
+                    ResultBean.BizContent bizContent1 = (ResultBean.BizContent) bizContent.datas.get(i);
+                    if (!Objects.equals(bizContent1.payStatus, "SUCCESS")){
+                        start = false;
+                    }
                 }
-                if (!Objects.equals(bizContent.getTradeState(), "SUCCESS")) {
-                    new Utils().showMessDialog(getActivity(), msg, dialog -> {
-                    });
+                if (start) {
+                    //支付订单
+                    FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
+                    fatherBean.bizContent = new SendTheVerificationCodeBean();
+                    fatherBean.bizContent.setOrderId(getIntent().getStringExtra("orderId")); //设置订单Id
+                    //提交车辆信息
+                    MyRetrofit.newInstance(getActivity(), IFCode.IFCODE_DETECTION,
+                            fatherBean.bizContent, new MyRetrofit.ReturnResult() {
+                                @SuppressLint("SetTextI18n")
+                                @Override
+                                public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                                    Log.e("okhttp","打印标题:======" + getIntent().getStringExtra("isValueCard") );
+                                    if ("2".equals(getIntent().getStringExtra("isValueCard"))) {
+                                        //车主服务签约
+                                        Intent intent = new Intent();
+                                        intent.putExtra("orderId", getIntent().getStringExtra("orderId")); //车牌号
+                                        intent.setClass(DefrayActivity.this, SignUpActivity.class); //签约
+                                        startActivity(intent);
+                                        finish();
+                                    } else {
+                                        LiveEventBus.get("homeOneUpdateData").post("");
+                                        startActivity(ETCHandleCompleteActivity.class);
+                                        finish();
+                                    }
+                                }
+                            });
+                } else {
+                    Intent intent = new Intent();
+                    intent.putExtra("orderId", getIntent().getStringExtra("orderId")); //车牌号
+                    intent.putExtra("isvaluecard", getIntent().getStringExtra("isvaluecard"));
+                    intent.setClass(DefrayActivity.this, PaymentList.class); //签约
+                    startActivity(intent);
+                    finish();
                 }
+
+
+//                switch (bizContent.getTradeState()) {
+//                    case "SUCCESS": //支付成功
+//
+//                        break;
+//                    case "PAYING": //支付中
+//                        msg = "订单支付中...";
+//                        break;
+//                    case "FAILED": //支付失败
+//                        msg = "支付失败";
+//                        break;
+//                    case "UNPAY": //未支付
+//                        msg = "未支付";
+//                        break;
+//                    case "CLOSED": //已关闭
+//                        msg = "已关闭";
+//                        break;
+//                    case "CANCELED": //已撤销
+//                        msg = "已撤销";
+//                        break;
+//                    case "REFUND": //转入退费
+//                        msg = "转入退费";
+//                        break;
+//                }
+//                if (!Objects.equals(bizContent.getTradeState(), "SUCCESS")) {
+//                    new Utils().showMessDialog(getActivity(), msg, dialog -> {
+//                    });
+//                }
             }
 
             @Override

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

@@ -135,6 +135,7 @@ public class ETCHandleSonActivity extends AppActivity {
                                 Intent intent = new Intent();
                                 intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
                                 intent.putExtra("id", biz.getId() + "");
+                                intent.putExtra("isValueCard", getIntent().getStringExtra("isValueCard"));
                                 intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
                                 startActivity(intent);
                                 ETCHandleSonActivity.this.finish();
@@ -150,6 +151,7 @@ public class ETCHandleSonActivity extends AppActivity {
                                                 Intent intent = new Intent();
                                                 intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
                                                 intent.putExtra("id", biz.getId() + "");
+                                                intent.putExtra("isValueCard", getIntent().getStringExtra("isValueCard"));
                                                 intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
                                                 startActivity(intent);
                                                 ETCHandleSonActivity.this.finish();
@@ -173,6 +175,7 @@ public class ETCHandleSonActivity extends AppActivity {
                     Intent intent = new Intent();
                     intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
                     intent.putExtra("id", biz.getId() + "");
+                    intent.putExtra("isValueCard", getIntent().getStringExtra("isValueCard"));
                     intent.setClass(ETCHandleSonActivity.this, DefrayActivity.class);
                     startActivity(intent);
                     ETCHandleSonActivity.this.finish();

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

@@ -55,7 +55,7 @@ public class InformationConfirmedActivity extends AppActivity implements StatusA
         if ("2".equals(getIntent().getStringExtra("type"))) {
             binding.lyHzzl.setVisibility(View.VISIBLE);//核载质量
             binding.layoutCzs.setVisibility(View.VISIBLE);//车轴数
-        }else {
+        } else {
             binding.lyHzzl.setVisibility(View.GONE);//核载质量
             binding.layoutCzs.setVisibility(View.GONE);//车轴数
         }
@@ -66,7 +66,7 @@ public class InformationConfirmedActivity extends AppActivity implements StatusA
         fatherBean.bizContent.setId(id);
         destroy();
         showLoading();
-        MyRetrofit.newInstance(this,IFCode.IFCODE149, fatherBean.bizContent, new MyRetrofit.ReturnResult() {
+        MyRetrofit.newInstance(this, IFCode.IFCODE149, fatherBean.bizContent, new MyRetrofit.ReturnResult() {
             @SuppressLint("SetTextI18n")
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
@@ -78,7 +78,7 @@ public class InformationConfirmedActivity extends AppActivity implements StatusA
                 }
                 binding.text1.setText(bizContent1.getVehiclePlate());
                 binding.text2.setText(bizContent1.getVehiclePlateColorStr());
-                binding.textCllx.setText(EnumBean.backValue(bizContent1.getVehicleClass(),EnumBean.CAR_TYPE));//车型
+                binding.textCllx.setText(EnumBean.backValue(bizContent1.getVehicleClass(), EnumBean.CAR_TYPE));//车型
                 binding.text3.setText(bizContent1.getVehicleType()); //收费车型
                 binding.text4.setText(bizContent1.getVehicleApprovedCount() + "人"); //核载人数
                 binding.text6.setText(bizContent1.getVehicleDimensions() + " mm"); //车辆尺寸
@@ -88,7 +88,7 @@ public class InformationConfirmedActivity extends AppActivity implements StatusA
                 }
                 binding.text5.setText(bizContent1.getVehiclePermittedWeight()); //核定载质量
                 binding.text7.setText(bizContent1.getCustomerName()); //姓名
-                binding.text8.setText(EnumBean.backValue(bizContent1.getCustomerIdtype(),EnumBean.ID_TYPE)); //证件类型
+                binding.text8.setText(EnumBean.backValue(bizContent1.getCustomerIdtype(), EnumBean.ID_TYPE)); //证件类型
                 binding.text9.setText(bizContent1.getCustomerIdnum()); //证件号
                 binding.text11.setText(bizContent1.getCustomerIdVld()); //证件有效日期
                 binding.text12.setText(bizContent1.getCustomerTel()); //用户联系方式
@@ -110,15 +110,50 @@ public class InformationConfirmedActivity extends AppActivity implements StatusA
             public void onClick(View v) {
                 Bundle bundle = new Bundle();
                 bundle.putString("orderId", getIntent().getStringExtra("orderId"));
-                bundle.putString("bizContent",getIntent().getStringExtra("bizContent"));
-                bundle.putString("isValueCard",getIntent().getStringExtra("isValueCard"));
-                if ("1".equals(getIntent().getStringExtra("isValueCard"))){
-                    jumpToPage(AddPurchaseChooseActivity.class,bundle);
-                    finish();
-                }else {//1记账卡签约
-                    jumpToPage(SignUpActivity.class,bundle);
-                    finish();
-                }
+                bundle.putString("bizContent", getIntent().getStringExtra("bizContent"));
+                bundle.putString("isValueCard", getIntent().getStringExtra("isValueCard"));
+
+
+                Log.e("okhttp", "打印标题:====" + getIntent().getStringExtra("isValueCard"));
+                //支付订单
+                FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
+                fatherBean.bizContent = new SendTheVerificationCodeBean();
+                fatherBean.bizContent.setOrderId(getIntent().getStringExtra("orderId")); //设置订单Id
+                //提交车辆信息
+                MyRetrofit.newInstance(getActivity(), IFCode.IFCODE_DETECTION, fatherBean.bizContent, new MyRetrofit.ReturnResult() {
+                    @SuppressLint("SetTextI18n")
+                    @Override
+                    public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                        if ("ALLSUCCESS".equals(bizContent.paymentStatus)) {
+                            if ("2".equals(getIntent().getStringExtra("isValueCard"))) {
+                                //车主服务签约
+                                Intent intent = new Intent();
+                                intent.putExtra("orderId", getIntent().getStringExtra("orderId")); //车牌号
+                                intent.setClass(getActivity(), SignUpActivity.class); //签约
+                                startActivity(intent);
+                                finish();
+                            } else {
+                                LiveEventBus.get("homeOneUpdateData").post("");
+                                startActivity(ETCHandleCompleteActivity.class);
+                                finish();
+                            }
+                        } else {
+                            if ("1".equals(getIntent().getStringExtra("isValueCard"))) {
+                                jumpToPage(AddPurchaseChooseActivity.class, bundle);
+                                finish();
+                            } else {//1记账卡签约
+//                    jumpToPage(SignUpActivity.class, bundle);
+//                    finish();
+                                LiveEventBus.get("homeOneUpdateData").post("");
+                                bundle.putString("bizContent", getIntent().getStringExtra("bizContent"));
+                                bundle.putString("orderId", getIntent().getStringExtra("orderId"));
+                                bundle.putString("isValueCard", getIntent().getStringExtra("isValueCard"));
+                                jumpToPage(AddPurchaseChooseActivity.class, bundle);
+                                finish();
+                            }
+                        }
+                    }
+                });
 
                 /*if ("1".equals(start)) {//存储卡
                     //订单支付
@@ -146,8 +181,8 @@ public class InformationConfirmedActivity extends AppActivity implements StatusA
                 intent.putExtra("start", true);
                 intent.putExtra("id", id);
                 intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
-                intent.putExtra("userType",getIntent().getStringExtra("userType"));
-                intent.putExtra("type",getIntent().getStringExtra("type"));
+                intent.putExtra("userType", getIntent().getStringExtra("userType"));
+                intent.putExtra("type", getIntent().getStringExtra("type"));
                 intent.setClass(InformationConfirmedActivity.this, IdentityInformationUploadActivity.class);
                 startActivity(intent);
             }
@@ -163,8 +198,8 @@ public class InformationConfirmedActivity extends AppActivity implements StatusA
                 intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
                 intent.putExtra("vehiclePlate", getIntent().getStringExtra("vehiclePlate"));
                 intent.putExtra("vehiclePlateColor", getIntent().getStringExtra("vehiclePlateColor"));
-                intent.putExtra("userType",getIntent().getStringExtra("userType"));
-                intent.putExtra("type",getIntent().getStringExtra("type"));
+                intent.putExtra("userType", getIntent().getStringExtra("userType"));
+                intent.putExtra("type", getIntent().getStringExtra("type"));
                 intent.setClass(InformationConfirmedActivity.this, VehicleInformationActivity.class);
                 startActivity(intent);
             }

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

@@ -109,7 +109,6 @@ public class MainActivity extends AppActivity implements
     @Override
     protected void initData() {
         init();
-
         getEnumList();
     }
 

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

@@ -0,0 +1,132 @@
+package com.huntersun.vkyes.etcopencard.project.ui.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.CompoundButton;
+
+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.ActivityPaymentListBinding;
+import com.huntersun.vkyes.etcopencard.project.api.FatherBean;
+import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit;
+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.tool.QRCode;
+import com.huntersun.vkyes.etcopencard.project.utils.Constants;
+import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
+import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
+import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+import com.jeremyliao.liveeventbus.LiveEventBus;
+
+/**
+ * @author admin
+ */
+public class PaymentList extends AppActivity {
+    private ActivityPaymentListBinding binding;
+
+    @Override
+    protected View getLayoutView() {
+        binding = ActivityPaymentListBinding.inflate(getLayoutInflater());
+        return binding.getRoot();
+    }
+
+    @Override
+    protected void initView() {
+        Log.e("okhttp","打印标题:====" + getIntent().getStringExtra("isValueCard") );
+        binding.recycler.setAdapter(adapter);
+        //支付订单
+        FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
+        fatherBean.bizContent = new SendTheVerificationCodeBean();
+        fatherBean.bizContent.setOrderId(getIntent().getStringExtra("orderId")); //设置订单Id
+        //提交车辆信息
+        MyRetrofit.newInstance(this, IFCode.IFCODE_DETECTION, fatherBean.bizContent, new MyRetrofit.ReturnResult() {
+            @SuppressLint("SetTextI18n")
+            @Override
+            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                if ("ALLSUCCESS".equals(bizContent.paymentStatus)) {
+                    //支付订单
+                    FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
+                    fatherBean.bizContent = new SendTheVerificationCodeBean();
+                    fatherBean.bizContent.setOrderId(getIntent().getStringExtra("orderId")); //设置订单Id
+                    //提交车辆信息
+                    MyRetrofit.newInstance(getActivity(), IFCode.IFCODE_DETECTION,
+                            fatherBean.bizContent, new MyRetrofit.ReturnResult() {
+                                @SuppressLint("SetTextI18n")
+                                @Override
+                                public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                                    Log.e("okhttp","打印标题:======" + getIntent().getStringExtra("isValueCard") );
+                                    if ("2".equals(getIntent().getStringExtra("isValueCard"))) {
+                                        //车主服务签约
+                                        Intent intent = new Intent();
+                                        intent.putExtra("orderId", getIntent().getStringExtra("orderId")); //车牌号
+                                        intent.setClass(PaymentList.this, SignUpActivity.class); //签约
+                                        startActivity(intent);
+                                        finish();
+                                    } else {
+                                        LiveEventBus.get("homeOneUpdateData").post("");
+                                        startActivity(ETCHandleCompleteActivity.class);
+                                        finish();
+                                    }
+                                }
+                            });
+                } else {
+                    adapter.replaceData(bizContent.datas);
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    BaseQuickAdapter<ResultBean.BizContent, BaseViewHolder> adapter =
+            new BaseQuickAdapter<ResultBean.BizContent, BaseViewHolder>(R.layout.item_product_ioc_two) {
+                @Override
+                protected void convert(BaseViewHolder helper, ResultBean.BizContent item) {
+                    try {
+                        helper.setText(R.id.text3, (Float.parseFloat(item.getFee()) * 0.01) + "");
+                    } catch (Exception e) {
+                        helper.setText(R.id.text3, "0");
+                    }
+                    helper.setText(R.id.text1, "HANDLE".equals(item.payType) ? "办理费" :
+                            "MARGIN".equals(item.payType) ? "保证金" :
+                                    "PRESTORE".equals(item.payType) ? "预存金" : "权益费");
+                    helper.setText(R.id.text2, "SUCCESS".equals(item.payStatus) ? "支付成功" :
+                            "PAYING".equals(item.payStatus) ? "支付中" :
+                                    "FAILED".equals(item.payStatus) ? "支付失败" :
+                                            "UNPAY".equals(item.payStatus) ? "未支付" :
+                                                    "CLOSED".equals(item.payStatus) ? "已关闭" :
+                                                            "CANCELED".equals(item.payStatus) ? "已撤销" : "转入退费");
+                    helper.setOnClickListener(R.id.layout, new View.OnClickListener() {
+                        @Override
+                        @SingleClick
+                        public void onClick(View v) {
+                            if ("SUCCESS".equals(item.payStatus)) {
+                                toast("已支付"); //invoke Mini Program API
+                            } else {
+                                Intent intent = new Intent();
+                                intent.putExtra("orderId", item.getOrderId());
+                                intent.putExtra("id", item.getId() + "");
+                                intent.putExtra("payType", item.payType);
+                                intent.putExtra("isValueCard", getIntent().getStringExtra("isValueCard"));
+                                intent.setClass(PaymentList.this, DefrayActivity.class);
+                                startActivity(intent);
+                            }
+                        }
+                    });
+                }
+            };
+}

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

@@ -20,6 +20,7 @@ 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 com.jeremyliao.liveeventbus.LiveEventBus;
 import com.ruffian.library.widget.RRelativeLayout;
 
 import java.util.ArrayList;
@@ -71,11 +72,26 @@ public class SignUpActivity extends AppActivity {
             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(ContractActivity.class,bundle);
+//                    Bundle bundle = new Bundle();
+//                    bundle.putString("orderId", getIntent().getStringExtra("orderId"));
+//                    bundle.putString("bizContent",getIntent().getStringExtra("bizContent"));
+//                    bundle.putString("isValueCard",getIntent().getStringExtra("isValueCard"));
+//                    jumpToPage(ContractActivity.class,bundle);
+//                    finish();
+
+//                    LiveEventBus.get("homeOneUpdateData").post("");
+//                    Bundle bundle = new Bundle();
+//                    bundle.putString("bizContent", getIntent().getStringExtra("bizContent"));
+//                    bundle.putString("orderId", getIntent().getStringExtra("orderId"));
+//                    bundle.putString("isValueCard",getIntent().getStringExtra("isValueCard"));
+//                    jumpToPage(AddPurchaseChooseActivity.class,bundle);
+//                    finish();
+
+                    //车主服务签约
+                    Intent intent = new Intent();
+                    intent.putExtra("orderId", getIntent().getStringExtra("orderId")); //车牌号
+                    intent.setClass(SignUpActivity.this, ContractActivity.class); //签约
+                    startActivity(intent);
                     finish();
                 }
             }

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

@@ -24,12 +24,12 @@ import com.huntersun.vkyes.etcopencard.project.copapply.OBURequest;
 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.DefrayActivity;
 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.PaymentList;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.VehicleInformationActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.CardUnlockPinActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.after.EquipmentLossReportActivity;
@@ -308,6 +308,7 @@ public class OrderUtils {
                 intent.putExtra("bizContent", JSON.toJSONString(productBean));
                 intent.putExtra("orderId", orderData.getOrderId());
                 intent.putExtra("id", orderData.getId() + "");
+                intent.putExtra("isValueCard", orderData.getIsValueCard() + "");
                 if(Integer.parseInt(orderData.getOrderStep())==Constants.ORDER_STATUS_WAIT_PAY){
                     //签约完未生成支付二维码，可以更改加购权益
                     intent.putExtra("isPay","0");
@@ -317,7 +318,8 @@ public class OrderUtils {
                 if (null==orderData.getProductId()||"".equals(orderData.getProductId())){//未绑定成功订单，重新跳转绑定
                     intent.setClass(context,ETCHandleActivity.class);
                 }else {
-                    intent.setClass(context, ETCHandleSonActivity.class);
+//                    intent.setClass(context, ETCHandleSonActivity.class);
+                    intent.setClass(context, PaymentList.class);
                 }
                 context.startActivity(intent);
             }

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

@@ -24,7 +24,6 @@ import com.huntersun.vky.obublelib.util.ToastUtil;
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.project.api.bean.EquityBean;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
-import com.huntersun.vkyes.etcopencard.project.ui.activity.ETCHandleSonActivity;
 import com.huntersun.vkyes.etcopencard.project.view.CommonItemDecoration;
 import com.huntersun.vkyes.etcopencard.project.view.LeftSlideView;
 import com.huntersun.vkyes.etcopencard.src.http.glide.GlideApp;

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

@@ -164,7 +164,6 @@ public final class LoginActivity extends AppActivity implements KeyboardWatcher.
                             .show();
                 }
             }
-
             @Override
             public void onError(Response<Result> resp) {
                 MyRetrofit.ReturnResult.super.onError(resp);

app/src/main/res/layout-v3/item_product_ioc_two.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dp_95"
+    android:layout_marginHorizontal="@dimen/dp_15"
+    android:background="@mipmap/product_bg1"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_20">
+
+        <TextView
+            android:id="@+id/text3"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="99"
+            android:textColor="#FFFFFF"
+            android:textSize="44sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="right"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/text1"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:text="【客车】微信车主服务"
+                android:textColor="#FFFFFF"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/text2"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:text="先通行后付费！"
+                android:textColor="#E6E6E6"
+                android:textSize="11sp" />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+    <View style="@style/HorizontalLineStyle" />
+
+</LinearLayout>

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

@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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">
+
+    <com.hjq.bar.TitleBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/video_ball_bg12"
+        app:leftIcon="@mipmap/back_three"
+        app:lineVisible="false"
+        app:titleColor="#FFFFFF" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_15"
+        android:background="@drawable/video_ball_bg13"
+        android:paddingHorizontal="@dimen/dp_15"
+        android:paddingVertical="@dimen/dp_20">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            tools:ignore="DisableBaselineAlignment">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1" />
+
+                    <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+
+                        <ImageView
+                            android:layout_width="@dimen/dp_30"
+                            android:layout_height="30dp"
+                            android:src="@mipmap/flow_off1" />
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right|bottom"
+                            android:src="@mipmap/complete" />
+                    </FrameLayout>
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="基本信息"
+                    android:textColor="@color/white"
+                    android:textSize="11sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
+
+                    <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+
+                        <ImageView
+                            android:layout_width="@dimen/dp_30"
+                            android:layout_height="30dp"
+                            android:src="@mipmap/flow_off2" />
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right|bottom"
+                            android:src="@mipmap/complete" />
+                    </FrameLayout>
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="个人信息"
+                    android:textColor="#FFFFFF"
+                    android:textSize="11sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical"
+                tools:ignore="UseCompoundDrawables">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
+
+                    <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+
+                        <ImageView
+                            android:layout_width="@dimen/dp_30"
+                            android:layout_height="30dp"
+                            android:src="@mipmap/flow_off3" />
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right|bottom"
+                            android:src="@mipmap/complete" />
+                    </FrameLayout>
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="车辆信息"
+                    android:textColor="@color/white"
+                    android:textSize="11sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ly_qiany"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical"
+                tools:ignore="UseCompoundDrawables">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
+
+                    <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
+
+                        <ImageView
+                            android:layout_width="@dimen/dp_30"
+                            android:layout_height="30dp"
+                            android:src="@mipmap/flow_off4" />
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right|bottom"
+                            android:src="@mipmap/complete" />
+                    </FrameLayout>
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="签约"
+                    android:textColor="@color/white"
+                    android:textSize="11sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical"
+                tools:ignore="UseCompoundDrawables">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
+
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:src="@mipmap/flow5" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="订单支付"
+                    android:textColor="@color/white"
+                    android:textSize="11sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+</LinearLayout>

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

@@ -11,292 +11,294 @@
         android:layout_height="wrap_content"
         android:background="@drawable/video_ball_bg12"
         app:leftIcon="@mipmap/back_three"
-        app:title="支付账户签约"
         app:lineVisible="false"
+        app:title="支付账户签约"
         app:titleColor="@color/white" />
 
-        <FrameLayout
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_15"
+        android:background="@drawable/video_ball_bg13"
+        android:paddingHorizontal="@dimen/dp_15"
+        android:paddingVertical="@dimen/dp_20"
+        android:visibility="gone">
+
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_15"
-            android:background="@drawable/video_ball_bg13"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:paddingVertical="@dimen/dp_20">
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            tools:ignore="DisableBaselineAlignment">
 
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                tools:ignore="DisableBaselineAlignment">
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:gravity="center"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:orientation="horizontal">
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1" />
 
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="2dp"
-                            android:layout_weight="1" />
+                    <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                        <FrameLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content">
+                        <ImageView
+                            android:layout_width="@dimen/dp_30"
+                            android:layout_height="30dp"
+                            android:src="@mipmap/flow_off1" />
 
-                            <ImageView
-                                android:layout_width="@dimen/dp_30"
-                                android:layout_height="30dp"
-                                android:src="@mipmap/flow_off1" />
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right|bottom"
+                            android:src="@mipmap/complete" />
+                    </FrameLayout>
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="right|bottom"
-                                android:src="@mipmap/complete" />
-                        </FrameLayout>
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
 
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="2dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/shape_dashed_line_blue2" />
+                </LinearLayout>
 
-                    </LinearLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="基本信息"
+                    android:textColor="@color/white"
+                    android:textSize="11sp" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:text="基本信息"
-                        android:textColor="@color/white"
-                        android:textSize="11sp" />
+            </LinearLayout>
 
-                </LinearLayout>
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:gravity="center"
-                    android:orientation="vertical">
+                    android:orientation="horizontal">
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:orientation="horizontal">
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
 
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="2dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/shape_dashed_line_blue2" />
+                    <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                        <FrameLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content">
+                        <ImageView
+                            android:layout_width="@dimen/dp_30"
+                            android:layout_height="30dp"
+                            android:src="@mipmap/flow_off2" />
 
-                            <ImageView
-                                android:layout_width="@dimen/dp_30"
-                                android:layout_height="30dp"
-                                android:src="@mipmap/flow_off2" />
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right|bottom"
+                            android:src="@mipmap/complete" />
+                    </FrameLayout>
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="right|bottom"
-                                android:src="@mipmap/complete" />
-                        </FrameLayout>
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
 
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="2dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/shape_dashed_line_blue2" />
+                </LinearLayout>
 
-                    </LinearLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="个人信息"
+                    android:textColor="#FFFFFF"
+                    android:textSize="11sp" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:text="个人信息"
-                        android:textColor="#FFFFFF"
-                        android:textSize="11sp" />
+            </LinearLayout>
 
-                </LinearLayout>
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical"
+                tools:ignore="UseCompoundDrawables">
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:gravity="center"
-                    android:orientation="vertical"
-                    tools:ignore="UseCompoundDrawables">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:orientation="horizontal">
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="2dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/shape_dashed_line_blue2" />
-
-                        <FrameLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content">
+                    android:orientation="horizontal">
 
-                            <ImageView
-                                android:layout_width="@dimen/dp_30"
-                                android:layout_height="30dp"
-                                android:src="@mipmap/flow_off3" />
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
 
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="right|bottom"
-                                android:src="@mipmap/complete" />
-                        </FrameLayout>
+                    <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="2dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/shape_dashed_line_blue2" />
+                        <ImageView
+                            android:layout_width="@dimen/dp_30"
+                            android:layout_height="30dp"
+                            android:src="@mipmap/flow_off3" />
 
-                    </LinearLayout>
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right|bottom"
+                            android:src="@mipmap/complete" />
+                    </FrameLayout>
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:text="车辆信息"
-                        android:textColor="@color/white"
-                        android:textSize="11sp" />
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
 
                 </LinearLayout>
 
-                <LinearLayout
-                    android:layout_width="0dp"
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical"
-                    tools:ignore="UseCompoundDrawables">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:orientation="horizontal">
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="2dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/shape_dashed_line_blue2" />
-
-                        <FrameLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content">
-
-                            <ImageView
-                                android:layout_width="@dimen/dp_30"
-                                android:layout_height="30dp"
-                                android:src="@mipmap/flow4" />
-
-                            <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="right|bottom"
-                                android:src="@mipmap/complete"
-                                android:visibility="gone" />
-                        </FrameLayout>
-
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="2dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/shape_dashed_line_blue2" />
-
-                    </LinearLayout>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:text="签约"
-                        android:textColor="@color/white"
-                        android:textSize="11sp" />
+                    android:layout_marginTop="6dp"
+                    android:text="车辆信息"
+                    android:textColor="@color/white"
+                    android:textSize="11sp" />
 
-                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical"
+                tools:ignore="UseCompoundDrawables">
 
                 <LinearLayout
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:gravity="center"
-                    android:orientation="vertical"
-                    tools:ignore="UseCompoundDrawables">
+                    android:orientation="horizontal">
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:orientation="horizontal">
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
 
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="2dp"
-                            android:layout_weight="1"
-                            android:background="@drawable/shape_dashed_line_blue2" />
+                    <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content">
 
                         <ImageView
-                            android:layout_width="30dp"
+                            android:layout_width="@dimen/dp_30"
                             android:layout_height="30dp"
-                            android:src="@mipmap/flow_off5" />
+                            android:src="@mipmap/flow4" />
 
-                        <View
-                            android:layout_width="0dp"
-                            android:layout_height="2dp"
-                            android:layout_weight="1" />
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="right|bottom"
+                            android:src="@mipmap/complete"
+                            android:visibility="gone" />
+                    </FrameLayout>
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
 
-                    </LinearLayout>
+                </LinearLayout>
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:text="订单支付"
-                        android:textColor="@color/white"
-                        android:textSize="11sp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="签约"
+                    android:textColor="@color/white"
+                    android:textSize="11sp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical"
+                tools:ignore="UseCompoundDrawables">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1"
+                        android:background="@drawable/shape_dashed_line_blue2" />
+
+                    <ImageView
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:src="@mipmap/flow_off5" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="2dp"
+                        android:layout_weight="1" />
 
                 </LinearLayout>
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="订单支付"
+                    android:textColor="@color/white"
+                    android:textSize="11sp" />
+
             </LinearLayout>
 
-        </FrameLayout>
+        </LinearLayout>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_15"
-            android:layout_marginBottom="@dimen/dp_12"
-            android:text="选择支付账户"
-            android:textColor="#333333"
-            android:textSize="@dimen/sp_16" />
+    </FrameLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_15"
+        android:layout_marginBottom="@dimen/dp_12"
+        android:paddingVertical="@dimen/dp_20"
+        android:text="选择支付账户"
+        android:textColor="#333333"
+        android:textSize="@dimen/sp_16" />
 
     <com.scwang.smart.refresh.layout.SmartRefreshLayout
         android:id="@+id/rl_status_refresh"
@@ -320,26 +322,29 @@
 
         </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:layout_gravity="bottom"
+        android:background="@color/white"
         android:orientation="vertical"
         android:paddingTop="@dimen/dp_5"
-        android:layout_gravity="bottom"
-        android:background="@color/white">
+        android:visibility="gone">
+
         <com.ruffian.library.widget.RTextView
+            android:id="@+id/tv_skip"
+            style="@style/whiteTextStyleBold18"
             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"
+            android:layout_marginBottom="@dimen/dp_20"
+            android:gravity="center"
+            android:text="已有签约,跳过"
+            app:corner_radius="@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="已有签约,跳过"/>
+            app:gradient_type="linear" />
     </LinearLayout>
 </LinearLayout>

common.gradle

@@ -7,9 +7,9 @@ android {
         // 最低安装版本
         minSdkVersion 21
         // 目标适配版本
-        //noinspection OldTargetApi
+        //noinspection ExpiredTargetSdkVersion,OldTargetApi
         targetSdkVersion 30
-        versionName '1.0.9'
+        versionName '1.1.0'
         versionCode 11
     }