订单审核,2023.4.11

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

@@ -179,4 +179,5 @@ public class IFCode {
     public static final String IFCODE_ACTIVE_OBUIMG = "4a95e1d90e824ee8a50aa9826617e736";   //设备激活照片上传
     public static final String IFCODE_ADD_OBU = "837c22e80fa34506a0855306d9cbb6f7"; //增补OBU
     public static final String IFCODE_ENUM = "cefb3b5da25a49eeb18865c00bc91c96"; //枚举值查询
+    public static final String IFCODE_AUDITING = "40dd538017164e7fbcfd3c410ae61726";//8.2.39.订单人工审核
 }

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

@@ -257,6 +257,7 @@ public class ResultBean<T> {
     }
 
     public static class BizContent<T> {
+        public String registeredTime;//录入时间
         public boolean isSelected; //是否选中 （本地添加）
         public OrderInfoExt orderInfoExt;//额外信息
         public ProductInfo product; //产品额外信息
@@ -505,6 +506,14 @@ public class ResultBean<T> {
         private ObuDetailInfoBean.UserPromiseCBBean userPromiseCBBean;
         private ObuDetailInfoBean.QueryCarInfoCBBean queryCarInfoCBBean;
 
+        public String getUseCharacter() {
+            return useCharacter;
+        }
+
+        public void setUseCharacter(String useCharacter) {
+            this.useCharacter = useCharacter;
+        }
+
         public List<BizContent> getCsmsnOrders() {
             return csmsnOrders;
         }

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

@@ -93,7 +93,6 @@ public class IdentityInformationUploadActivity extends AppActivity {
                     //身份证正面
                     if (!TextUtils.isEmpty(bizContent1.getPositiveImageUrl())) {
                         imgUrl1 = bizContent1.getPositiveImageUrl().replace("http://192.168.101.145:9000",MyRetrofit.Urls);
-                        Log.e("imgURL1!!!!!!!",imgUrl1);
                         GlideApp.with(getActivity())
                                 .load(imgUrl1)
                                 .into(binding.image1);

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

@@ -269,23 +269,23 @@ public class VehicleInformationActivity extends AppActivity {
                 public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
                     //行驶证首页
                     if (!TextUtils.isEmpty(bizContent1.vehPosImgUrl)) {
-                        imgUrl1 = bizContent1.vehPosImgUrl;
+                        imgUrl1 = bizContent1.vehPosImgUrl.replace("http://192.168.101.145:9000",MyRetrofit.Urls);
                         GlideApp.with(getActivity())
-                                .load(bizContent1.vehPosImgUrl)
+                                .load(imgUrl1)
                                 .into(binding.image1);
                     }
                     //行驶证副页
                     if (!TextUtils.isEmpty(bizContent1.vehNegImgUrl)) {
-                        imgUrl2 = bizContent1.vehNegImgUrl;
+                        imgUrl2 = bizContent1.vehNegImgUrl.replace("http://192.168.101.145:9000",MyRetrofit.Urls);
                         GlideApp.with(getActivity())
-                                .load(bizContent1.vehNegImgUrl)
+                                .load(imgUrl2)
                                 .into(binding.image2);
                     }
                     //车身45°照
                     if (!TextUtils.isEmpty(bizContent1.getVehBodyUrl())) {
-                        imgUrl3 = bizContent1.getVehBodyUrl();
+                        imgUrl3 = bizContent1.getVehBodyUrl().replace("http://192.168.101.145:9000",MyRetrofit.Urls);
                         GlideApp.with(getActivity())
-                                .load(bizContent1.getVehBodyUrl())
+                                .load(imgUrl3)
                                 .into(binding.image3);
                     }
                     binding.text1.setText(bizContent1.getVehiclePlate()); //车牌号

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

@@ -1,19 +1,35 @@
 package com.huntersun.vkyes.etcopencard.project.ui.activity.order;
 
+import android.content.Intent;
+import android.text.TextUtils;
 import android.view.View;
 
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityAuditingStep1Binding;
+import com.huntersun.vkyes.etcopencard.project.api.Api;
+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.src.app.AppActivity;
+import com.huntersun.vkyes.etcopencard.src.http.glide.GlideApp;
+import com.huntersun.vkyes.etcopencard.src.ui.activity.ImagePreviewActivity;
 import com.huntersun.vkyes.etcopencard.src.ui.adapter.AddViewHolder;
 
+import retrofit2.Response;
+
 /**
  * Date ：2023-03-13
  * Description：审核第一步
  */
 public class AuditingStep1Activity extends AppActivity {
     private ActivityAuditingStep1Binding binding;
-
+    private String imgUrl1 = "";
+    private String imgUrl2 = "";
+    private String vehicleId = "";
+    private String orderId = "";
     @Override
     protected View getLayoutView() {
         binding = ActivityAuditingStep1Binding.inflate(getLayoutInflater());
@@ -23,17 +39,20 @@ public class AuditingStep1Activity extends AppActivity {
     @Override
     protected void initView() {
         binding.LLContent.removeAllViews();
-        addView("姓名","张三");
-        addView("身份证号","511***********1236");
-        addView("车主地址","贵州省xxxxxx");
-
-
         binding.btnNext.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                jumpToPage(AuditingStep2Activity.class);
+                Intent intent = new Intent();
+                intent.putExtra("orderId",orderId);
+                intent.putExtra("vehicleId",vehicleId);
+                intent.setClass(AuditingStep1Activity.this,AuditingStep2Activity.class);
+                startActivity(intent);
+                finish();
+//                jumpToPage(AuditingStep2Activity.class);
             }
         });
+        binding.image1.setOnClickListener(this::openPreview);
+        binding.image2.setOnClickListener(this::openPreview);
     }
 
     private void addView(String label,String value){
@@ -42,9 +61,52 @@ public class AuditingStep1Activity extends AppActivity {
         holder.setText(R.id.tvValue,value);
         binding.LLContent.addView(holder.getCustomView());
     }
-
+    private void openPreview(View view){
+        if (view==binding.image1){
+            ImagePreviewActivity.start(this,imgUrl1);
+        }else if (view==binding.image2){
+            ImagePreviewActivity.start(this,imgUrl2);
+        }
+    }
     @Override
     protected void initData() {
+        FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
+        fatherBean.setFilename("CSMSN_ORDER_FINDBYORDERID_REQ_");
+        fatherBean.bizContent = new SendTheVerificationCodeBean();
+        fatherBean.bizContent.setId(getIntent().getStringExtra("id"));
+        MyRetrofit.newInstance(this, IFCode.IFCODE9, fatherBean.bizContent, new MyRetrofit.ReturnResult() {
+            @Override
+            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                //身份证正面
+                if (!TextUtils.isEmpty(bizContent.getPositiveImageUrl())) {
+                    imgUrl1 = bizContent.getPositiveImageUrl().replace("http://192.168.101.145:9000",MyRetrofit.Urls);
+                    GlideApp.with(getActivity())
+                            .load(imgUrl1)
+                            .into(binding.image1);
+                }
+                //身份证反面
+                if (!TextUtils.isEmpty(bizContent.getNegativeImageUrl())) {
+                    imgUrl2 = bizContent.getNegativeImageUrl().replace("http://192.168.101.145:9000",MyRetrofit.Urls);
+                    GlideApp.with(getActivity())
+                            .load(imgUrl2)
+                            .into(binding.image2);
+                }
+                vehicleId = bizContent.getVehicleId();
+                orderId = bizContent.getOrderId();
+                addView("姓名",bizContent.getCustomerName());
+                addView("身份证号",bizContent.getCustomerIdnum());
+                addView("车主地址",bizContent.getAddress());
+            }
+
+            @Override
+            public void onError() {
+                MyRetrofit.ReturnResult.super.onError();
+            }
 
+            @Override
+            public void onError(Response<Result> resp) {
+                MyRetrofit.ReturnResult.super.onError(resp);
+            }
+        });
     }
 }

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

@@ -1,11 +1,28 @@
 package com.huntersun.vkyes.etcopencard.project.ui.activity.order;
 
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 
 import com.huntersun.vkyes.etcopencard.R;
 import com.huntersun.vkyes.etcopencard.databinding.ActivityAuditingStep2Binding;
+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.utils.FunHelper;
 import com.huntersun.vkyes.etcopencard.src.app.AppActivity;
+import com.huntersun.vkyes.etcopencard.src.http.glide.GlideApp;
+import com.huntersun.vkyes.etcopencard.src.ui.activity.ImagePreviewActivity;
 import com.huntersun.vkyes.etcopencard.src.ui.adapter.AddViewHolder;
+import com.jeremyliao.liveeventbus.LiveEventBus;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import retrofit2.Response;
 
 /**
  * Date ：2023-03-13
@@ -13,6 +30,8 @@ import com.huntersun.vkyes.etcopencard.src.ui.adapter.AddViewHolder;
  */
 public class AuditingStep2Activity extends AppActivity {
     private ActivityAuditingStep2Binding binding;
+    private String imgUrl1 = "";
+    private String imgUrl2 = "";
 
     @Override
     protected View getLayoutView() {
@@ -23,30 +42,41 @@ public class AuditingStep2Activity extends AppActivity {
     @Override
     protected void initView() {
         binding.LLContent.removeAllViews();
-        addView("车牌号","张三");
-        addView("所有人","511***********1236");
-        addView("车辆类型","贵州省xxxxxx");
-        addView("使用性质","贵州省xxxxxx");
-        addView("车辆识别代码","贵州省xxxxxx");
-        addView("发动机号码","贵州省xxxxxx");
-        addView("注册日期","贵州省xxxxxx");
-        addView("发证日期","贵州省xxxxxx");
-        addView("核定载人数","贵州省xxxxxx");
-        addView("整备质量","贵州省xxxxxx");
-        addView("外廓尺寸","贵州省xxxxxx");
-        addView("总质量","贵州省xxxxxx");
+        binding.btnPass.setOnClickListener(this::auditing);
+        binding.btnNoPass.setOnClickListener(this::auditing);
+        binding.image1.setOnClickListener(this::openPreview);
+        binding.image2.setOnClickListener(this::openPreview);
+    }
+    /* 图片预览 */
+    private void openPreview(View view){
+        if (view==binding.image1){
+            ImagePreviewActivity.start(this,imgUrl1);
+        }else if (view==binding.image2){
+            ImagePreviewActivity.start(this,imgUrl2);
+        }
+    }
 
+    /* 审核 */
+    private void auditing(View view){
+        Map<String, String> params = new HashMap<>();
+        params.put("orderStep",(view==binding.btnPass) ? "ORDER_STEP_8" : "ORDER_STEP_7");//ORDER_STEP_7(审核不通过) ORDER_STEP_8(审核通过)
+        params.put("orderId", getIntent().getStringExtra("orderId"));//订单号
+        MyRetrofit.newInstance(IFCode.IFCODE_AUDITING,params, new MyRetrofit.ReturnResult(){
+            @Override
+            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                toast("success");
+                LiveEventBus.get("homeOneUpdateData").post("");
+                finish();
+            }
 
-        binding.btnPass.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
-                toast("通过");
+            public void onError() {
+                MyRetrofit.ReturnResult.super.onError();
             }
-        });
-        binding.btnNoPass.setOnClickListener(new View.OnClickListener() {
+
             @Override
-            public void onClick(View view) {
-                toast("不通过");
+            public void onError(Response<Result> resp) {
+                MyRetrofit.ReturnResult.super.onError(resp);
             }
         });
     }
@@ -61,6 +91,49 @@ public class AuditingStep2Activity extends AppActivity {
 
     @Override
     protected void initData() {
+        SendTheVerificationCodeBean bean = new SendTheVerificationCodeBean();
+        bean.setVehicleId(getIntent().getStringExtra("vehicleId"));
+        MyRetrofit.newInstance(this, IFCode.IFCODE154, bean, new MyRetrofit.ReturnResult() {
+            @Override
+            public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
+                //行驶证正面
+                ResultBean.BizContent bizContent1 = (ResultBean.BizContent) bizContent.vehicles.get(0);
+                if (!TextUtils.isEmpty(bizContent1.getVehPosImgUrl())) {
+                    imgUrl1 = bizContent1.getVehPosImgUrl().replace("http://192.168.101.145:9000",MyRetrofit.Urls);
+                    GlideApp.with(getActivity())
+                            .load(imgUrl1)
+                            .into(binding.image1);
+                }
+                //行驶证反面
+                if (!TextUtils.isEmpty(bizContent1.getVehNegImgUrl())) {
+                    imgUrl2 = bizContent1.getVehNegImgUrl().replace("http://192.168.101.145:9000",MyRetrofit.Urls);
+                    GlideApp.with(getActivity())
+                            .load(imgUrl2)
+                            .into(binding.image2);
+                }
+                addView("车牌号",bizContent1.getVehiclePlate());
+                addView("所有人",bizContent1.getOwnerName());
+                addView("车辆类型",bizContent1.getVehicleType());
+                addView("使用性质",bizContent1.getUseCharacter());
+                addView("车辆识别代码",bizContent1.getVin());
+                addView("发动机号码",bizContent1.getEngineNum());
+                addView("注册日期",bizContent1.registeredTime);
+                addView("发证日期",bizContent1.getIssueDate());
+                addView("核定载人数",bizContent1.getApprovedCount());
+                addView("整备质量",bizContent1.maintenaceMass);
+                addView("外廓尺寸",bizContent1.getVehicleDimensions());
+                addView("总质量",bizContent1.totalMass);
+            }
+
+            @Override
+            public void onError() {
+                MyRetrofit.ReturnResult.super.onError();
+            }
 
+            @Override
+            public void onError(Response<Result> resp) {
+                MyRetrofit.ReturnResult.super.onError(resp);
+            }
+        });
     }
 }

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

@@ -308,7 +308,11 @@ public class OrderUtils {
             @Override
             @SingleClick
             public void onClick(View view) {
-                startActivity(AuditingStep1Activity.class);
+                Intent intent = new Intent();
+                intent.putExtra("id",orderData.getId());
+                intent.setClass(context,AuditingStep1Activity.class);
+                context.startActivity(intent);
+//                startActivity(AuditingStep1Activity.class);
             }
         });
 

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

@@ -233,6 +233,8 @@ public class FragmentSonOne extends TitleBarFragment<MainActivity>
                 Button button6 = helper.getView(R.id.btnRelieve); //解除车牌占用
                 Button button7 = helper.getView(R.id.btnTransfer); //ETC过户
                 OrderUtils.jumpCompleted(getActivity(), item, button1, button2, button3, button5, button6, button7);
+            }else {
+                helper.getView(R.id.complete).setVisibility(View.GONE);
             }
             helper.setOnClickListener(R.id.layout, new View.OnClickListener() {
                 @Override

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

@@ -9,9 +9,8 @@
         <TextView
             android:id="@+id/tvLabel"
             style="@style/black02TextStyle14"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_100"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:text="" />
 
         <TextView
@@ -19,6 +18,8 @@
             style="@style/blackTextStyle14"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="right"
             android:text="" />
     </LinearLayout>