feat: 样式兼容性修改、下单签约和选择产品逻辑修改

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

@@ -63,7 +63,7 @@ public class MyRetrofit {
         RequestParameters parameters = new RequestParameters(code, new Gson().toJson(bean));
         new MyRetrofit().getRetrofit().create(Api.class)
                 .message2(parameters)
-                .enqueue(new Converter<Result>(null, "加载中...") {
+                .enqueue(new Converter<Result>(null,  "加载中...") {
                     @Override
                     protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                         result.onSuccess(resultBean, bizContent);

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

@@ -3,7 +3,9 @@ package com.huntersun.vkyes.etcopencard.project.api.bean;
 import android.util.Log;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author admin
@@ -12,7 +14,7 @@ public class IFCode {
     private String key;
     private String value;
 
-    public static String getLoadPrompt(String code) {
+   /* public static String getLoadPrompt(String code) {
         String loadPrompt = "";
         List<IFCode> ifCodeList = new ArrayList<>();
         for (String[] item : constants) {
@@ -21,57 +23,44 @@ public class IFCode {
             }
         }
         return loadPrompt;
-    }
+    }*/
 
-    public static String[][] constants = {
-            {IFCode.IFCODE4, "登录中..."},
-            {IFCode.IFCODE5, "登录中..."},
-            {IFCode.IFCODE6, "创建订单中..."},
-            {IFCode.IFCODE7, "取消订单中..."},
-            {IFCode.IFCODE21, "变更个人用户信息中..."},
-            {IFCode.IFCODE22, "提交个人用户信息中..."},
-            {IFCode.IFCODE15, "OCR识别身份证中..."},
-            {IFCode.IFCODE16, "OCR识别行驶证中..."},
-            {IFCode.IFCODE17, "文件上传接口中..."},
-            {IFCode.IFCODE18, "提交车辆信息中..."},
-            {IFCode.IFCODE30, "获取所有的快递公司信息中..."},
-            {IFCode.IFCODE31, "订单发货录入中..."},
-            {IFCode.IFCODE35, "车牌校验中..."},
-            {IFCode.IFCODE36, "订单分页查询中..."},
-            {IFCode.IFCODE48, "根据订单编号获取可选择产品信息中..."},
-            {IFCode.IFCODE56, "订单支付下单接口中..."},
-            {IFCode.IFCODE57, "订单支付结果查询接口中..."},
-            {IFCode.IFCODE146, "卡签注销中..."},
-            {IFCode.IFCODE149, "根据订单ID获取部分订单信息（车辆信息、用户信息）中..."},
-            {IFCode.IFCODE150, "查询全部待发货订单中..."},
-            {IFCode.IFCODE155, "查询全部待发货订单中..."},
-            {IFCode.IFCODE171, "根据车辆ID获取正常的状态储值卡中..."},
-            {IFCode.IFCODE9, "根据订单ID查询订单详情中..."},
-            {IFCode.IFCODE50, "写卡指令申请中..."},
-            {IFCode.IFCODE51, "写卡指令返回中..."},
-            {IFCode.IFCODE52, "统一会员平台个人账号修改密码手机号验证码接口中..."},
-            {IFCode.IFCODE53, "写卡确认中..."},
-            {IFCode.IFCODE73, "卡签绑定中..."},
-            {IFCode.IFCODE77, "OBU发行申请中..."},
-            {IFCode.IFCODE74, "VFJ-修改系统信息中..."},
-            {IFCode.IFCODE75, "VFJ-修改车辆信息中..."},
-            {IFCode.IFCODE78, "BDS-OBU发行确认中..."},
-            {IFCode.IFCODE153, "获取Obu信息中..."},
-            {IFCode.IFCODE154, "获取车辆信息中..."},
-            {IFCode.IFCODE79, "安装申请中..."},
-            {IFCode.IFCODE76, "写激活信息(普通车)--激活OBU中..."},
-            {IFCode.IFCODE80, "安装确认中..."},
-            {IFCode.IFCODE81, "卡签挂起中..."},
-            {IFCode.IFCODE82, "卡签挂失中..."},
-            {IFCode.IFCODE810, "储值卡充值-申请中..."},
-            {IFCode.IFCODE811, "储值卡充值-获取支付(充值申请)中..."},
-            {IFCode.IFCODE812, "储值卡充值-查询支付结果中..."},
-            {IFCode.IFCODE814, "储值卡充值-获取已支付未圈存的充值单(充值检测)中..."},
-            {IFCode.IFCODE815, "储值卡充值-圈存(消费)中..."},
-            {IFCode.IFCODE69, "圈存检测V3中..."},
-            {IFCode.IFCODE70, "圈存申请中..."},
-            {IFCode.IFCODE71, "圈存申请中..."}
-    };
+    // 定义Map常量2
+    public static final Map<String, String> LoadingMsgMap = new HashMap<String, String>();
+    static {
+        LoadingMsgMap.put(IFCode.IFCODE4, "登录中...");
+        LoadingMsgMap.put(IFCode.IFCODE5, "登录中...");
+        LoadingMsgMap.put(IFCode.IFCODE6, "创建订单中...");
+        LoadingMsgMap.put(IFCode.IFCODE7, "取消订单中...");
+        LoadingMsgMap.put(IFCode.IFCODE21, "变更个人用户信息中...");
+        LoadingMsgMap.put(IFCode.IFCODE22, "提交个人用户信息中...");
+        LoadingMsgMap.put(IFCode.IFCODE15, "OCR识别身份证中...");
+        LoadingMsgMap.put(IFCode.IFCODE16, "OCR识别行驶证中...");
+        LoadingMsgMap.put(IFCode.IFCODE17, "文件上传接口中...");
+        LoadingMsgMap.put(IFCode.IFCODE18, "提交车辆信息中...");
+        LoadingMsgMap.put(IFCode.IFCODE30, "获取所有的快递公司信息中...");
+        LoadingMsgMap.put(IFCode.IFCODE31, "订单发货录入中...");
+        LoadingMsgMap.put(IFCode.IFCODE35, "车牌校验中...");
+        LoadingMsgMap.put(IFCode.IFCODE36, "订单分页查询中...");
+        LoadingMsgMap.put(IFCode.IFCODE48, "根据订单编号获取可选择产品信息中...");
+        LoadingMsgMap.put(IFCode.IFCODE56, "订单支付下单接口中...");
+        LoadingMsgMap.put(IFCode.IFCODE57, "订单支付结果查询接口中...");
+        LoadingMsgMap.put(IFCode.IFCODE146, "卡签注销中...");
+        LoadingMsgMap.put(IFCode.IFCODE149, "根据订单ID获取部分订单信息（车辆信息、用户信息）中...");
+        LoadingMsgMap.put(IFCode.IFCODE150, "查询全部待发货订单中...");
+        LoadingMsgMap.put(IFCode.IFCODE155, "查询全部待发货订单中...");
+        LoadingMsgMap.put(IFCode.IFCODE171, "根据车辆ID获取正常的状态储值卡中...");
+        LoadingMsgMap.put(IFCode.IFCODE9, "根据订单ID查询订单详情中...");
+        LoadingMsgMap.put(IFCode.IFCODE50, "写卡指令申请中...");
+        LoadingMsgMap.put(IFCode.IFCODE51, "写卡指令返回中...");
+        LoadingMsgMap.put(IFCode.IFCODE52, "统一会员平台个人账号修改密码手机号验证码接口中...");
+        LoadingMsgMap.put(IFCode.IFCODE53, "写卡确认中...");
+        LoadingMsgMap.put(IFCode.IFCODE73, "卡签绑定中...");
+        LoadingMsgMap.put(IFCode.IFCODE77, "OBU发行申请中...");
+        LoadingMsgMap.put(IFCode.IFCODE74, "VFJ-修改系统信息中...");
+        LoadingMsgMap.put(IFCode.IFCODE75, "VFJ-修改车辆信息中...");
+        LoadingMsgMap.put(IFCode.IFCODE78, "VFJ-修改车辆信息中...");
+    }
 
     public static final String IFCODE4 = "4"; //登录
     public static final String IFCODE5 = "5"; //通过code换取appid

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

@@ -285,7 +285,7 @@ public class ResultBean<T> {
         private String tradeState;
         private String totalFee;
         private String tradeStateDesc;
-        private String isValueCard;
+        private String isValueCard; // 1：储值卡(无需签约) 2：记账卡（需要签约）
         private String positiveImageUrl;
         private String negativeImageUrl;
         private String agentName;

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

@@ -6,9 +6,11 @@ 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 com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
 import com.hjq.base.BaseDialog;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityContractBinding;
@@ -65,45 +67,52 @@ public class ContractActivity extends AppActivity {
     @SingleClick
     public void onClick(View view) {
         LiveEventBus.get("homeOneUpdateData").post("");
-        Intent intent = new Intent();
+        Bundle bundle = new Bundle();
+        bundle.putString("bizContent", getIntent().getStringExtra("bizContent"));
+        bundle.putString("orderId", getIntent().getStringExtra("orderId"));
+        jumpToPage(ETCHandleSonActivity.class,bundle);
+        finish();
+
+        /*Intent intent = new Intent();
         intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
+        intent.putExtra("bizContent", getIntent().getStringExtra("bizContent"));
         intent.setClass(ContractActivity.this, ETCHandleActivity.class);
         startActivity(intent);
-        finish();
+        finish();*/
+
+        //签约检测
+       /* FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
+        fatherBean.bizContent = new SendTheVerificationCodeBean();
+        fatherBean.bizContent.setOrderId(getIntent().getStringExtra("orderId"));
+        Log.e("okhttp", "打印标题:" + new Gson().toJson(fatherBean));
+        MyRetrofit.newInstance(IFCode.IFCODE23, fatherBean, new MyRetrofit.ReturnResult() {
+            @Override
+            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
+                binding.nextStep.setEnabled(true);
+                if ("NORMAL".equals(bizContent1.getUserState())) {
+                    LiveEventBus.get("homeUpdateData").post("更新首页信息内容");
+                    LiveEventBus.get("homeOneUpdateData").post("更新首页列表信息内容");
+                    Intent intent = new Intent();
+                    intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
+                    intent.setClass(ContractActivity.this, ETCHandleActivity.class);
+                    startActivity(intent);
+                    finish();
+                } else if ("OVERDUE".equals(bizContent1.getUserState())) {
+                    showDilog("用户已开通车主服务，但存在欠费，请用户于微信车主服务补缴费用后再次办理。");
+                } else if ("PAUSED".equals(bizContent1.getUserState())) {
+                    showDilog("用户已暂停车主服务，请用户扫码恢复车主服务后再次办理。");
+                } else if ("UNAUTHORIZED".equals(bizContent1.getUserState())) {
+                    showDilog("用户未开通车主服务，请用户扫码办理。");
+                }
+            }
 
-//        //签约检测
-//        FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
-//        fatherBean.bizContent = new SendTheVerificationCodeBean();
-//        fatherBean.bizContent.setOrderId(getIntent().getStringExtra("orderId"));
-//        Log.e("okhttp", "打印标题:" + new Gson().toJson(fatherBean));
-//        MyRetrofit.newInstance(IFCode.IFCODE23, fatherBean, new MyRetrofit.ReturnResult() {
-//            @Override
-//            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
-//                binding.nextStep.setEnabled(true);
-//                if ("NORMAL".equals(bizContent1.getUserState())) {
-//                    LiveEventBus.get("homeUpdateData").post("更新首页信息内容");
-//                    LiveEventBus.get("homeOneUpdateData").post("更新首页列表信息内容");
-//                    Intent intent = new Intent();
-//                    intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
-//                    intent.setClass(ContractActivity.this, ETCHandleActivity.class);
-//                    startActivity(intent);
-//                    finish();
-//                } else if ("OVERDUE".equals(bizContent1.getUserState())) {
-//                    showDilog("用户已开通车主服务，但存在欠费，请用户于微信车主服务补缴费用后再次办理。");
-//                } else if ("PAUSED".equals(bizContent1.getUserState())) {
-//                    showDilog("用户已暂停车主服务，请用户扫码恢复车主服务后再次办理。");
-//                } else if ("UNAUTHORIZED".equals(bizContent1.getUserState())) {
-//                    showDilog("用户未开通车主服务，请用户扫码办理。");
-//                }
-//            }
-//
-//            @Override
-//            public void onError() {
-//                MyRetrofit.ReturnResult.super.onError();
-//                binding.nextStep.setEnabled(true);
-//            }
-//        });
-//        binding.nextStep.setEnabled(false);
+            @Override
+            public void onError() {
+                MyRetrofit.ReturnResult.super.onError();
+                binding.nextStep.setEnabled(true);
+            }
+        });
+        binding.nextStep.setEnabled(false);*/
     }
 
     public void showDilog(String msg) {

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

@@ -2,17 +2,14 @@ package com.huntersun.vkyes.etcopencard.project.ui.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
-import android.text.TextUtils;
+import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+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;
@@ -27,24 +24,20 @@ import com.huntersun.vkyes.etcopencard.project.api.Result;
 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.MyShared;
-import com.huntersun.vkyes.etcopencard.project.tool.QRCode;
 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.http.glide.GlideApp;
 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;
 
-import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
 import retrofit2.Response;
 
 /**
- * ETC办理
+ * ETC办理-选择产品
  *
  * @author admin
  */
@@ -111,11 +104,14 @@ public class ETCHandleActivity extends AppActivity implements OnRefreshLoadMoreL
                 @Override
                 @SingleClick
                 public void onClick(View v) {
-                    Intent intent = new Intent();
-                    intent.putExtra("bizContent", JSON.toJSONString(items));
-                    intent.putExtra("orderId", getIntent().getStringExtra("orderId") + "");
-                    intent.setClass(ETCHandleActivity.this, ETCHandleSonActivity.class);
-                    startActivity(intent);
+                    Bundle bundle = new Bundle();
+                    bundle.putString("bizContent", JSON.toJSONString(items));
+                    bundle.putString("orderId", getIntent().getStringExtra("orderId") + "");
+                    if (items.getIsValueCard().equals("1")){//储值卡-无需签约
+                        jumpToPage(ETCHandleSonActivity.class,bundle);
+                    }else if (items.getIsValueCard().equals("2")){//记账卡-需要签约
+                        jumpToPage(ContractActivity.class,bundle);
+                    }
                 }
             });
         }

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

@@ -1,20 +1,18 @@
 package com.huntersun.vkyes.etcopencard.project.ui.activity;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.annotation.SuppressLint;
 import android.content.Intent;
-import android.os.Bundle;
 import android.view.View;
 
 import com.alibaba.fastjson.JSON;
-import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityEtchandleSonBinding;
 import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 
 /**
+ * 订单支付确认页
+ *
  * @author admin
  */
 public class ETCHandleSonActivity extends AppActivity {

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

@@ -3,16 +3,16 @@ package com.huntersun.vkyes.etcopencard.project.ui.activity;
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Intent;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.blankj.utilcode.util.LogUtils;
 import com.google.gson.Gson;
-import com.hjq.base.BaseDialog;
-import com.huntersun.vky.obublelib.bean.DecryptVehicleApduBean;
 import com.huntersun.vky.obublelib.box.BoxManagers;
-import com.huntersun.vky.obublelib.util.ToastUtil;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityHomeListInfoBinding;
 import com.huntersun.vkyes.etcopencard.project.api.Api;
 import com.huntersun.vkyes.etcopencard.project.api.Converter;
@@ -28,11 +28,8 @@ import com.huntersun.vkyes.etcopencard.project.copapply.ApplyRequst;
 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.copapply.ObuDetailInfoBean;
-import com.huntersun.vkyes.etcopencard.project.tool.MyShared;
 import com.huntersun.vkyes.etcopencard.project.tool.Utils;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.mail.FormDeliveryActivity;
-import com.huntersun.vkyes.etcopencard.project.ui.activity.mail.ListDeliveryActivity;
 import com.huntersun.vkyes.etcopencard.src.action.StatusAction;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
@@ -203,10 +200,16 @@ public class HomeListInfo extends AppActivity implements StatusAction {
                                 break;
                             }
                             case "4": { //"完成签约。待支付"
-                                Intent intent = new Intent();
+                                // TODO 1、按照新逻辑-完成签约代表已经选择产品，所以这里不能跳转产品选择页,但是如果跳转到支付确认页面参数不全
+                                Bundle bundle = new Bundle();
+                                bundle.putString("bizContent", JSON.toJSONString(bizContent1));
+                                bundle.putString("orderId",  bizContent1.getOrderId());
+                                jumpToPage(ETCHandleSonActivity.class,bundle);
+
+                                /*Intent intent = new Intent();
                                 intent.putExtra("orderId", bizContent1.getOrderId()); //客车
                                 intent.setClass(HomeListInfo.this, ETCHandleActivity.class);
-                                startActivity(intent);
+                                startActivity(intent);*/
                                 break;
                             }
                             case "8": { //快速发货

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

@@ -2,11 +2,12 @@ package com.huntersun.vkyes.etcopencard.project.ui.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.widget.ImageView;
 
+import com.blankj.utilcode.util.LogUtils;
 import com.google.gson.Gson;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityInformationConfirmedBinding;
 import com.huntersun.vkyes.etcopencard.project.api.Api;
@@ -19,16 +20,12 @@ 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.MyShared;
-import com.huntersun.vkyes.etcopencard.project.tool.QRCode;
 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.http.glide.GlideApp;
 import com.huntersun.vkyes.etcopencard.src.widget.StatusLayout;
 import com.jeremyliao.liveeventbus.LiveEventBus;
 
-import java.time.format.DateTimeFormatter;
-
 import retrofit2.Response;
 
 /**
@@ -108,7 +105,12 @@ public class InformationConfirmedActivity extends AppActivity implements StatusA
             @Override
             @SingleClick
             public void onClick(View v) {
-                if ("1".equals(start)) {
+                Bundle bundle = new Bundle();
+                bundle.putString("orderId", getIntent().getStringExtra("orderId"));
+                jumpToPage(ETCHandleActivity.class,bundle);
+                finish();
+
+                /*if ("1".equals(start)) {//存储卡
                     //订单支付
                     Intent intent = new Intent();
                     intent.putExtra("orderId", getIntent().getStringExtra("orderId"));
@@ -122,7 +124,7 @@ public class InformationConfirmedActivity extends AppActivity implements StatusA
                     intent.setClass(InformationConfirmedActivity.this, ContractActivity.class); //签约
                     startActivity(intent);
                     finish();
-                }
+                }*/
             }
         });
         //证件信息修改

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

@@ -1,14 +1,9 @@
 package com.huntersun.vkyes.etcopencard.project.ui.activity.after;
 
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 
 import com.google.gson.Gson;
 import com.huntersun.vky.obublelib.box.BoxManagers;
-import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityCancellationBinding;
 import com.huntersun.vkyes.etcopencard.project.api.Api;
 import com.huntersun.vkyes.etcopencard.project.api.Converter;

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

@@ -1,48 +1,22 @@
 package com.huntersun.vkyes.etcopencard.project.ui.activity.mail;
 
 import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.google.gson.Gson;
 import com.huntersun.vky.obublelib.bean.CardInfoBean;
 import com.huntersun.vky.obublelib.bean.DecryptVehicleApduBean;
 import com.huntersun.vky.obublelib.bean.DecryptVehicleBean;
 import com.huntersun.vky.obublelib.box.BoxManagers;
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityInfoTabBinding;
-import com.huntersun.vkyes.etcopencard.databinding.ActivityInformationConfirmedBinding;
-import com.huntersun.vkyes.etcopencard.project.api.Api;
-import com.huntersun.vkyes.etcopencard.project.api.Converter;
-import com.huntersun.vkyes.etcopencard.project.api.FatherBean;
-import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit;
-import com.huntersun.vkyes.etcopencard.project.api.RequestParameters;
-import com.huntersun.vkyes.etcopencard.project.api.Result;
 import com.huntersun.vkyes.etcopencard.project.api.bean.EnumBean;
-import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
-import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
-import com.huntersun.vkyes.etcopencard.project.api.bean.SendTheVerificationCodeBean;
-import com.huntersun.vkyes.etcopencard.project.tool.MyShared;
-import com.huntersun.vkyes.etcopencard.project.ui.activity.ContractActivity;
-import com.huntersun.vkyes.etcopencard.project.ui.activity.ETCHandleActivity;
-import com.huntersun.vkyes.etcopencard.project.ui.activity.IdentityInformationUploadActivity;
-import com.huntersun.vkyes.etcopencard.project.ui.activity.VehicleInformationActivity;
-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.umeng.commonsdk.debug.E;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import retrofit2.Response;
-
 /**
  * @author admin 信息确认
  */

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

@@ -1,20 +1,13 @@
 package com.huntersun.vkyes.etcopencard.project.ui.activity.mail;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.content.Intent;
-import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 
-import com.alibaba.fastjson.JSONArray;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.google.gson.Gson;
 import com.huntersun.vkyes.etcopencard.R;
-import com.huntersun.vkyes.etcopencard.databinding.ActivityDefrayBinding;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityListDeliveryBinding;
 import com.huntersun.vkyes.etcopencard.project.api.Api;
 import com.huntersun.vkyes.etcopencard.project.api.Converter;
@@ -25,8 +18,6 @@ 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.ui.activity.ETCHandleActivity;
-import com.huntersun.vkyes.etcopencard.project.ui.activity.MainActivity;
 import com.huntersun.vkyes.etcopencard.src.action.StatusAction;
 import com.huntersun.vkyes.etcopencard.src.aop.SingleClick;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
@@ -37,6 +28,7 @@ import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
 import retrofit2.Response;
 
 /**

app/src/main/java/com/huntersun/vkyes/etcopencard/src/app/AppActivity.java

@@ -320,4 +320,42 @@ public abstract class AppActivity extends BaseActivity
                 })
                 .show();
     }
+
+    /**
+     * 页面跳转
+     *
+     * @param activityClass
+     * @param bundle
+     * @param isReturn
+     * @param requestCode
+     */
+    public void jumpToPage(@NonNull Class<?> activityClass, Bundle bundle, boolean isReturn,int requestCode) {
+        Intent intent = new Intent();
+        intent.setClass(AppActivity.this, activityClass);
+        if (bundle != null) {
+            intent.putExtras(bundle);
+        }
+        if (isReturn) {
+            startActivityForResult(intent, requestCode);
+        } else {
+            startActivity(intent);
+        }
+        /*String type = activityClass.getSimpleName();
+        if ("PhotoViewActivity".equals(type)) {
+            overridePendingTransition(0, 0);
+        }*/
+    }
+
+    public void jumpToPage(Class<?> activityClass) {
+        jumpToPage(activityClass, null, false, 0);
+    }
+    public void jumpToPage(Class<?> activityClass, Bundle bundle) {
+        jumpToPage(activityClass, bundle, false, 0);
+    }
+    public void jumpToPage(Class<?> activityClass, boolean isReturn, int requestCode) {
+        jumpToPage(activityClass, null, isReturn, requestCode);
+    }
+    public void jumpToPage(Class<?> activityClass, boolean isReturn, Bundle bundle,  int requestCode) {
+        jumpToPage(activityClass, bundle, isReturn, requestCode);
+    }
 }

app/src/main/res/layout-v1/activity_main.xml

@@ -9,7 +9,8 @@
     <com.hjq.widget.layout.NoScrollViewPager
         android:id="@+id/vp"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:paddingBottom="@dimen/dp_35"/>
 
     <RelativeLayout
         android:layout_width="match_parent"

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

@@ -32,11 +32,12 @@
             <TextView
                 android:id="@+id/textOne"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:background="@drawable/state1"
                 android:gravity="center"
                 android:minWidth="@dimen/dp_80"
-                android:padding="@dimen/dp_10"
+                android:paddingLeft="@dimen/dp_10"
+                android:paddingRight="@dimen/dp_10"
                 android:text="新版订单"
                 android:textColor="@color/white"
                 android:textSize="@dimen/sp_14" />
@@ -44,12 +45,13 @@
             <TextView
                 android:id="@+id/textTwo"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:background="#F5F5F5"
                 android:gravity="center"
                 android:minWidth="@dimen/dp_80"
-                android:padding="@dimen/dp_10"
+                android:paddingLeft="@dimen/dp_10"
+                android:paddingRight="@dimen/dp_10"
                 android:text="更换卡签"
                 android:textColor="#666666"
                 android:textSize="@dimen/sp_14" />
@@ -57,12 +59,13 @@
             <TextView
                 android:id="@+id/textThree"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:background="#F5F5F5"
                 android:gravity="center"
                 android:minWidth="@dimen/dp_80"
-                android:padding="@dimen/dp_10"
+                android:paddingLeft="@dimen/dp_10"
+                android:paddingRight="@dimen/dp_10"
                 android:text="增补设备"
                 android:textColor="#666666"
                 android:textSize="@dimen/sp_14" />
@@ -70,19 +73,17 @@
             <TextView
                 android:id="@+id/textFour"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/dp_5"
                 android:background="@drawable/state3_no"
                 android:gravity="center"
                 android:minWidth="@dimen/dp_80"
-                android:padding="@dimen/dp_10"
+                android:paddingLeft="@dimen/dp_10"
+                android:paddingRight="@dimen/dp_10"
                 android:text="售后"
                 android:textColor="@color/text_off"
                 android:textSize="@dimen/sp_14" />
-
-
         </LinearLayout>
-
     </LinearLayout>
 
     <LinearLayout

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

@@ -214,13 +214,14 @@
                         <ImageView
                             android:layout_width="@dimen/dp_30"
                             android:layout_height="30dp"
-                            android:src="@mipmap/flow_off4" />
+                            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:src="@mipmap/complete"
+                            android:visibility="gone"/>
                     </FrameLayout>
 
                     <View
@@ -264,7 +265,7 @@
                     <ImageView
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:src="@mipmap/flow5" />
+                        android:src="@mipmap/flow_off5" />
 
                     <View
                         android:layout_width="0dp"