Merge branch 'master' of http://bj.gitlab.cnlive.com/cnlive-team/newModuleStrike

YangShuai
2 parents 27bad919 68504ce2
Showing 7 changed files with 214 additions and 54 deletions
.idea/misc.xml
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/activity/TakeIdentityPictureActivity.java
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/view/ICertificatePhohosView.java
core/dentity_verfication/src/main/java/com/cnlive/core/people_verfication/view/TakeIdentityPictureView.java
core/dentity_verfication/src/main/res/layout/dialog_takimg.xml
core/dentity_verfication/src/main/res/values/strings.xml
core/dentity_verfication/src/main/res/values/styles.xml
@@ -39,7 +39,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -8,6 +8,7 @@ import android.text.TextUtils;
 import com.baidu.ocr.sdk.model.IDCardParams;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
+import com.cnlive.core.libs.base.util.AlertUtil;
 import com.cnlive.core.libs.base.util.FileUtils;
 import com.cnlive.core.ocr.ui.camera.CameraActivity;
 import com.cnlive.core.people_verfication.R;
@@ -15,8 +16,12 @@ import com.cnlive.core.people_verfication.databinding.ActivityTakePictureBinding
 import com.cnlive.core.people_verfication.presenter.TakeIdentityPicturePresenter;
 import com.cnlive.core.people_verfication.view.ICertificatePhohosView;
 import com.cnlive.core.people_verfication.view.TakeIdentityPictureView;
+import com.cnlive.media.picker.PickerConfig;
+import com.cnlive.media.picker.entity.Media;
 import com.cnlive.media.picker.utils.PermissionChecker;
+import java.util.ArrayList;
+
 import androidx.annotation.NonNull;
 import androidx.databinding.ViewDataBinding;
@@ -32,6 +37,7 @@ public class TakeIdentityPictureActivity extends BaseActivity&lt;TakeIdentityPictur
     private int preViewClickId = 0;
     private static int CAMERA_WRITE_FR_PERMISSION = 1001;
     private static int CAMERA_WRITE_BA_PERMISSION = 1002;
+    private static int CAMERA_WRITE_PI_PERMISSION = 1003;
     @Override
     protected int getBindLayoutId() {
@@ -63,21 +69,23 @@ public class TakeIdentityPictureActivity extends BaseActivity&lt;TakeIdentityPictur
         preViewClickTime = curClickTime;
         preViewClickId = id;
         if (id == R.id.certificate_front) {
-            if(hasCampermission(CAMERA_WRITE_FR_PERMISSION)){//权限判断
+            if (hasCampermission(CAMERA_WRITE_FR_PERMISSION)) {//权限判断
                 getMvpView().takeIdCardPictures(this, ICertificatePhohosView.ID_CARD_SIDE_FRONT);
             }
         } else if (id == R.id.certificate_back) {
-            if(hasCampermission(CAMERA_WRITE_BA_PERMISSION)){//权限判断
+            if (hasCampermission(CAMERA_WRITE_BA_PERMISSION)) {//权限判断
                 getMvpView().takeIdCardPictures(this, ICertificatePhohosView.ID_CARD_SIDE_BACK);
             }
         } else if (id == R.id.take_picture) {
-
+            if (hasCampermission(CAMERA_WRITE_PI_PERMISSION)) {
+                getMvpView().showDialog();
+            }
         }
     }
-    private boolean hasCampermission(int typeNum){
+    private boolean hasCampermission(int typeNum) {
         boolean hasPermission = PermissionChecker.checkPermissions(this
-                , new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE}
+                , new String[]{Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, Manifest.permission.WRITE_EXTERNAL_STORAGE}
                 , typeNum, R.string.dialog_imagepicker_permission_camera_nerver_ask_message);
         return hasPermission;
     }
@@ -86,13 +94,17 @@ public class TakeIdentityPictureActivity extends BaseActivity&lt;TakeIdentityPictur
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (requestCode == CAMERA_WRITE_FR_PERMISSION) {
-            if (PermissionChecker.onRequestPermissionsResult(this,requestCode, permissions, grantResults, false, R.string.dialog_imagepicker_permission_sdcard_message)[0]) {
+            if (PermissionChecker.onRequestPermissionsResult(this, requestCode, permissions, grantResults, false, R.string.dialog_imagepicker_permission_sdcard_message)[0]) {
                 getMvpView().takeIdCardPictures(this, ICertificatePhohosView.ID_CARD_SIDE_FRONT);
             }
-        }else if(requestCode == CAMERA_WRITE_BA_PERMISSION){
-            if (PermissionChecker.onRequestPermissionsResult(this,requestCode, permissions, grantResults, false, R.string.dialog_imagepicker_permission_sdcard_message)[0]) {
+        } else if (requestCode == CAMERA_WRITE_BA_PERMISSION) {
+            if (PermissionChecker.onRequestPermissionsResult(this, requestCode, permissions, grantResults, false, R.string.dialog_imagepicker_permission_sdcard_message)[0]) {
                 getMvpView().takeIdCardPictures(this, ICertificatePhohosView.ID_CARD_SIDE_BACK);
             }
+        } else if (requestCode == CAMERA_WRITE_PI_PERMISSION) {
+            if (PermissionChecker.onRequestPermissionsResult(this, requestCode, permissions, grantResults, false, R.string.dialog_imagepicker_permission_sdcard_message)[0]) {
+                getMvpView().showDialog();
+            }
         }
     }
@@ -107,14 +119,25 @@ public class TakeIdentityPictureActivity extends BaseActivity&lt;TakeIdentityPictur
                         String frontFilePath = FileUtils.getSaveFile(getApplicationContext(), ICertificatePhohosView.PIC_FRONT).getAbsolutePath();
                         if (getMvpView() == null) return;
                         getMvpView().recIDCard(IDCardParams.ID_CARD_SIDE_FRONT, frontFilePath);
-
                     } else if (CameraActivity.CONTENT_TYPE_ID_CARD_BACK.equals(contentType)) {
                         String backFilePath = FileUtils.getSaveFile(getApplicationContext(), ICertificatePhohosView.PIC_BACK).getAbsolutePath();
                         if (getMvpView() == null) return;
                         getMvpView().recIDCard(IDCardParams.ID_CARD_SIDE_BACK, backFilePath);
+                    }else if(CameraActivity.CONTENT_TYPE_GENERAL.endsWith(contentType)){
+                        String filePath = FileUtils.getSaveFile(getApplicationContext(), ICertificatePhohosView.PIC_GENERAL).getAbsolutePath();
+                        if (getMvpView() == null) return;
+                        if (!TextUtils.isEmpty(filePath))getMvpView().hasFace(filePath);
                     }
                 }
             }
+        }else if (requestCode == 200 && resultCode == PickerConfig.DEFAULT_RESULT_CODE) {
+            ArrayList<Media> select = data.getParcelableArrayListExtra(PickerConfig.EXTRA_RESULT);
+            if (select != null && select.size() > 0) {
+                String path = select.get(0).path;
+                if (!TextUtils.isEmpty(path))getMvpView().hasFace(path);
+            } else {
+                AlertUtil.showDeftToast(this, "请选择图片");
+            }
         }
     }
@@ -10,6 +10,8 @@ public interface ICertificatePhohosView extends MvpView {
     int REQUEST_CODE_CAMERA = 102;
     int ID_CARD_SIDE_FRONT = 1;
     int ID_CARD_SIDE_BACK = 2;
+    int ID_CAMERA_GENETAL = 3;
     String PIC_FRONT = "pic_front";
     String PIC_BACK = "pic_back";
+    String PIC_GENERAL = "pic_general";
 }
 package com.cnlive.core.people_verfication.view;
 import android.app.Activity;
+import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.hardware.Camera;
+
+import com.cnlive.media.picker.ImagePicker;
+import com.cnlive.media.picker.PickerConfig;
+
+import android.media.FaceDetector;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
 import android.widget.ImageView;
 import com.baidu.ocr.sdk.OCR;
@@ -30,17 +40,16 @@ import com.cnlive.core.ocr.ui.camera.CameraActivity;
 import com.cnlive.core.ocr.ui.util.ImageUtil;
 import com.cnlive.core.people_verfication.R;
 import com.cnlive.core.people_verfication.activity.TakeIdentityPictureActivity;
+import com.cnlive.media.picker.utils.ImagePickerComUtils;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
 import static com.cnlive.core.people_verfication.view.ICertificatePhohosView.PIC_BACK;
 import static com.cnlive.core.people_verfication.view.ICertificatePhohosView.PIC_FRONT;
+import static com.cnlive.core.people_verfication.view.ICertificatePhohosView.PIC_GENERAL;
 public class TakeIdentityPictureView extends BaseView {
@@ -51,6 +60,7 @@ public class TakeIdentityPictureView extends BaseView {
     private boolean isBackEffective = false;
     private String idCardNo;
     private String realName;
+    private Dialog dialog;
     public TakeIdentityPictureView(TakeIdentityPictureActivity activity) {
         this.activity = activity;
@@ -64,14 +74,9 @@ public class TakeIdentityPictureView extends BaseView {
         activity.finish();
     }
-    /**
-     * 拍摄
-     *
-     * @param idCardSide
-     */
     public void takeIdCardPictures(Context context, final int idCardSide) {
         long curClickTime = System.currentTimeMillis();
-        if (preViewClickTime > 0 && curClickTime - preViewClickTime <= 2000 ) {
+        if (preViewClickTime > 0 && curClickTime - preViewClickTime <= 2000) {
             return;
         }
         preViewClickTime = curClickTime;
@@ -83,6 +88,8 @@ public class TakeIdentityPictureView extends BaseView {
                     takePhoto(PIC_FRONT, CameraActivity.CONTENT_TYPE_ID_CARD_FRONT);
                 } else if (idCardSide == ICertificatePhohosView.ID_CARD_SIDE_BACK) {
                     takePhoto(PIC_BACK, CameraActivity.CONTENT_TYPE_ID_CARD_BACK);
+                } else if (idCardSide == ICertificatePhohosView.ID_CAMERA_GENETAL) {
+                    takePhoto(PIC_GENERAL, CameraActivity.CONTENT_TYPE_GENERAL);
                 }
             }
@@ -130,7 +137,7 @@ public class TakeIdentityPictureView extends BaseView {
             camera.release();
         } catch (Throwable e) {
             e.printStackTrace();
-            AlertUtil.showDeftToast(getContext(),"没有相机权限，相机开启失败");
+            AlertUtil.showDeftToast(getContext(), "没有相机权限，相机开启失败");
             return;
         }
     }
@@ -198,7 +205,7 @@ public class TakeIdentityPictureView extends BaseView {
                             frontBitmap = bitmap;
                             showIdCard(idCardSide, frontBitmap, activity.binding.certificateFront);
                             activity.binding.certificateFront.setImageBitmap(bitmap);
-                            if(isBackEffective){
+                            if (isBackEffective) {
 //                                activity.binding.submit.setClickable(true);
 //                                activity.binding.submit.setTextColor(activity.getResources().getColor(R.color.white));
 //                                activity.binding.submit.setBackground(getContext().getResources().getDrawable(R.drawable.bg_apply_btn));
@@ -208,20 +215,20 @@ public class TakeIdentityPictureView extends BaseView {
                         if (idCardSide.equals(IDCardParams.ID_CARD_SIDE_BACK)) {
                             backBitmap = bitmap;
                             isBackEffective = true;
-                            if(TextUtils.isEmpty(idCardResult.getIssueAuthority().toString().trim()) ||
-                                    TextUtils.isEmpty(idCardResult.getSignDate().toString().trim())){
+                            if (TextUtils.isEmpty(idCardResult.getIssueAuthority().toString().trim()) ||
+                                    TextUtils.isEmpty(idCardResult.getSignDate().toString().trim())) {
 //                                activity.binding.submit.setClickable(false);
                                 AlertUtil.showDeftToast(getContext(), "身份证信息读取失败，请重新拍摄");
                                 return;
                             }
-                            try{
+                            try {
                                 Integer.parseInt(idCardResult.getExpiryDate().toString().trim());
-                                if(idCardResult.getExpiryDate() != null && Integer.parseInt(idCardResult.getExpiryDate().toString().trim()) < getCurrentTime()){
+                                if (idCardResult.getExpiryDate() != null && Integer.parseInt(idCardResult.getExpiryDate().toString().trim()) < getCurrentTime()) {
 //                                    activity.binding.submit.setClickable(false);
                                     AlertUtil.showDeftToast(getContext(), "身份证有效期失效");
                                     return;
                                 }
-                            }catch (Exception e){
+                            } catch (Exception e) {
                                 e.printStackTrace();
                             }
@@ -234,7 +241,7 @@ public class TakeIdentityPictureView extends BaseView {
 //                                activity.binding.submit.setBackground(getContext().getResources().getDrawable(R.drawable.bg_apply_btn));
                             }
                         }
-                    }else {
+                    } else {
 //                        activity.binding.submit.setClickable(false);
                         AlertUtil.showDeftToast(getContext(), "身份证信息读取失败，请重新拍摄");
                     }
@@ -259,34 +266,71 @@ public class TakeIdentityPictureView extends BaseView {
         return Integer.parseInt(date);
     }
-    public File compressImage(Bitmap bitmap, String filename) {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        bitmap.compress(Bitmap.CompressFormat.JPEG, 100, baos);//质量压缩方法，这里100表示不压缩，把压缩后的数据存放到baos中
-        int options = 100;
-        while (baos.toByteArray().length / 1024 > 500) {  //循环判断如果压缩后图片是否大于500kb,大于继续压缩
-            baos.reset();//重置baos即清空baos
-            options -= 10;//每次都减少10
-            bitmap.compress(Bitmap.CompressFormat.JPEG, options, baos);//这里压缩options%，把压缩后的数据存放到baos中
-            long length = baos.toByteArray().length;
+    public void showDialog() {
+        if (dialog == null) {
+            dialog = new Dialog(activity, R.style.DialogStyle);
+            View view = View.inflate(activity, R.layout.dialog_takimg, null);
+            dialog.setContentView(view);
+            Window window = dialog.getWindow();
+            window.setGravity(Gravity.BOTTOM);
+            window.setWindowAnimations(R.style.dialogStyle);
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            dialog.show();
+        } else {
+            dialog.show();
         }
-        File file = new File(Environment.getExternalStorageDirectory() + "/aegis/file");
-        if (!file.exists()) {
-            file.mkdirs();
+        dialog.findViewById(R.id.take_photo).setOnClickListener(view -> {
+            dialog.dismiss();
+            takeIdCardPictures(activity, ICertificatePhohosView.ID_CAMERA_GENETAL);
+        });
+        dialog.findViewById(R.id.get_img).setOnClickListener(view -> {
+            dialog.dismiss();
+            showAum();
+        });
+        dialog.findViewById(R.id.cancle).setOnClickListener(view -> dialog.dismiss());
+    }
+
+    /**
+     * 打开相册
+     */
+    public void showAum() {
+        if (!ImagePickerComUtils.isSdExist()) {
+            AlertUtil.showDeftToast(getContext(), "SD卡不存在");
+            return;
         }
-        file = new File(Environment.getExternalStorageDirectory() + "/aegis/file/", filename + ".png");
-        try {
-            FileOutputStream fos = new FileOutputStream(file);
-            try {
-                fos.write(baos.toByteArray());
-                fos.flush();
-                fos.close();
-            } catch (IOException e) {
-                e.printStackTrace();
+        new ImagePicker.Builder()
+                .maxNum(1)
+                .maxImageSize(20 * 1024 * 1024)
+                .setSelectGif(false)
+                //是否需要相机
+//                    .needCamera(true)
+                .selectMode(PickerConfig.PICKER_IMAGE)
+                .cachePath(Environment.getExternalStorageDirectory() + "/strike/file/")
+                .isSinglePick(true)
+                .doCrop(1, 1, 300, 300)
+                .builder()
+                .start(activity, 200, PickerConfig.DEFAULT_RESULT_CODE);
+    }
+
+    /**
+     * 检测是否有人脸
+     * @param path
+     */
+    public void hasFace(String path){
+            int numberOfFace = 12;
+            FaceDetector myFaceDetect;
+            Bitmap bitmap = BitmapFactory.decodeFile(path);
+            Bitmap bitmap565 = bitmap.copy(Bitmap.Config.RGB_565, true);
+            int imageWidth = bitmap565.getWidth();
+            int imageHeight = bitmap565.getHeight();
+            FaceDetector.Face[] myFace = new FaceDetector.Face[numberOfFace];
+            myFaceDetect = new FaceDetector(imageWidth, imageHeight, numberOfFace);
+            int numberOfFaceDetected = myFaceDetect.findFaces(bitmap565, myFace);
+            AlertUtil.showDeftToast(getContext(), "检测到"+numberOfFaceDetected+"个人脸");
+            if(numberOfFaceDetected == 1)  {
+                GlideUtil.init(activity, path).error(R.drawable.take_photo).into(activity.binding.takePicture);
+            }else if(new File(path).exists()){
+                new File(path).delete();
             }
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-//        recycleBitmap(bitmap);
-        return file;
     }
 }
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/take_photo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:padding="15dp"
+            android:text="@string/tak_picture"
+            android:textColor="#333333"
+            android:textSize="15sp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#f2f3f4" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/get_img"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:padding="15dp"
+            android:text="@string/to_picture"
+            android:textColor="#333333"
+            android:textSize="15sp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#f2f3f4" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/cancle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:background="#f2f3f4" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:padding="15dp"
+            android:text="@string/cancle"
+            android:textColor="#333333"
+            android:textSize="15sp" />
+    </LinearLayout>
+</LinearLayout>
 \ No newline at end of file
@@ -13,4 +13,7 @@
     <string name="init_baidu_faile">初始化失败</string>
     <string name="only_for_verified">仅用于实名认证</string>
+    <string name="tak_picture">拍摄</string>
+    <string name="to_picture">从手机相册选择</string>
+    <string name="cancle">取消</string>
 </resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="DialogStyle" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:backgroundDimAmount">0.6</item>
+        <item name="android:windowCloseOnTouchOutside">true</item>
+    </style>
+
+    <style name="dialogStyle" parent="android:Animation">
+        <item name="android:windowEnterAnimation">@anim/anim_enter</item>
+        <item name="android:windowExitAnimation">@anim/anim_exit</item>
+    </style>
+</resources>
 \ No newline at end of file