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

Conflicts: core/dentity_verfication/src/main/res/values/color.xml core/dentity_verfication/src/main/res/values/strings.xml

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/newModuleStrike
Conflicts: core/dentity_verfication/src/main/res/values/color.xml core/dentity_verfication/src/main/res/values/strings.xml
杨帅
2 parents 15409a71 d39ea1cf
Showing 13 changed files with 187 additions and 83 deletions
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/TakeIdentityPictureView.java
core/dentity_verfication/src/main/res/drawable-hdpi/upload.png
core/dentity_verfication/src/main/res/drawable-xhdpi/upload.png
core/dentity_verfication/src/main/res/drawable-xxhdpi/upload.png
core/dentity_verfication/src/main/res/drawable/bg_apply_btn.xml
core/dentity_verfication/src/main/res/drawable/bg_shape_gray.xml
core/dentity_verfication/src/main/res/drawable/bg_six_shape.xml
core/dentity_verfication/src/main/res/drawable/take_photo.png
core/dentity_verfication/src/main/res/layout/activity_take_picture.xml
core/dentity_verfication/src/main/res/values/color.xml
core/dentity_verfication/src/main/res/values/strings.xml
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/CalorieEntityDao.java
@@ -5,6 +5,7 @@ import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.text.TextUtils;
+import android.view.View;
 import com.baidu.ocr.sdk.model.IDCardParams;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
@@ -68,18 +69,23 @@ public class TakeIdentityPictureActivity extends BaseActivity&lt;TakeIdentityPictur
         }
         preViewClickTime = curClickTime;
         preViewClickId = id;
-        if (id == R.id.certificate_front) {
+        if (id == R.id.certificate_front_ry) {
             if (hasCampermission(CAMERA_WRITE_FR_PERMISSION)) {//权限判断
                 getMvpView().takeIdCardPictures(this, ICertificatePhohosView.ID_CARD_SIDE_FRONT);
             }
-        } else if (id == R.id.certificate_back) {
+        } else if (id == R.id.certificate_back_ry) {
             if (hasCampermission(CAMERA_WRITE_BA_PERMISSION)) {//权限判断
                 getMvpView().takeIdCardPictures(this, ICertificatePhohosView.ID_CARD_SIDE_BACK);
             }
-        } else if (id == R.id.take_picture) {
+        } else if (id == R.id.take_picture_ry) {
             if (hasCampermission(CAMERA_WRITE_PI_PERMISSION)) {
                 getMvpView().showDialog();
             }
+        }else if(id == R.id.next){
+            if (binding.frontTx.getVisibility() == View.VISIBLE && binding.backTx.getVisibility() == View.VISIBLE
+                    && binding.picTx.getVisibility() == View.VISIBLE) {
+
+            }
         }
     }
@@ -6,11 +6,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
 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;
@@ -40,13 +37,14 @@ 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.ImagePicker;
+import com.cnlive.media.picker.PickerConfig;
 import com.cnlive.media.picker.utils.ImagePickerComUtils;
 import java.io.File;
 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;
@@ -150,6 +148,7 @@ public class TakeIdentityPictureView extends BaseView {
      * @param imageView
      */
     public void showIdCard(String idCardSide, Bitmap bitmap, ImageView imageView) {
+        bitmap = getNewBitmap(bitmap, 320, 180);
         RequestOptions options = new RequestOptions();
         options.skipMemoryCache(true);
         options.diskCacheStrategy(DiskCacheStrategy.NONE);
@@ -191,24 +190,22 @@ public class TakeIdentityPictureView extends BaseView {
             public void onResult(IDCardResult idCardResult) {
                 if (idCardResult != null) {
                     if (isEffectiveFront(idCardResult) || isEffectiveBack(idCardResult)) {
-                        Bitmap bitmap = ImageUtil.drawTextToRightBottom(getContext(), BitmapFactory.decodeFile(filePath), getContext().getString(R.string.only_for_verified), 20, getContext().getResources().getColor(R.color.grayText), 10, 10);
+                        Bitmap bitmap = ImageUtil.drawTextToRightBottom(getContext(), BitmapFactory.decodeFile(filePath), getContext().getString(R.string.only_for_verified), 15, getContext().getResources().getColor(R.color.grayText), 10, 10);
                         if (idCardSide.equals(IDCardParams.ID_CARD_SIDE_FRONT)) {
                             isFrontEffective = true;
                             idCardNo = idCardResult.getIdNumber().toString();
                             realName = idCardResult.getName().toString();
                             if (TextUtils.isEmpty(idCardNo) || TextUtils.isEmpty(realName)) {
-//                                activity.binding.submit.setClickable(false);
+                                activity.binding.next.setClickable(false);
                                 AlertUtil.showDeftToast(getContext(), "身份证信息读取失败，请重新拍摄");
                                 return;
                             }
                             frontBitmap = bitmap;
+                            activity.binding.frontTx.setVisibility(View.VISIBLE);
                             showIdCard(idCardSide, frontBitmap, activity.binding.certificateFront);
-                            activity.binding.certificateFront.setImageBitmap(bitmap);
                             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));
+                                setNextShowColor();
                             }
                         }
@@ -217,14 +214,12 @@ public class TakeIdentityPictureView extends BaseView {
                             isBackEffective = true;
                             if (TextUtils.isEmpty(idCardResult.getIssueAuthority().toString().trim()) ||
                                     TextUtils.isEmpty(idCardResult.getSignDate().toString().trim())) {
-//                                activity.binding.submit.setClickable(false);
                                 AlertUtil.showDeftToast(getContext(), "身份证信息读取失败，请重新拍摄");
                                 return;
                             }
                             try {
                                 Integer.parseInt(idCardResult.getExpiryDate().toString().trim());
                                 if (idCardResult.getExpiryDate() != null && Integer.parseInt(idCardResult.getExpiryDate().toString().trim()) < getCurrentTime()) {
-//                                    activity.binding.submit.setClickable(false);
                                     AlertUtil.showDeftToast(getContext(), "身份证有效期失效");
                                     return;
                                 }
@@ -232,17 +227,14 @@ public class TakeIdentityPictureView extends BaseView {
                                 e.printStackTrace();
                             }
-
+                            activity.binding.backTx.setVisibility(View.VISIBLE);
                             showIdCard(idCardSide, backBitmap, activity.binding.certificateBack);
                             activity.binding.certificateBack.setImageBitmap(bitmap);
                             if (!TextUtils.isEmpty(idCardNo) && !TextUtils.isEmpty(realName)) {
-//                                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));
+                                setNextShowColor();
                             }
                         }
                     } else {
-//                        activity.binding.submit.setClickable(false);
                         AlertUtil.showDeftToast(getContext(), "身份证信息读取失败，请重新拍摄");
                     }
                 }
@@ -260,6 +252,21 @@ public class TakeIdentityPictureView extends BaseView {
     }
+    public Bitmap getNewBitmap(Bitmap bitmap, int newWidth, int newHeight) {
+        // 获得图片的宽高.
+        int width = bitmap.getWidth();
+        int height = bitmap.getHeight();
+        // 计算缩放比例.
+        float scaleWidth = ((float) newWidth) / width;
+        float scaleHeight = ((float) newHeight) / height;
+        // 取得想要缩放的matrix参数.
+        Matrix matrix = new Matrix();
+        matrix.postScale(scaleWidth, scaleHeight);
+        // 得到新的图片.
+        Bitmap newBitmap = Bitmap.createBitmap(bitmap, 0, 0, width, height, matrix, true);
+        return newBitmap;
+    }
+
     private Integer getCurrentTime() {
         SimpleDateFormat sDateFormat = new SimpleDateFormat("yyyyMMdd");
         String date = sDateFormat.format(new Date());
@@ -307,30 +314,49 @@ public class TakeIdentityPictureView extends BaseView {
                 .selectMode(PickerConfig.PICKER_IMAGE)
                 .cachePath(Environment.getExternalStorageDirectory() + "/strike/file/")
                 .isSinglePick(true)
-                .doCrop(1, 1, 300, 300)
+                .doCrop(1, 1, 200, 200)
                 .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()){
+    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);
+        if (numberOfFaceDetected == 1) {
+            setNextShowColor();
+            activity.binding.picTx.setVisibility(View.VISIBLE);
+            GlideUtil.init(activity, path).error(R.drawable.upload).into(activity.binding.takePicture);
+            setNextShowColor();
+        }else {
+            AlertUtil.showDeftToast(getContext(), "请确保肩部至头部清晰可见");
+             if (new File(path).exists()) {
                 new File(path).delete();
             }
+        }
+
+
+    }
+
+    private void setNextShowColor() {
+        if (activity.binding.frontTx.getVisibility() == View.VISIBLE && activity.binding.backTx.getVisibility() == View.VISIBLE
+                && activity.binding.picTx.getVisibility() == View.VISIBLE) {
+            activity.binding.next.setTextColor(activity.getResources().getColor(R.color.white));
+            activity.binding.next.setBackground(getContext().getResources().getDrawable(R.drawable.bg_apply_btn));
+        }else {
+            activity.binding.next.setTextColor(activity.getResources().getColor(R.color.color_b4b4b4));
+            activity.binding.next.setBackground(getContext().getResources().getDrawable(R.drawable.bg_shape_gray));
+        }
     }
 }
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#4CAAFC" />
+    <corners android:radius="20dp" />
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#D8D8D8" />
+    <corners android:radius="20dp" />
+</shape>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:bottomLeftRadius="10dp"
+        android:bottomRightRadius="10dp" />
+    <solid android:color="#66000000" />
+</shape>
 \ No newline at end of file
@@ -2,6 +2,7 @@
 <layout>
     <data>
+
         <variable
             name="click"
             type="android.view.View.OnClickListener" />
@@ -12,6 +13,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/white"
         android:orientation="vertical"
         tools:context=".activity.TakeIdentityPictureActivity">
@@ -38,15 +40,15 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="11dp"
+                        android:layout_marginTop="10dp"
                         android:text="@string/step_one"
                         android:textColor="#ff1a1a1a"
                         android:textSize="16sp" />
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="14dp"
+                        android:layout_marginTop="10dp"
                         android:orientation="horizontal">
                         <TextView
@@ -71,28 +73,42 @@
                             android:textSize="12sp" />
                     </LinearLayout>
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:id="@+id/certificate_front_ry"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="10dp"
+                    android:onClick="@{click}">
                     <ImageView
                         android:id="@+id/certificate_front"
-                        android:layout_width="wrap_content"
+                        android:layout_width="280dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginBottom="22dp"
-                        android:onClick="@{click}"
                         android:src="@drawable/observer_idcard_front" />
-                </LinearLayout>
+                    <TextView
+                        android:id="@+id/front_tx"
+                        android:layout_width="280dp"
+                        android:layout_height="30dp"
+                        android:layout_alignParentBottom="true"
+                        android:background="#66000000"
+                        android:visibility="gone"
+                        android:gravity="center"
+                        android:text="@string/change"
+                        android:textColor="@color/white"
+                        android:textSize="14sp" />
+                </RelativeLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:background="#f2f2f2" />
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="30dp"
                     android:orientation="vertical">
+
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -102,9 +118,9 @@
                         android:textSize="16sp" />
                     <LinearLayout
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="14dp"
+                        android:layout_marginTop="10dp"
                         android:orientation="horizontal">
                         <TextView
@@ -129,28 +145,40 @@
                             android:textSize="12sp" />
                     </LinearLayout>
+                </LinearLayout>
+
+                <RelativeLayout
+                    android:id="@+id/certificate_back_ry"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="10dp"
+                    android:onClick="@{click}">
                     <ImageView
                         android:id="@+id/certificate_back"
-                        android:layout_width="wrap_content"
+                        android:layout_width="280dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginBottom="22dp"
-                        android:onClick="@{click}"
                         android:src="@drawable/observer_idcard_back" />
-                </LinearLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="10dp"
-                    android:background="#f2f2f2" />
+                    <TextView
+                        android:id="@+id/back_tx"
+                        android:layout_width="280dp"
+                        android:layout_height="30dp"
+                        android:layout_alignParentBottom="true"
+                        android:background="#66000000"
+                        android:visibility="gone"
+                        android:gravity="center"
+                        android:text="@string/change"
+                        android:textColor="@color/white"
+                        android:textSize="14sp" />
+                </RelativeLayout>
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="30dp"
                     android:orientation="vertical">
                     <TextView
@@ -161,31 +189,54 @@
                         android:textColor="#ff1a1a1a"
                         android:textSize="16sp" />
-                    <LinearLayout
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="14dp"
-                        android:orientation="horizontal">
+                        android:layout_marginTop="10dp"
+                        android:text="@string/take_photo_yourself"
+                        android:textColor="@color/color_9c9c9c"
+                        android:textSize="12sp" />
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/take_photo_yourself"
-                            android:textColor="@color/color_9c9c9c"
-                            android:textSize="12sp" />
+                </LinearLayout>
-                    </LinearLayout>
+                <RelativeLayout
+                    android:id="@+id/take_picture_ry"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="10dp"
+                    android:onClick="@{click}">
                     <ImageView
                         android:id="@+id/take_picture"
-                        android:layout_width="wrap_content"
+                        android:layout_width="130dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginBottom="22dp"
-                        android:onClick="@{click}"
-                        android:src="@drawable/take_photo" />
-                </LinearLayout>
+                        android:src="@drawable/upload" />
+                    <TextView
+                        android:id="@+id/pic_tx"
+                        android:layout_width="130dp"
+                        android:layout_height="30dp"
+                        android:layout_alignParentBottom="true"
+                        android:visibility="gone"
+                        android:background="#66000000"
+                        android:gravity="center"
+                        android:text="@string/change"
+                        android:textColor="@color/white"
+                        android:textSize="14sp" />
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/next"
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp"
+                    android:layout_margin="30dp"
+                    android:background="@drawable/bg_shape_gray"
+                    android:gravity="center"
+                    android:text="@string/next"
+                    android:textColor="@color/color_b4b4b4"
+                    android:onClick="@{click}"
+                    android:textSize="18sp" />
             </LinearLayout>
         </ScrollView>
     </LinearLayout>
@@ -33,4 +33,5 @@
     <color name="color_C1C1C1">#C1C1C1</color>
     <color name="color_F9F9F9">#F9F9F9</color>
     <color name="color_4EABFD">#4EABFD</color>
+    <color name="color_b4b4b4">#B4B4B4</color>
 </resources>
 \ No newline at end of file
@@ -8,7 +8,7 @@
     <string name="step_tow">第二步</string>
     <string name="back">反面</string>
     <string name="step_third">第三步</string>
-    <string name="take_photo_yourself">请您拍摄本人照片，确保肩部至头部清晰可见</string>
+    <string name="take_photo_yourself">请上传您本人照片，确保肩部至头部清晰可见</string>
     <string name="init_baidu_faile">初始化失败</string>
@@ -16,6 +16,8 @@
     <string name="tak_picture">拍摄</string>
     <string name="to_picture">从手机相册选择</string>
     <string name="cancle">取消</string>
+    <string name="next">下一步</string>
+    <string name="change">更改</string>
     <string name="string_fill_in_company_data_license_tip">我同意并已阅读<font color="#4EABFD">《中国网+内容安全协议》</font></string>
 </resources>
@@ -3,13 +3,13 @@ package com.cnlive.moudle.pedometer.sql.dao;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteStatement;
+import com.cnlive.moudle.pedometer.sql.entity.CalorieEntity;
+
 import org.greenrobot.greendao.AbstractDao;
 import org.greenrobot.greendao.Property;
-import org.greenrobot.greendao.internal.DaoConfig;
 import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.database.DatabaseStatement;
-
-import com.cnlive.moudle.pedometer.sql.entity.CalorieEntity;
+import org.greenrobot.greendao.internal.DaoConfig;
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**