add 调通idcard功能

Components/newscontent/build.gradle

@@ -62,8 +62,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     rootProject.ext.dependencies.other.each{
         implementation project(it)

Components/newscontent/src/main/AndroidManifest.xml

@@ -80,6 +80,10 @@
             android:name=".ui.idcard.IDCardTestActivity"
             android:theme="@style/Transparent" />
 
+        <activity
+            android:name=".ui.idcard.IDCardResultActivity"
+            android:theme="@style/Transparent" />
+
         <activity
             android:name=".ui.ProtocolActivity"
             android:theme="@style/Transparent" />

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/idcard/IDCardResultActivity.kt

+package com.yidian.shenghuoquan.newscontent.ui.idcard
+
+import android.os.Bundle
+import com.yidian.common.base.BaseActivity
+import com.yidian.shenghuoquan.newscontent.databinding.ActivityIdcardResultBinding
+
+/**
+ * Author: sym
+ * Date: 2021/5/20 6:51 PM
+ * Describe:
+ */
+class IDCardResultActivity:BaseActivity<ActivityIdcardResultBinding>() {
+    override fun createViewBinding(): ActivityIdcardResultBinding {
+        return ActivityIdcardResultBinding.inflate(layoutInflater)
+    }
+
+    override fun getXPageName(): String {
+        return ""
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+    }
+}
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/idcard/IDCardTestActivity.kt

 package com.yidian.shenghuoquan.newscontent.ui.idcard
 
+import android.Manifest
+import android.app.Activity
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import com.megvii.demo.activity.IDCardDetectActivity
@@ -36,6 +40,9 @@ class IDCardTestActivity : BaseActivity<ActivityIdcardBinding>() {
             //2、请求授权信息
             startGetLicense()
         }
+
+        requestCameraPerm()
+
     }
 
     private fun startGetLicense() {
@@ -84,6 +91,11 @@ class IDCardTestActivity : BaseActivity<ActivityIdcardBinding>() {
         }
     }
 
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        //@TODO 权限通过后的回调
+
+    }
 
     private fun initConfig() {
         if (viewBind.rbV.isChecked) {
@@ -99,4 +111,31 @@ class IDCardTestActivity : BaseActivity<ActivityIdcardBinding>() {
     }
 
 
+    private fun requestCameraPerm() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (checkSelfPermission(Manifest.permission.CAMERA)
+                != PackageManager.PERMISSION_GRANTED
+            ) {
+                requestPermissions(
+                    arrayOf(Manifest.permission.CAMERA),
+                    100
+                )
+            }
+        }
+    }
+
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == INTO_IDCARDSCAN_PAGE && resultCode == Activity.RESULT_OK) {
+            val intent: Intent = Intent(this, IDCardResultActivity::class.java)
+            if (data != null) {
+                intent.putExtra("portraitimg_bitmap", data.getByteArrayExtra("portraitimg_bitmap"))
+            }
+            if (data != null) {
+                intent.putExtra("idcardimg_bitmap", data.getByteArrayExtra("idcardimg_bitmap"))
+            }
+            startActivity(intent)
+        }
+    }
 }
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/utils/AccountUtil.kt

@@ -10,11 +10,11 @@ import com.yidian.shenghuoquan.newscontent.bean.TokenBean
 import java.util.*
 
 class AccountUtil {
-    companion object{
+    companion object {
         @Synchronized
-        fun getGuestUsername(): String{
+        fun getGuestUsername(): String {
             var username = Hawk.get(HawkConfig.GuestAccountUsername, "")
-            if(TextUtils.isEmpty(username)){
+            if (TextUtils.isEmpty(username)) {
                 username = try {
                     val uuid = UUID.randomUUID()
                     "HG_$uuid"
@@ -30,19 +30,19 @@ class AccountUtil {
             return username
         }
 
-        fun getPassword(username: String): String{
+        fun getPassword(username: String): String {
             val strLower = username.toLowerCase()
             val strMd5 = EncryptUtil.getMD5(username)
             val strTemp = strLower + strMd5
             return encryptMore(strTemp, 1000)
         }
 
-        private fun encryptMore (str: String, count: Int): String{
+        private fun encryptMore(str: String, count: Int): String {
             val strTemp = EncryptUtil.encryptToSHA(str)
             val num = count - 1
-            return if(num > 0){
+            return if (num > 0) {
                 encryptMore(strTemp, num)
-            }else{
+            } else {
                 strTemp
             }
         }

Components/newscontent/src/main/res/layout/activity_idcard_result.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/result_face_image"
+        android:layout_width="100dp"
+        android:layout_marginTop="50dp"
+        android:layout_height="100dp"
+        android:scaleType="fitCenter" />
+
+
+    <ImageView
+        android:id="@+id/result_idcard_image"
+        android:layout_width="300dp"
+        android:layout_height="200dp"
+        android:layout_marginTop="10dp"
+        android:scaleType="fitCenter" />
+
+</LinearLayout>
\ No newline at end of file

app/build.gradle

@@ -8,7 +8,7 @@ android {
     compileSdkVersion build_versions.compileSdkVersion
 
     defaultConfig {
-        applicationId "com.yidian.subway"
+        applicationId "com.shenghuoquan.business"
         minSdkVersion build_versions.minSdkVersion
         targetSdkVersion build_versions.targetSdkVersion
         versionCode rootProject.ext.android.versionCode