处理认证跳转逻辑,修改审核失败页面

韩亚云
1 parent 98bf9525
Showing 11 changed files with 117 additions and 16 deletions
core/dentity_verfication/src/main/java/com/cnlive/core/company_verfication/ui/activity/FillInCompanyDataActivity.java
core/dentity_verfication/src/main/java/com/cnlive/core/company_verfication/ui/fragment/SelectCompanyDataFragment.java
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/activity/CheckResultActivity.java
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/fragment/CheckResultFragment.java
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/fragment/PersonCheckFragment.java
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/fragment/TakeIdentityPictureFragment.java
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/presenter/TakeIdentityPicturePresenter.java
core/dentity_verfication/src/main/res/drawable-hdpi/fail_icon.png
core/dentity_verfication/src/main/res/drawable-xhdpi/fail_icon.png
core/dentity_verfication/src/main/res/drawable-xxhdpi/fail_icon.png
core/dentity_verfication/src/main/res/layout/fragment_check_result.xml
 package com.cnlive.core.company_verfication.ui.activity;
+import android.content.Context;
+import android.content.Intent;
+
 import com.cnlive.core.company_verfication.ui.fragment.FillInCompanyDataFragment;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.people_verfication.R;
+import com.cnlive.core.people_verfication.activity.CheckResultActivity;
 public class FillInCompanyDataActivity extends BaseActivity {
+    public static void startActivity(Context context, String userId){
+        Intent intent = new Intent(context, FillInCompanyDataActivity.class);
+        intent.putExtra("userId",userId);
+        context.startActivity(intent);
+    }
     @Override
     protected void initView() {
         loadRootFragment(new FillInCompanyDataFragment());
 package com.cnlive.core.company_verfication.ui.fragment;
-import android.view.Gravity;
+import android.os.Bundle;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
-import com.cnlive.core.company_verfication.ui.adapter.CompanyDataAdapter;
 import com.cnlive.core.company_verfication.ui.adapter.CompanyItemDataAdapter;
 import com.cnlive.core.company_verfication.ui.model.CompanyItemData;
 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
-import com.cnlive.core.libs.base.util.StatusBarUtil;
 import com.cnlive.core.people_verfication.R;
 import com.cnlive.core.people_verfication.databinding.FragmentSelectInCompanyDataBinding;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
@@ -20,7 +15,6 @@ import java.util.ArrayList;
 import java.util.List;
 import androidx.annotation.NonNull;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.databinding.ViewDataBinding;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -33,6 +27,13 @@ import androidx.recyclerview.widget.LinearLayoutManager;
     private CompanyItemDataAdapter itemDataAdapter;
     private BottomSheetBehavior behavior;
+    public static SelectCompanyDataFragment newInstance(String userId) {
+        SelectCompanyDataFragment fragment = new SelectCompanyDataFragment();
+        Bundle args = new Bundle();
+        args.putString("userId", userId);
+        fragment.setArguments(args);
+        return fragment;
+    }
     @Override
     protected int getBindLayoutId() {
         return R.layout.fragment_select_in_company_data;
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import com.cnlive.core.company_verfication.ui.fragment.FillInCompanyDataFragment;
+import com.cnlive.core.company_verfication.ui.fragment.SelectCompanyDataFragment;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
 import com.cnlive.core.people_verfication.fragment.CheckResultFragment;
@@ -47,7 +48,7 @@ public class CheckResultActivity extends BaseActivity {
             }
         }else if(type.equals("company")){//机构
             if(code.equals("-1")){//未认证加载机构认证fragment
-                fragment = FillInCompanyDataFragment.newInstance(userId);
+                fragment = SelectCompanyDataFragment.newInstance(userId);
             }else if(code.equals("0") || code.equals("2")){//审核中或者认证失败
                 fragment = CheckResultFragment.newInstance(userId,code,type);
             }else if(code.equals("1")){//认证成功 加载机构检测成功页面
@@ -70,9 +70,9 @@ public class CheckResultFragment extends BaseFragment {
                 binding.resuleBtn.setText("返回");
                 binding.resuleBtn.setOnClickListener(view1 -> getActivity().finish());
             } else if (code.equals("2")) {//审核失败
-                binding.resultImg.setImageResource(R.drawable.check_icon);
-                binding.resultTx.setText("审核失败");
-                binding.resuleBtn.setText("继续认证");
+                binding.resultImg.setImageResource(R.drawable.fail_icon);
+                binding.resultTx.setText("您申请的个人认证审核未通过\n原因：您提交的公司信息有误，请重新申请");
+                binding.resuleBtn.setText("重新申请");
                 binding.resuleBtn.setOnClickListener(view1 -> {
                     //跳转个人认证页面
                     TakeIdentityPictureActivity.startActivity(getActivity(),userId);
@@ -72,9 +72,9 @@ public class PersonCheckFragment extends BaseFragment {
                 getActivity().finish();
             } );
         }else if(code.endsWith("2")){//审核失败
-            binding.checkImg.setImageResource(R.drawable.check_icon);
-            binding.checkTx.setText("审核失败");
-            binding.checkBtn.setText("继续认证");
+            binding.checkImg.setImageResource(R.drawable.fail_icon);
+            binding.checkTx.setText("您申请的个人认证审核未通过\n原因：您提交的公司信息有误，请重新申请");
+            binding.checkBtn.setText("重新申请");
             binding.checkBtn.setOnClickListener(view1 -> {
                 TakeIdentityPictureActivity.startActivity(getActivity(),userId);
             });
@@ -7,6 +7,7 @@ import android.text.TextUtils;
 import android.view.View;
 import com.baidu.ocr.sdk.model.IDCardParams;
+import com.cnlive.core.company_verfication.ui.activity.FillInCompanyDataActivity;
 import com.cnlive.core.libs.base.frame.fragment.BaseFragment;
 import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.FileUtils;
@@ -40,6 +41,7 @@ public class TakeIdentityPictureFragment extends BaseFragment&lt;TakeIdentityPictur
     private static int CAMERA_WRITE_FR_PERMISSION = 1001;
     private static int CAMERA_WRITE_BA_PERMISSION = 1002;
     private static int CAMERA_WRITE_PI_PERMISSION = 1003;
+    private String userId;
     public static TakeIdentityPictureFragment newInstance(String userId) {
         TakeIdentityPictureFragment fragment = new TakeIdentityPictureFragment();
@@ -62,6 +64,7 @@ public class TakeIdentityPictureFragment extends BaseFragment&lt;TakeIdentityPictur
     @Override
     protected void initView() {
         showDefaultWhiteStatusBar();
+        userId = getArguments().getString("userId");
         binding.topbar.setTitle("拍摄照片");
         binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
             finish();
@@ -94,7 +97,7 @@ public class TakeIdentityPictureFragment extends BaseFragment&lt;TakeIdentityPictur
         }else if(id == R.id.next){
             if (binding.frontTx.getVisibility() == View.VISIBLE && binding.backTx.getVisibility() == View.VISIBLE
                     && binding.picTx.getVisibility() == View.VISIBLE) {
-
+                FillInCompanyDataActivity.startActivity(getActivity(),userId);
             }
         }
     }
 package com.cnlive.core.people_verfication.presenter;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.core.people_verfication.view.TakeIdentityPictureView;
-public class TakeIdentityPicturePresenter extends BasePresenter<TakeIdentityPictureView> {
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import io.reactivex.disposables.Disposable;
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
+
+public class TakeIdentityPicturePresenter extends BasePresenter<TakeIdentityPictureView> {
+//    /**
+//     * 身份认证
+//     */
+//    public static Disposable addApplyWitness(Context context, String userId, String mobile, String realName, String idCardNo, File idCardObv, File idCardRev, DataCallback<BaseInfo<DarenApplyModel>> callback) {
+//        Map<String, String> params = new HashMap<>();
+//        params.put("sid", userId);
+//        params.put("realName", realName);
+//        params.put("idCardNo", idCardNo);
+//        params.put("mobile", mobile);
+//
+//        List<MultipartBody.Part> parts = new ArrayList<>();
+//
+//        if (idCardObv.exists() && idCardRev.exists()) {
+//            BitmapFactory.Options optionsObv = new BitmapFactory.Options();
+//            optionsObv.inJustDecodeBounds = true;
+//            Bitmap bitmapObv = BitmapFactory.decodeFile(idCardObv.getAbsolutePath(), optionsObv); // 此时返回的bitmap为null
+//
+//            BitmapFactory.Options optionsRev = new BitmapFactory.Options();
+//            optionsRev.inJustDecodeBounds = true;
+//            Bitmap bitmapRev = BitmapFactory.decodeFile(idCardRev.getAbsolutePath(), optionsRev); // 此时返回的bitmap为null
+//
+//            JSONObject picobjObv = new JSONObject();
+//            JSONObject picobjRev = new JSONObject();
+//            try {
+//                picobjObv.put("height", optionsObv.outHeight);
+//                picobjObv.put("with", optionsObv.outWidth);
+//                picobjRev.put("height", optionsRev.outHeight);
+//                picobjRev.put("with", optionsRev.outWidth);
+//            } catch (JSONException e) {
+//                e.printStackTrace();
+//            }
+//
+//            params.put("idCardObvInfo", (picobjObv.toString()));
+//            params.put("idCardRevInfo", (picobjRev.toString()));
+//
+//            RequestBody requestIdCardObv = RequestBody.create(MediaType.parse("multipart/form-data"), idCardObv);
+//            MultipartBody.Part idCardObvBody =
+//                    MultipartBody.Part.createFormData("idCardObv", idCardObv.getName(), requestIdCardObv);
+//
+//            RequestBody requestIdCardRev = RequestBody.create(MediaType.parse("multipart/form-data"), idCardRev);
+//            MultipartBody.Part idCardRevBody =
+//                    MultipartBody.Part.createFormData("idCardRev", idCardRev.getName(), requestIdCardRev);
+//
+//            parts.add(idCardObvBody);
+//            parts.add(idCardRevBody);
+//        }
+//        Map<String, String> map1 = SignUtil.getOpenSignMap(params, false);
+//        Map<String, RequestBody> map2 = SignUtil.orderRequestBody(map1);
+//        return ApiRequest.subscribe(ApiRequest.service(ApiServiceDaren.class).applyWitness(map2, parts),
+//                new Subscriber<DarenApplyModel>(context, ApiSubscriber.subscriberBuild) {
+//                    @Override
+//                    public void onCompleted(String s, String s1, DarenApplyModel darenApplyModel) {
+//                        if (callback == null) return;
+//                        callback.callback(SUCCESS, "", darenApplyModel);
+//                    }
+//
+//                    @Override
+//                    public void onError(String code, String message) {
+//                        if (callback == null) return;
+//                        int errorCode = -1;
+//                        try {
+//                            errorCode = Integer.valueOf(code);
+//                        } catch (Exception ignored) {
+//                        } finally {
+//                            callback.callback(errorCode, message, null);
+//                        }
+//                    }
+//                });
+//    }
 }
@@ -28,6 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal"
                 android:layout_marginTop="20dp"
                 android:textColor="@color/color_999999"
                 android:textSize="15sp"