'2024年7月22日10:10:12'

.gitignore

@@ -4,6 +4,8 @@
 .externalNativeBuild
 build
 captures
+app/debug
+app/release
 
 ._*
 *.iml

app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "versionCode": 34,
       "versionName": "1.3.4",
-      "outputFile": "jz_app_v1.3.4_release_0714.apk"
+      "outputFile": "jz_app_v1.3.4_release_0717.apk"
     }
   ]
 }

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

@@ -37,5 +37,10 @@ public interface Api {
     Call<Result> message2(@Body RequestParameters parameters);
 
     @POST("espeed")
-    Call<Result> messageYd(@Body YdRequestParameters parameters);
+    Call<Result> messageYd(@Body YdRequestParameters parameters);//测试环境
+
+    @POST("xzpt")
+    Call<Result> messageYdZS(@Body YdRequestParameters parameters);
+
+
 }

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

@@ -55,13 +55,22 @@ public class MyRetrofit implements ToastAction {
      * 生产环境
      */
     public static final String Urls = "https://qtzl.etcjz.cn";
-//    private String YDBaseUrl = "https://testydfw.etcjz.cn/";//异地测试环境
-    private String YDBaseUrl = "https://ydfw.etcjz.cn/";//异地测试环境 xzpt/
     private String BaseUrl = "https://qtzl.etcjz.cn" + "/api/";
-//        private String BaseUrl = "https://qtzl.etcjz.cn" + "/dev/api/"; //111中台地址
+//    private String BaseUrl = "https://qtzl.etcjz.cn" + "/dev/api/"; //111中台地址
     public static final String URL_DOWNLOAD_FILE = "https://qtzl.etcjz.cn/default-bucket/";//通行流水下载路径前缀
     public static final String URL_APP_IMG = "https://qtzl.etcjz.cn";//APP图标路径前缀
 
+    /**
+     * 异地测试环境
+     */
+//    private String YDBaseUrl = "https://testydfw.etcjz.cn/";//异地测试环境
+
+    /**
+     * 异地正式环境
+     */
+    private String YDBaseUrl = "https://ydfw.etcjz.cn/";
+
+
     /**
      * http 生产
      */
@@ -212,7 +221,8 @@ public class MyRetrofit implements ToastAction {
         //加密
 //        parameters.setBizContent(SM4Utils.encryptCBC(parameters.getBizContent(), SM4_KEY));
         new MyRetrofit().getYDRetrofit(context).create(Api.class)
-                .messageYd(parameters)
+                .messageYdZS(parameters)
+//                .messageYd(parameters)
                 .enqueue(new YDConverter<Result>(context, start,isYDJM, loadHint,linkedTreeMap.get("filename").toString()) {
                     @Override
                     protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {

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

@@ -204,6 +204,7 @@ public class IFCode {
     public static final String IFCODE1004 = "1004"; //统一门户账号密码登录
     public static final String IFCODE1005 = "1005"; //统一门户手机号验证码登录
     public static final String IFCODE1006 = "1006"; //登录确认（获取Access-Token）
+    public static final String IFCODETOKEN = "2b9345f4bf234719ab6830c94e7e2a6f"; //异地 Token）
     public static final String IFCODE1009 = "1009"; //修改密码
     public static final String IFCODE_ACTIVE_OBUIMG = "4a95e1d90e824ee8a50aa9826617e736";   //设备激活照片上传
     public static final String IFCODE_ADD_OBU = "837c22e80fa34506a0855306d9cbb6f7"; //增补OBU

app/src/main/java/com/huntersun/vkyes/etcopencard/project/tool/QRCode.java

@@ -159,7 +159,8 @@ public class QRCode {
             //写入数组
             is.read(data);
             //用默认的编码格式进行编码
-            result = Base64.encodeToString(data, Base64.NO_CLOSE);
+//            result = Base64.encodeToString(data, Base64.NO_CLOSE);
+            result = Base64.encodeToString(data, Base64.NO_WRAP);
         } catch (Exception e) {
             e.printStackTrace();
             Log.e("log", "打印标题:" + e.getMessage());
@@ -173,8 +174,9 @@ public class QRCode {
             }
 
         }
+        //"data:image/png;base64," +
         Log.e("log","base64:" + result );
-        return "data:image/png;base64," + result;
+        return  result;
     }
 
     /**
@@ -195,7 +197,8 @@ public class QRCode {
             //写入数组
             is.read(data);
             //用默认的编码格式进行编码
-            result = Base64.encodeToString(data, Base64.NO_CLOSE);
+//            result = Base64.encodeToString(data, Base64.NO_CLOSE);
+            result = Base64.encodeToString(data, Base64.NO_WRAP);
         } catch (Exception e) {
             e.printStackTrace();
             Log.e("log", "打印标题:" + e.getMessage());

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

@@ -207,6 +207,7 @@ public class ETCHandleActivity extends AppActivity implements OnRefreshLoadMoreL
 //                        toast("无法获取卡类型");
 //                        return;
 //                    }
+
                     if ("TYMY9901".equals(items.releaseProductStandards.deviceType)) {//异地客服产品
                         Intent intent = new Intent(mContext, YDPlatformLoginActivity.class);
                         intent.putExtra("pageType", 0);

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

@@ -62,7 +62,8 @@ public class YDPlatformLoginActivity extends AppActivity {
 
     @Override
     protected void initData() {
-        Log.e("accesstokenaaaaaaa", "".equals(MyShared.getInstance().get(MyShared.YDTOKEN, "")) + "_" + MyShared.getInstance().get(MyShared.YDTOKEN, ""));
+        Log.e("accesstokenaaaaaaa", "".equals(MyShared.getInstance().get(MyShared.YDTOKEN, "")) +
+                "_" + MyShared.getInstance().get(MyShared.YDTOKEN, ""));
         if ("".equals(MyShared.getInstance().get(MyShared.YDTOKEN, ""))) {
             getToken();
         }
@@ -75,7 +76,8 @@ public class YDPlatformLoginActivity extends AppActivity {
         HashMap<String, String> params = new HashMap<>();
         params.put("filename", YdCode.YDCODE_LOGIN);
         params.put("account", "14268812305");
-        params.put("password", MD5Utils.ToMD5("14268812305wxnw@Aid_z982"));
+        params.put("password", MD5Utils.ToMD5("14268812305S@8iWfr3"));//测试
+//        params.put("password", MD5Utils.ToMD5("14268812305wxnw@Aid_z982"));//正式
         MyRetrofit.ydNewInstance(YDPlatformLoginActivity.this, true, "", params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
@@ -149,12 +151,16 @@ public class YDPlatformLoginActivity extends AppActivity {
                         Intent intent = new Intent(YDPlatformLoginActivity.this, YDPlatformNewlyStep2Activity.class);
                         intent.putExtra("type", getIntent().getStringExtra("type"));//1客车 2货车
                         intent.putExtra("userType", getIntent().getStringExtra("userType"));//1个人 2单位
-//                        intent.putExtra("productId", getIntent().getStringExtra("productId"));
-                        if ("1".equals(getIntent().getStringExtra("type"))){//写死的产品，上线需要改掉
-                            intent.putExtra("productId","520101130000700000004");
-                        }else if ("2".equals(getIntent().getStringExtra("type"))){
-                            intent.putExtra("productId","520101110000060000013");
-                        }
+
+                        intent.putExtra("productId", getIntent().getStringExtra("productId"));
+//                        if ("1".equals(getIntent().getStringExtra("type"))){//写死的产品，上线需要改掉
+////                            intent.putExtra("productId","520101130000700000004");
+//                            intent.putExtra("productId","520101000000000000002");
+//                        }else if ("2".equals(getIntent().getStringExtra("type"))){
+////                            intent.putExtra("productId","520101110000060000013");
+////                            intent.putExtra("productId","520101110000060000016");
+//                            intent.putExtra("productId","520101000000000000002");
+//                        }
                         startActivity(intent);
                     } else{
                         finish();

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

@@ -25,12 +25,11 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
-  *
-  * @ClassName:      ydPlatformNewlyStep2Activity
-  * @Description:    车牌验证页面
-  * @Author:         lujin
-  * @CreateDate:     2024/6/24 17:02
-  */
+ * @ClassName: ydPlatformNewlyStep2Activity
+ * @Description: 车牌验证页面
+ * @Author: lujin
+ * @CreateDate: 2024/6/24 17:02
+ */
 
 public class YDPlatformNewlyStep2Activity extends AppActivity {
 
@@ -50,9 +49,9 @@ public class YDPlatformNewlyStep2Activity extends AppActivity {
         new SearchCarInfoUtils(this, false, new SearchCarInfoUtils.OnCustomReqCallback() {
             @Override
             public void request(String vehicle, int vehicleColor, PopupKeyboard mPopupKeyboard) {
-               checkYdPlateNumber(vehicle,vehicleColor+"");
-               plateNum = vehicle;
-               plateColor = vehicleColor+"";
+                checkYdPlateNumber(vehicle, vehicleColor + "");
+                plateNum = vehicle;
+                plateColor = vehicleColor + "";
             }
         });
     }
@@ -64,30 +63,34 @@ public class YDPlatformNewlyStep2Activity extends AppActivity {
 
     /**
      * 车牌发行认证
+     *
      * @param plateNumber
      * @param plateColor
      */
-    private void checkYdPlateNumber(String plateNumber,String plateColor) {
-        HashMap<String,String> params = new HashMap<>();
-        params.put("plateNum",plateNumber);
-        params.put("plateColor",plateColor);
+    private void checkYdPlateNumber(String plateNumber, String plateColor) {
+        HashMap<String, String> params = new HashMap<>();
+        params.put("plateNum", plateNumber);
+        params.put("plateColor", plateColor);
         params.put("filename", YdCode.YDCODE_CAR_ISSUE);
-        MyRetrofit.ydNewInstance(this,true, "", params, new MyRetrofit.ReturnResult() {
+        MyRetrofit.ydNewInstance(this, true, "", params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-                LinkedTreeMap<String,Object> linkedTreeMap = JSONObject.parseObject(resultBean.getBizContent().toString(),LinkedTreeMap.class);
-                if (null!=linkedTreeMap.get("vehicleId")){
+                LinkedTreeMap<String, Object> linkedTreeMap = JSONObject.parseObject(resultBean.getBizContent().toString(), LinkedTreeMap.class);
+                if (null != linkedTreeMap.get("vehicleId")) {
                     vehicleId = linkedTreeMap.get("vehicleId").toString();
                 }
-                switch (linkedTreeMap.get("result").toString()){
+                switch (linkedTreeMap.get("result").toString()) {
                     case "1":
-                        new Utils().showMessDialog(YDPlatformNewlyStep2Activity.this, plateNumber+"在发行方已办理");
+                        new Utils().showMessDialog(YDPlatformNewlyStep2Activity.this,
+                                null != linkedTreeMap.get("info").toString() ? linkedTreeMap.get("info").toString() : plateNumber + "在发行方已办理");
                         break;
                     case "2":
-                        new Utils().showMessDialog(YDPlatformNewlyStep2Activity.this, plateNumber+"已在统一平台办理");
+                        new Utils().showMessDialog(YDPlatformNewlyStep2Activity.this,
+                                null != linkedTreeMap.get("info").toString() ? linkedTreeMap.get("info").toString() : plateNumber + "已在统一平台办理");
                         break;
                     case "3":
-                        new Utils().showMessDialog(YDPlatformNewlyStep2Activity.this, null!=linkedTreeMap.get("info").toString() ? linkedTreeMap.get("info").toString() : "未关联");
+                        new Utils().showMessDialog(YDPlatformNewlyStep2Activity.this,
+                                null != linkedTreeMap.get("info").toString() ? linkedTreeMap.get("info").toString() : "未关联");
                         break;
                     case "4":
                         checkUserAccountList();
@@ -103,67 +106,66 @@ public class YDPlatformNewlyStep2Activity extends AppActivity {
     /**
      * 检测是否存在账户，获取用户列表
      */
-    private void checkUserAccountList(){
-        HashMap<String,String> params = new HashMap<>();
+    private void checkUserAccountList() {
+        HashMap<String, String> params = new HashMap<>();
         params.put("filename", YdCode.YDCODE_USERLIST);
-        MyRetrofit.ydNewInstance(this, true,"", params, new MyRetrofit.ReturnResult() {
+        MyRetrofit.ydNewInstance(this, true, "", params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
-                LinkedTreeMap<String,Object> linkedTreeMap = JSONObject.parseObject(resultBean.getBizContent().toString(),LinkedTreeMap.class);
-                List<ResultBean.BizContent> dataList = (List<ResultBean.BizContent>) JSON.parseArray(linkedTreeMap.get("data").toString(),ResultBean.BizContent.class);
-                if (null!=dataList&&dataList.size()>0){//存在账户直接去车辆信息上传，行驶证认证
+                LinkedTreeMap<String, Object> linkedTreeMap =
+                        JSONObject.parseObject(resultBean.getBizContent().toString(), LinkedTreeMap.class);
+                List<ResultBean.BizContent> dataList = (List<ResultBean.BizContent>)
+                        JSON.parseArray(linkedTreeMap.get("data").toString(), ResultBean.BizContent.class);
+                if (null != dataList && dataList.size() > 0) {//存在账户直接去车辆信息上传，行驶证认证
                     List<ResultBean.BizContent> list = dataList;
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                        list = list.stream().filter(item->item.accountType.equals(getIntent().getStringExtra("userType"))).collect(Collectors.toList());
-                    }else {
+                        list = list.stream().filter(item -> item.accountType.equals(getIntent().getStringExtra("userType"))).collect(Collectors.toList());
+                    } else {
                         for (int i = 0; i < list.size(); i++) {
-                            if (!list.get(i).accountType.equals(getIntent().getStringExtra("userType"))){
+                            if (!list.get(i).accountType.equals(getIntent().getStringExtra("userType"))) {
                                 list.remove(i);
                                 i--;
                             }
                         }
                     }
-                    if (list.size()>0){//存在对应类型的账户
-                        MyShared.getInstance().put(MyShared.YDACCOUNTID,list.get(0).accountId);
-                        if ("2".equals(getIntent().getStringExtra("type"))){
-                            Intent intent = new Intent(YDPlatformNewlyStep2Activity.this, YDPlatformNewlyStep1Activity.class);
-                            intent.putExtra("type",getIntent().getStringExtra("type"));//1客车 2货车
-                            intent.putExtra("userType",getIntent().getStringExtra("userType"));//1个人 2企业
-                            intent.putExtra("productId",getIntent().getStringExtra("productId"));
-                            intent.putExtra("vehicleId",vehicleId);
-                            intent.putExtra("plateNum",plateNum);
-                            intent.putExtra("plateColor",plateColor);
-                            startActivity(intent);
-                        }else {
-                            Intent intent = new Intent(YDPlatformNewlyStep2Activity.this, YDPlatformNewlyStep4Activity.class);
-                            intent.putExtra("type",getIntent().getStringExtra("type"));//1客车 2货车
-                            intent.putExtra("userType",getIntent().getStringExtra("userType"));//1个人 2企业
-                            intent.putExtra("productId",getIntent().getStringExtra("productId"));
-                            intent.putExtra("vehicleId",vehicleId);
-                            intent.putExtra("plateNum",plateNum);
-                            intent.putExtra("plateColor",plateColor);
-                            startActivity(intent);
+                    if (list.size() > 0) {//存在对应类型的账户
+                        MyShared.getInstance().put(MyShared.YDACCOUNTID, list.get(0).accountId);
+                        //车辆信息上传页面
+
+                        Intent intent = new Intent();
+                        if ("2".equals(getIntent().getStringExtra("type"))) {//货车
+                            intent.setClass(YDPlatformNewlyStep2Activity.this, YDPlatformNewlyStep1Activity.class);
+                        } else {//客车
+                            intent.setClass(YDPlatformNewlyStep2Activity.this, YDPlatformNewlyStep4Activity.class);
                         }
-                    }else {//不存在对应类型的账户
+                        intent.putExtra("type", getIntent().getStringExtra("type"));//1客车 2货车
+                        intent.putExtra("userType", getIntent().getStringExtra("userType"));//1个人 2企业
+                        intent.putExtra("productId", getIntent().getStringExtra("productId"));
+                        intent.putExtra("vehicleId", vehicleId);
+                        intent.putExtra("plateNum", plateNum);
+                        intent.putExtra("plateColor", plateColor);
+                        startActivity(intent);
+                    } else {//不存在对应类型的账户
+                        //用户信息上传页面
                         Intent intent = new Intent(YDPlatformNewlyStep2Activity.this, YDPlatformNewlyStep3Activity.class);
-                        intent.putExtra("type",getIntent().getStringExtra("type"));
-                        intent.putExtra("userType",getIntent().getStringExtra("userType"));
-                        intent.putExtra("productId",getIntent().getStringExtra("productId"));
-                        intent.putExtra("vehicleId",vehicleId);
-                        intent.putExtra("plateNum",plateNum);
-                        intent.putExtra("hasAccount","0");//不需要开个人户
-                        intent.putExtra("plateColor",plateColor);
+                        intent.putExtra("type", getIntent().getStringExtra("type"));
+                        intent.putExtra("userType", getIntent().getStringExtra("userType"));
+                        intent.putExtra("productId", getIntent().getStringExtra("productId"));
+                        intent.putExtra("vehicleId", vehicleId);
+                        intent.putExtra("plateNum", plateNum);
+                        intent.putExtra("hasAccount", "0");//不需要开个人户
+                        intent.putExtra("plateColor", plateColor);
                         startActivity(intent);
                     }
-                }else {//不存在账户，去开户
+                } else {//不存在账户，去开户
                     Intent intent = new Intent(YDPlatformNewlyStep2Activity.this, YDPlatformNewlyStep3Activity.class);
-                    intent.putExtra("type",getIntent().getStringExtra("type"));
-                    intent.putExtra("userType",getIntent().getStringExtra("userType"));
-                    intent.putExtra("productId",getIntent().getStringExtra("productId"));
-                    intent.putExtra("vehicleId",vehicleId);
-                    intent.putExtra("plateNum",plateNum);
-                    intent.putExtra("hasAccount","1");//需要开个人户再开单位户
-                    intent.putExtra("plateColor",plateColor);
+                    intent.putExtra("type", getIntent().getStringExtra("type"));
+                    intent.putExtra("userType", getIntent().getStringExtra("userType"));
+                    intent.putExtra("productId", getIntent().getStringExtra("productId"));
+                    intent.putExtra("vehicleId", vehicleId);
+                    intent.putExtra("hasAccount", "1");//单位需要开个人户再开单位户
+                    intent.putExtra("plateNum", plateNum);
+                    intent.putExtra("plateColor", plateColor);
                     startActivity(intent);
                 }
             }

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

@@ -225,7 +225,12 @@ public class YDPlatformNewlyStep3Activity extends AppActivity {
                 @Override
                 public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                     MyShared.getInstance().put(MyShared.YDACCOUNTID, bizContent.accountId);
-                    Intent intent = new Intent(YDPlatformNewlyStep3Activity.this, YDPlatformNewlyStep4Activity.class);
+                    Intent intent = new Intent();
+                    if ("2".equals(getIntent().getStringExtra("type"))) {//货车
+                        intent.setClass(YDPlatformNewlyStep3Activity.this, YDPlatformNewlyStep1Activity.class);
+                    } else {//客车
+                        intent.setClass(YDPlatformNewlyStep3Activity.this, YDPlatformNewlyStep4Activity.class);
+                    }
                     intent.putExtra("productId", getIntent().getStringExtra("productId"));
                     intent.putExtra("vehicleId", getIntent().getStringExtra("vehicleId"));
                     intent.putExtra("plateNum", getIntent().getStringExtra("plateNum"));
@@ -267,16 +272,16 @@ public class YDPlatformNewlyStep3Activity extends AppActivity {
                     @Override
                     public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                         MyShared.getInstance().put(MyShared.YDACCOUNTID, bizContent.accountId);
-                            Intent intent = new Intent(YDPlatformNewlyStep3Activity.this, YDPlatformNewlyStep3Activity.class);
-                            intent.putExtra("productId", getIntent().getStringExtra("productId"));
-                            intent.putExtra("vehicleId", getIntent().getStringExtra("vehicleId"));
-                            intent.putExtra("plateNum", getIntent().getStringExtra("plateNum"));
-                            intent.putExtra("plateColor", getIntent().getStringExtra("plateColor"));
-                            intent.putExtra("hasAccount", "0");
-                            intent.putExtra("userType", getIntent().getStringExtra("userType"));//1个人 2企业
-                            intent.putExtra("type", getIntent().getStringExtra("type"));//1客车 2货车
-                            startActivity(intent);
-                            finish();
+                        Intent intent = new Intent(YDPlatformNewlyStep3Activity.this, YDPlatformNewlyStep3Activity.class);
+                        intent.putExtra("productId", getIntent().getStringExtra("productId"));
+                        intent.putExtra("vehicleId", getIntent().getStringExtra("vehicleId"));
+                        intent.putExtra("plateNum", getIntent().getStringExtra("plateNum"));
+                        intent.putExtra("plateColor", getIntent().getStringExtra("plateColor"));
+                        intent.putExtra("hasAccount", "0");
+                        intent.putExtra("userType", getIntent().getStringExtra("userType"));//1个人 2企业
+                        intent.putExtra("type", getIntent().getStringExtra("type"));//1客车 2货车
+                        startActivity(intent);
+                        finish();
 
                     }
                 });

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

@@ -16,6 +16,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.google.gson.internal.LinkedTreeMap;
+import com.hjq.base.BaseDialog;
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityYdplatformNewlyStep4Binding;
 import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit;
@@ -35,8 +36,10 @@ import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
 import com.huntersun.vkyes.etcopencard.src.http.glide.GlideApp;
 import com.huntersun.vkyes.etcopencard.src.ui.dialog.DateDialog;
 import com.huntersun.vkyes.etcopencard.src.ui.dialog.MenuDialog;
+import com.huntersun.vkyes.etcopencard.src.ui.dialog.MessageDialog;
 import com.parkingwang.keyboard.OnInputChangedListener;
 import com.parkingwang.keyboard.PopupKeyboard;
+import com.parkingwang.keyboard.view.callback;
 
 import java.io.File;
 import java.util.Arrays;
@@ -187,29 +190,29 @@ public class YDPlatformNewlyStep4Activity extends AppActivity {
 //                }
 //            });
 //        } else {//行驶证识别
-            String type = "";
-            file1 = FileUtil.getSaveFile(getApplication()).getAbsolutePath();
-            if (view == binding.image1) {
-                type = CameraActivity.CONTENT_TYPE_BANK_CARD;
-            } else {
-                type = CameraActivity.CONTENT_TYPE_BANK_BACK;
-            }
-            HashMap<String, String> params = new HashMap<>();
-            params.put("filename", YdCode.YDCODE_OCR_CAR_LICENSE);
-            params.put("side", view == binding.image1 ? "1" : "2");//1正，2反
-            FileUtils.getInstance(this).uploadOcrDrivingLicenseNewYD(true, type, file1, params, new FileUtils.OnOcrUploadCallback2() {
-                @Override
-                public void onSuccess(ResultBean.BizContent bizContent, File file) {
-                    if (view == binding.image1){
-                        imgUrl1 = file.getAbsolutePath();
-                        GlideApp.with(getActivity()).load(file).into(binding.image1);
-                    }else {
-                        imgUrl2 = file.getAbsolutePath();
-                        GlideApp.with(getActivity()).load(file).into(binding.image2);
-                    }
-                    updateView(bizContent, view);
+        String type = "";
+        file1 = FileUtil.getSaveFile(getApplication()).getAbsolutePath();
+        if (view == binding.image1) {
+            type = CameraActivity.CONTENT_TYPE_BANK_CARD;
+        } else {
+            type = CameraActivity.CONTENT_TYPE_BANK_BACK;
+        }
+        HashMap<String, String> params = new HashMap<>();
+        params.put("filename", YdCode.YDCODE_OCR_CAR_LICENSE);
+        params.put("side", view == binding.image1 ? "1" : "2");//1正，2反
+        FileUtils.getInstance(this).uploadOcrDrivingLicenseNewYD(true, type, file1, params, new FileUtils.OnOcrUploadCallback2() {
+            @Override
+            public void onSuccess(ResultBean.BizContent bizContent, File file) {
+                if (view == binding.image1) {
+                    imgUrl1 = file.getAbsolutePath();
+                    GlideApp.with(getActivity()).load(file).into(binding.image1);
+                } else {
+                    imgUrl2 = file.getAbsolutePath();
+                    GlideApp.with(getActivity()).load(file).into(binding.image2);
                 }
-            });
+                updateView(bizContent, view);
+            }
+        });
 //        }
     }
 
@@ -390,7 +393,7 @@ public class YDPlatformNewlyStep4Activity extends AppActivity {
             params.put("type", "1".equals(getIntent().getStringExtra("userType")) ? ("1".equals(getIntent().getStringExtra("type")) ? "1" : "2") : ("1".equals(getIntent().getStringExtra("type")) ? "3" : "4"));
             params.put("productId", getIntent().getStringExtra("productId"));
             params.put("encryptedData", JSONObject.toJSONString(encryptedData));
-            params.put("staffId",MyShared.getInstance().get(MyShared.OPENID,"")+"");
+            params.put("staffId", MyShared.getInstance().get(MyShared.OPENID, "") + "");
             params.put("filename", YdCode.YDCODE_CAR_LICENSE_ISSUE);
             MyRetrofit.ydNewInstance(YDPlatformNewlyStep4Activity.this, true, "", params, new MyRetrofit.ReturnResult() {
                 @Override
@@ -402,18 +405,58 @@ public class YDPlatformNewlyStep4Activity extends AppActivity {
                             //签约页面
                                 intent.setClass(YDPlatformNewlyStep4Activity.this, YDPlatformNewlyStep6Activity.class);
                         } else {//车主不一致
-                            intent.setClass(YDPlatformNewlyStep4Activity.this, YDPlatformNewlyStep5Activity.class);
+//                            intent.setClass(YDPlatformNewlyStep4Activity.this, YDPlatformNewlyStep5Activity.class);
+                            // 消息对话框
+                            new MessageDialog.Builder(YDPlatformNewlyStep4Activity.this)
+                                    // 标题可以不用填写
+                                    .setTitle("提示")
+                                    .setCanceledOnTouchOutside(false)
+                                    .setCancel("上传企业证")
+                                    .setConfirm("上传身份证")
+                                    // 内容必须要填写
+                                    .setMessage("车主身份信息与行驶证所有人信息不一致，请选择上传车主身份证或当前行驶证企业证件")
+                                    .setListener(new MessageDialog.OnListener() {
+                                        @Override
+                                        public void onConfirm(BaseDialog dialog) {
+                                            Intent intent = new Intent(YDPlatformNewlyStep4Activity.this, YDPlatformNewlyStep5Activity.class);
+                                            intent.putExtra("type", getIntent().getStringExtra("type"));//1客车 2货车
+                                            intent.putExtra("userType", getIntent().getStringExtra("userType"));//1个人 2企业
+                                            intent.putExtra("upUserType","1");
+                                            intent.putExtra("productId", getIntent().getStringExtra("productId"));
+                                            intent.putExtra("vehicleId", linkedTreeMap.get("vehicleId").toString());
+                                            intent.putExtra("plateNum", getIntent().getStringExtra("plateNum"));
+                                            intent.putExtra("plateColor", getIntent().getStringExtra("plateColor"));
+                                            startActivity(intent);
+                                        }
+
+                                        @Override
+                                        public void onCancel(BaseDialog dialog) {
+                                            Intent intent = new Intent(YDPlatformNewlyStep4Activity.this, YDPlatformNewlyStep5Activity.class);
+                                            intent.putExtra("type", getIntent().getStringExtra("type"));//1客车 2货车
+                                            intent.putExtra("userType", getIntent().getStringExtra("userType"));//1个人 2企业
+                                            intent.putExtra("productId", getIntent().getStringExtra("productId"));
+                                            intent.putExtra("upUserType","2");
+                                            intent.putExtra("vehicleId", linkedTreeMap.get("vehicleId").toString());
+                                            intent.putExtra("plateNum", getIntent().getStringExtra("plateNum"));
+                                            intent.putExtra("plateColor", getIntent().getStringExtra("plateColor"));
+                                            startActivity(intent);
+                                        }
+                                    })
+                                    .show();
                         }
+
                         intent.putExtra("userType", getIntent().getStringExtra("userType"));//1个人 2企业
                         intent.putExtra("type", getIntent().getStringExtra("type"));//1客车 2货车
-                        intent.putExtra("plateNum",getIntent().getStringExtra("plateNum"));
-                        intent.putExtra("plateColor",getIntent().getStringExtra("plateColor"));
-                        intent.putExtra("productId",getIntent().getStringExtra("productId"));
+                        intent.putExtra("plateNum", getIntent().getStringExtra("plateNum"));
+                        intent.putExtra("plateColor", getIntent().getStringExtra("plateColor"));
+                        intent.putExtra("productId", getIntent().getStringExtra("productId"));
                         intent.putExtra("vehicleId", linkedTreeMap.get("vehicleId").toString());
                         startActivity(intent);
                         finish();
                     } else if ("2".equals(linkedTreeMap.get("result").toString())) {
                         new Utils().showMessDialog(YDPlatformNewlyStep4Activity.this, "认证不通过");
+
+
                     }
                 }
             });

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

@@ -36,7 +36,7 @@ public class YDPlatformNewlyStep5Activity extends AppActivity {
 
     private ActivityYdplatformNewlyStep5Binding binding;
 
-    private String userType = "-1";
+    private String upUserType = "1";//上传的用户类型 个人-1  企业-2
     private String imageIdPo = "";//身份证正面识别Id
     private String imageIdNe = "";//身份证反面识别Id
     private String imageIdCompany = "";//营业证识别Id
@@ -50,22 +50,25 @@ public class YDPlatformNewlyStep5Activity extends AppActivity {
 
     @Override
     protected void initView() {
-        userType = getIntent().getStringExtra("userType");
-        if ("1".equals(userType)){
-            binding.layout3.setVisibility(View.GONE);
-            binding.layout1.setVisibility(View.VISIBLE);
-        }else {
-            binding.layout1.setVisibility(View.GONE);
-            binding.layout3.setVisibility(View.VISIBLE);
-        }
         initClick();
     }
 
     private void initClick() {
+        upUserType = getIntent().getStringExtra("upUserType");
+        if ("2".equals(upUserType)) {
+            binding.layout3.setVisibility(View.VISIBLE);
+            binding.layout1.setVisibility(View.GONE);
+        } else {
+            binding.layout3.setVisibility(View.GONE);
+            binding.layout1.setVisibility(View.VISIBLE);
+        }
         binding.nextStep.setOnClickListener(nextStepListener);
         binding.image1.setOnClickListener(this::onImage);
         binding.image2.setOnClickListener(this::onImage);
         binding.image3.setOnClickListener(this::onImage);
+//        binding.rtxPerson.setOnClickListener(rtxPersonListener);
+//        binding.rtxCompany.setOnClickListener(rtxCompanyListener);
+
     }
 
     @Override
@@ -150,10 +153,35 @@ public class YDPlatformNewlyStep5Activity extends AppActivity {
         }
     }
 
+//    private View.OnClickListener rtxPersonListener = new View.OnClickListener() {
+//
+//        @Override
+//        public void onClick(View view) {//个人
+//                binding.layout3.setVisibility(View.GONE);
+//                binding.layout1.setVisibility(View.VISIBLE);
+//                binding.rtxPerson.setEnabled(false);
+//                binding.rtxCompany.setEnabled(true);
+//                upUserType = "1";
+//
+//        }
+//    };
+
+//    private View.OnClickListener rtxCompanyListener = new View.OnClickListener() {
+//
+//        @Override
+//        public void onClick(View view) {//企业
+//            binding.layout1.setVisibility(View.GONE);
+//            binding.layout3.setVisibility(View.VISIBLE);
+//            binding.rtxCompany.setEnabled(false);
+//            binding.rtxPerson.setEnabled(true);
+//            upUserType = "2";
+//        }
+//    };
+
     private View.OnClickListener nextStepListener = new View.OnClickListener() {
         @Override
         public void onClick(View view) {
-            if ("1".equals(userType)) {
+            if ("1".equals(upUserType)) {
                 if (isSky(binding.text1.getText().toString(), "请输入车主姓名", binding.text1) ||
                         isSky(binding.text3.getText().toString(), "请输入车主身份证号", binding.text3) ||
                         isSky(binding.text4.getText().toString(), "请输入车主住址", binding.text4) ||
@@ -173,17 +201,17 @@ public class YDPlatformNewlyStep5Activity extends AppActivity {
             }
             HashMap<String, String> encryptedData = new HashMap<>();
             HashMap<String, String> params = new HashMap<>();
-            encryptedData.put("driverId", "1".equals(userType) ? binding.text3.getText().toString() : binding.text12.getText().toString());
-            encryptedData.put("driverName", "1".equals(userType) ? binding.text1.getText().toString() : binding.text10.getText().toString());
-            encryptedData.put("driverIdType", "1".equals(userType) ? "101" : "203");
-            encryptedData.put("driverPhone", "1".equals(userType) ? binding.text2.getText().toString() : binding.text13.getText().toString());
-            encryptedData.put("driverAddr", "1".equals(userType) ? binding.text4.getText().toString() : binding.text11.getText().toString());
-            encryptedData.put("imageIdSide1", "1".equals(userType) ? imageIdPo : imageIdCompany);
-            if ("1".equals(userType)) {
+            encryptedData.put("driverId", "1".equals(upUserType) ? binding.text3.getText().toString() : binding.text12.getText().toString());
+            encryptedData.put("driverName", "1".equals(upUserType) ? binding.text1.getText().toString() : binding.text10.getText().toString());
+            encryptedData.put("driverIdType", "1".equals(upUserType) ? "101" : "203");
+            encryptedData.put("driverPhone", "1".equals(upUserType) ? binding.text2.getText().toString() : binding.text13.getText().toString());
+            encryptedData.put("driverAddr", "1".equals(upUserType) ? binding.text4.getText().toString() : binding.text11.getText().toString());
+            encryptedData.put("imageIdSide1", "1".equals(upUserType) ? imageIdPo : imageIdCompany);
+            if ("1".equals(upUserType)) {
                 encryptedData.put("imageIdSide2", imageIdNe);
             }
             params.put("vehicleId", getIntent().getStringExtra("vehicleId"));
-            params.put("driverType", userType);
+            params.put("driverType", upUserType);
             params.put("encryptedData", JSONObject.toJSONString(encryptedData));
             params.put("filename", YdCode.YDCODE_CAROWNER_UPLOAD);
             MyRetrofit.ydNewInstance(YDPlatformNewlyStep5Activity.this, "", params, new MyRetrofit.ReturnResult() {
@@ -194,9 +222,9 @@ public class YDPlatformNewlyStep5Activity extends AppActivity {
                     intent.setClass(YDPlatformNewlyStep5Activity.this, YDPlatformNewlyStep6Activity.class);
                     intent.putExtra("userType", getIntent().getStringExtra("userType"));//1个人 2企业
                     intent.putExtra("type", getIntent().getStringExtra("type"));//1客车 2货车
-                    intent.putExtra("plateNum",getIntent().getStringExtra("plateNum"));
-                    intent.putExtra("productId",getIntent().getStringExtra("productId"));
-                    intent.putExtra("plateColor",getIntent().getStringExtra("plateColor"));
+                    intent.putExtra("plateNum", getIntent().getStringExtra("plateNum"));
+                    intent.putExtra("productId", getIntent().getStringExtra("productId"));
+                    intent.putExtra("plateColor", getIntent().getStringExtra("plateColor"));
                     intent.putExtra("vehicleId", getIntent().getStringExtra("vehicleId"));//车辆认证返回vehicleId
                     startActivity(intent);
                 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/ydplatform/interceptor/TokenFailureInterceptor.java

@@ -4,20 +4,28 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.util.Log;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.internal.LinkedTreeMap;
+import com.hjq.base.BaseDialog;
+import com.huntersun.vkyes.etcopencard.R;
 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.tool.MyShared;
+import com.huntersun.vkyes.etcopencard.project.ui.activity.MainActivity;
+import com.huntersun.vkyes.etcopencard.project.ui.activity.RealUserAuthenticationActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.ydplatform.YDPlatformLoginActivity;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.ydplatform.util.MD5Utils;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.ydplatform.ydCode.YdCode;
+import com.huntersun.vkyes.etcopencard.src.ui.dialog.MessageDialog;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.HashMap;
+import java.util.Map;
 
 import okhttp3.FormBody;
 import okhttp3.Interceptor;
@@ -61,7 +69,8 @@ public class TokenFailureInterceptor implements Interceptor {
             HashMap<String,String> params = new HashMap<>();
             params.put("filename", YdCode.YDCODE_LOGIN);
             params.put("account","14268812305");
-            params.put("password", MD5Utils.ToMD5("14268812305wxnw@Aid_z982"));
+//            params.put("password", MD5Utils.ToMD5("14268812305S@8iWfr3"));
+            params.put("password", MD5Utils.ToMD5("14268812305wxnw@Aid_z982"));//正式
             MyRetrofit.ydNewInstance(true,"", params, new MyRetrofit.ReturnResult() {
                 @Override
                 public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
@@ -69,6 +78,18 @@ public class TokenFailureInterceptor implements Interceptor {
                     MyShared.getInstance().put(MyShared.YDTOKEN,linkedTreeMap.get("token"));
                 }
             });
+//            Map<String, String> params = new HashMap<>();
+//            MyRetrofit.newInstance(IFCode.IFCODETOKEN, params, new MyRetrofit.ReturnResult() {
+//                @Override
+//                public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+//                    LinkedTreeMap<String,String> linkedTreeMap = JSONObject.parseObject(resultBean.getBizContent().toString(),LinkedTreeMap.class);
+//                    Log.e("okhttp","打印标题:" + linkedTreeMap.get("token") );
+//                    MyShared.getInstance().put(MyShared.YDTOKEN,linkedTreeMap.get("token"));
+//                }
+//                @Override
+//                public void onError() {}
+//            });
+
         }else if (linkedTreeMap != null && "4000".equals(linkedTreeMap.get("statusCode") + "")){
             Intent intent = new Intent(context, YDPlatformLoginActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

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

@@ -207,7 +207,7 @@ public class FragmentHomeThree extends TitleBarFragment<MainActivity> implements
 
     @Override
     protected void initData() {
-        getData();
+//        getData();
     }
 
     private void getData() {

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

@@ -23,7 +23,9 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
 import com.gyf.immersionbar.ImmersionBar;
 import com.hjq.base.BaseDialog;
 import com.hjq.umeng.UmengClient;
@@ -393,8 +395,6 @@ public final class LoginActivity extends AppActivity implements KeyboardWatcher.
         MyShared.getInstance().put(MyShared.SERVICEHALLID, bizContent.serviceHallId);
         MyShared.getInstance().put(MyShared.CHANNELID, bizContent.serviceHallId);
         MyShared.getInstance().put(MyShared.STAFFID, bizContent.getStaffId());
-
-        // 跳转到首页
         if ("1".equals(bizContent.realNameAuthentication)){
             new MessageDialog.Builder(getActivity())
                     // 内容必须要填写
@@ -429,6 +429,55 @@ public final class LoginActivity extends AppActivity implements KeyboardWatcher.
             MainActivity.start(getContext());
             finish();
         }
+
+//        Map<String, String> params = new HashMap<>();
+//        MyRetrofit.newInstance(this,IFCode.IFCODETOKEN, params, new MyRetrofit.ReturnResult() {
+//            @Override
+//            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+//                LinkedTreeMap<String,String> linkedTreeMap = JSONObject.parseObject(resultBean.getBizContent().toString(),LinkedTreeMap.class);;;
+//
+//                Log.e("okhttp","打印标题:" + linkedTreeMap.get("token") );
+//                MyShared.getInstance().put(MyShared.YDTOKEN,linkedTreeMap.get("token"));
+//                // 跳转到首页
+//                if ("1".equals(bizContent.realNameAuthentication)){
+//                    new MessageDialog.Builder(getActivity())
+//                            // 内容必须要填写
+//                            .setMessage("需要实名认证后才可登录")
+//                            // 确定按钮文本
+//                            .setConfirm(getString(R.string.common_confirm))
+//                            // 设置 null 表示不显示取消按钮
+//                            .setCancel(getString(R.string.common_cancel))
+//                            // 设置点击按钮后不关闭对话框
+//                            //.setAutoDismiss(false)
+//                            .setListener(new MessageDialog.OnListener() {
+//
+//                                @Override
+//                                public void onConfirm(BaseDialog dialog) {
+//                                    Bundle bundle = new Bundle();
+//                                    bundle.putString("source","0");//0未实名跳转 1手机号更改跳转
+//                                    jumpToPage(RealUserAuthenticationActivity.class,bundle);
+//                                    postDelayed(() -> {
+//                                        mCommitView.showError(1000);
+//                                    }, 1000);
+//                                }
+//
+//                                @Override
+//                                public void onCancel(BaseDialog dialog) {
+//                                    postDelayed(() -> {
+//                                        mCommitView.showError(1000);
+//                                    }, 1000);
+//                                }
+//                            })
+//                            .show();
+//                }else {
+//                    MainActivity.start(getContext());
+//                    finish();
+//                }
+//            }
+//
+//            @Override
+//            public void onError() {}
+//        });
     }
 
     /*

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

@@ -27,7 +27,38 @@
             android:animationCache="true"
             android:orientation="vertical"
             android:paddingHorizontal="@dimen/dp_15">
-
+<!--            <LinearLayout-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginTop="@dimen/dp_20"-->
+<!--                android:orientation="horizontal">-->
+<!--                <com.ruffian.library.widget.RTextView-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:text="个人"-->
+<!--                    android:paddingHorizontal="@dimen/dp_15"-->
+<!--                    android:paddingVertical="@dimen/dp_8"-->
+<!--                    app:background_normal="@color/white"-->
+<!--                    android:id="@+id/rtx_person"-->
+<!--                    app:background_unable="@color/gray04"-->
+<!--                    app:text_color_unable="@color/green01"-->
+<!--                    android:gravity="center"-->
+<!--                    android:layout_weight="1"-->
+<!--                    android:enabled="false"/>-->
+<!--                <com.ruffian.library.widget.RTextView-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:text="企业"-->
+<!--                    android:gravity="center"-->
+<!--                    android:paddingHorizontal="@dimen/dp_15"-->
+<!--                    android:paddingVertical="@dimen/dp_8"-->
+<!--                    android:layout_marginLeft="@dimen/dp_20"-->
+<!--                    android:layout_weight="1"-->
+<!--                    android:id="@+id/rtx_company"-->
+<!--                    app:background_normal="@color/white"-->
+<!--                    app:background_unable="@color/gray04"-->
+<!--                    app:text_color_unable="@color/green01" />-->
+<!--            </LinearLayout>-->
 
 
             <LinearLayout