'2023年3月10日09:06:14'

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

@@ -40,9 +40,9 @@ import retrofit2.converter.scalars.ScalarsConverterFactory;
 public class MyRetrofit {
     //是否设置缓存
     private static final boolean Cache = false;
-//        private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/";
+        private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/";
 //    private final String BaseUrl = "http://58.16.58.161:19002/ifzt/api/";
-    private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/";
+//    private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/";
     private final String appId = "admin001";
     private final String IFCODE = "";
     private final String bizContent = "";
@@ -149,9 +149,9 @@ public class MyRetrofit {
         client = new OkHttpClient.Builder()
                 .addInterceptor(headerInterceptor) /*添加请求头*/
                 .addInterceptor(logging) //添加拦截器
-                .connectTimeout(10, TimeUnit.SECONDS) //链接超时
-                .readTimeout(10, TimeUnit.SECONDS) //设置读取超时
-                .writeTimeout(10, TimeUnit.SECONDS) //写超时
+                .connectTimeout(200, TimeUnit.SECONDS) //链接超时
+                .readTimeout(200, TimeUnit.SECONDS) //设置读取超时
+                .writeTimeout(200, TimeUnit.SECONDS) //写超时
                 .retryOnConnectionFailure(true) //链接失败时重试
                 .build();
         return client;

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

@@ -79,6 +79,7 @@ public class IFCode {
     public static final String IFCODE7 = "7"; //取消订单
     public static final String IFCODE21 = "21"; //变更个人用户信息
     public static final String IFCODE22 = "22"; //提交个人用户信息
+    public static final String IFCODE23 = "23"; //签约检测接口
     public static final String IFCODE15 = "15"; //OCR识别身份证
     public static final String IFCODE16 = "16"; //OCR识别行驶证
     public static final String IFCODE17 = "17"; //文件上传接口

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

@@ -296,6 +296,7 @@ public class ResultBean<T> {
         private String vehicleMaintenaceMass;
         private String vehiclePermittedTwoWeight;
         private String useUserType;
+        private String userType;
         private String version;
         private Boolean isUpLevel;
         private String message;
@@ -339,6 +340,14 @@ public class ResultBean<T> {
         private ObuDetailInfoBean.UserPromiseCBBean userPromiseCBBean;
         private ObuDetailInfoBean.QueryCarInfoCBBean queryCarInfoCBBean;
 
+        public String getUserType() {
+            return userType;
+        }
+
+        public void setUserType(String userType) {
+            this.userType = userType;
+        }
+
         public Long getRechargeMoney() {
             return rechargeMoney;
         }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/copapply/ObuActivateRequester.java

@@ -118,7 +118,6 @@ public class ObuActivateRequester implements ToastAction {
                         protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                             ResultBean.BizRemarks data =
                                     Gson().fromJson(resultBean.getBizContent() + "", ResultBean.BizRemarks.class);
-                            //OBU通知
                             sendApduEsam(data.getData());
                         }
                     });

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

@@ -17,6 +17,7 @@ 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.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.QRCode;
@@ -46,7 +47,7 @@ public class ContractActivity extends AppActivity {
     protected void initView() {
         setTitle("签约");
         binding.nextStep.setOnClickListener(this);
-        Bitmap bitmap = QRCode.createQRCodeBitmap("https://file.etcjz.cn/file/web/mini.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);
 
@@ -74,40 +75,36 @@ public class ContractActivity extends AppActivity {
 //        //签约检测
 //        FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
 //        fatherBean.bizContent = new SendTheVerificationCodeBean();
-//        fatherBean.setFilename("CSMSN_ORDER_USERSIGNQUERY_REQ_");
 //        fatherBean.bizContent.setOrderId(getIntent().getStringExtra("orderId"));
 //        Log.e("okhttp", "打印标题:" + new Gson().toJson(fatherBean));
-//        binding.nextStep.setEnabled(false);
-//        new MyRetrofit().getRetrofit("IF01001202208160800")
-//                .create(Api.class)
-//                .message(new Gson().toJson(fatherBean))
-//                .enqueue(new Converter<Result>(getActivity()) {
-//                    @Override
-//                    protected 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("用户未开通车主服务，请用户扫码办理。");
-//                        }
-//                    }
+//        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(String err, Response<Result> resp) {
-//                        super.onError(err, resp);
-//                        binding.nextStep.setEnabled(true);
-//                    }
-//                });
+//            @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/HomeListInfo.java

@@ -298,9 +298,8 @@ public class HomeListInfo extends AppActivity implements StatusAction {
                             openingApplication(bizContent1);
                         } else if (!cardId && !obuId && ("1".equals(obuStatus) || "11".equals(obuStatus) ||
                                 "0".equals(obuStatus))) {
-                            Log.e("okhttp","============" );
                             //走发行申请
-                            deviceActivation();
+                            deviceActivation(bizContent1);
                         } else {
                             cardOpeningApplication(bizContent1);
                         }
@@ -341,16 +340,22 @@ public class HomeListInfo extends AppActivity implements StatusAction {
         //开签完以后走激活
         new OBURequest(BoxManagers.mDecryptVehicleApduBean, bizContent1,
                 getActivity())
-                .obuPublishRequest(this::deviceActivation);
+                .obuPublishRequest(new OBURequest.CallBack() {
+                    @Override
+                    public void onSuccess() {
+                        deviceActivation(bizContent1);
+                    }
+                });
     }
 
     /**
      * 设备激活
      */
-    public void deviceActivation() {
+    public void deviceActivation(ResultBean.BizContent content) {
         //设备激活
         new ObuActivation(BoxManagers.mDecryptVehicleApduBean,
                 getActivity()).start(bizContent -> {
+                    bizContent.setOrderId(content.getOrderId());
             //激活步骤
             new ObuActivateRequester().start(bizContent, getActivity());
         });

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

@@ -141,7 +141,9 @@ public class IdentityInformationUploadActivity extends AppActivity {
         binding.text5.setOnClickListener(this);
         binding.text8.setOnClickListener(this);
         binding.image1.setOnClickListener(this::onImage);
+//        binding.choice1.setOnClickListener(this::onImage);
         binding.image2.setOnClickListener(this::onImage);
+//        binding.choice2.setOnClickListener(this::onImage);
         binding.image3.setOnClickListener(this::onImage);
         binding.image4.setOnClickListener(this::onImage);
         binding.image5.setOnClickListener(this::onImage);
@@ -297,7 +299,8 @@ public class IdentityInformationUploadActivity extends AppActivity {
                             public void onSuccess(File file) {
                                 // TODO 压缩成功后调用，返回压缩后的图片文件
                                 android.util.Log.e("压缩后:", "onStart: =============" + FileSizeUtil.getFileOrFilesSize(file.getPath(), 2));
-                                postDelayed(() -> OCRspot(QRCode.imageToBase64(file.getPath()), (ImageView) view, file.getPath(), file), 200);
+                                postDelayed(() -> OCRspot(QRCode.imageToBase64(file.getPath()),
+                                        (ImageView) view, file.getPath(), file), 200);
                             }
 
                             @Override

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

@@ -190,7 +190,10 @@ public class FragmentSonOne extends TitleBarFragment<MainActivity>
             helper.setText(R.id.text1, EnumBean.backValue(item.getOrderStep(), EnumBean.OrderStage));
             helper.setText(R.id.text2, item.getVehiclePlate());
             helper.setText(R.id.text3, EnumBean.backValue(item.getVehiclePlateColor(), EnumBean.VehicleColorArray));
-            helper.setText(R.id.text4, item.getOrederType());
+            helper.setText(R.id.text4, "PERSONAL_USER".equals(item.getUserType()) ? "个人用户" : "单位用户");
+            helper.setText(R.id.text6, "0".equals(item.getType()) ? "客车办理" : "货车办理");
+            helper.setText(R.id.text7, "0".equals(item.getType()) ? "客车" : "货车");
+            helper.setText(R.id.text8, item.getAmount() == null ? "0.00元" : Integer.parseInt(item.getAmount()) * 0.01 + "元");
             helper.setOnClickListener(R.id.layout, new View.OnClickListener() {
                 @Override
                 @SingleClick

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

@@ -390,6 +390,7 @@
                             tools:ignore="NestedWeights" />
 
                         <TextView
+                            android:id="@+id/choice1"
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/dp_30"
                             android:background="@drawable/home_unm_bg3"
@@ -422,6 +423,7 @@
                             tools:ignore="NestedWeights" />
 
                         <TextView
+                            android:id="@+id/choice2"
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/dp_30"
                             android:background="@drawable/home_unm_bg3"