Browse Source

1.营业执照OCR。

石慧云 4 years ago
parent
commit
78bbc8fb47

+ 4 - 0
app/src/main/java/com/quansu/heifengwuliu/activity/ComVerityActivity.kt

@@ -3,6 +3,7 @@ package com.quansu.heifengwuliu.activity
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import com.luck.picture.lib.PictureSelector
 import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.base.MBActivity
@@ -76,7 +77,10 @@ class ComVerityActivity : MBActivity<ComVerityVModel, ActivityComVerifyBinding>(
 
     override fun onUploadSuccess(t: String) {
         val ss: Array<String> = t.split(",".toRegex()).toTypedArray()
+
         vm.imgBL.value = ss[1]
+
+        vm.discernBusiness(ss[1])
     }
 
     override fun onUploadError(error: String?) {

+ 10 - 0
app/src/main/java/com/quansu/heifengwuliu/model/Business.kt

@@ -0,0 +1,10 @@
+package com.quansu.heifengwuliu.model
+
+import com.ysnows.base.inter.IModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/21
+ */
+data class Business(var enterprise_name:String,var reg_num:String): IModel {
+}

+ 9 - 0
app/src/main/java/com/quansu/heifengwuliu/utils/net/ApiService.kt

@@ -372,4 +372,13 @@ interface ApiService {
     fun cvIdcard(@Query("img") img: String?): Observable<Response<Idcard>>
 
 
+    /**
+     * 识别营业执照-OCR
+     * @return
+     */
+    @GET("api/wxocr/cv_businessLicense")
+    fun cvBusinessLicense(@Query("img") img: String?): Observable<Response<Business>>
+
+
+
 }

+ 17 - 0
app/src/main/java/com/quansu/heifengwuliu/vmodel/ComVerityVModel.kt

@@ -5,6 +5,8 @@ import android.text.TextUtils
 import androidx.databinding.Bindable
 import androidx.lifecycle.MutableLiveData
 import com.quansu.heifengwuliu.BR
+import com.quansu.heifengwuliu.model.Business
+import com.quansu.heifengwuliu.model.Idcard
 import com.quansu.heifengwuliu.repository.ComVerifyRepository
 import com.quansu.heifengwuliu.utils.ChosePhotoUtils
 import com.quansu.heifengwuliu.utils.net.NetEngine
@@ -82,6 +84,21 @@ class ComVerityVModel : BViewModel<ComVerifyRepository>() {
 
     }
 
+    fun discernBusiness(img:String){//识别营业执照
+
+        repository().lreq(NetEngine.service.cvBusinessLicense(img))
+                .doOnNext {
+                    if (it.ok()) {
+                        var bean=it.data() as Business
+                        name=bean.enterprise_name
+                        iDNumber=bean.reg_num
+
+                    }
+                }
+                .subscribe()
+
+    }
+
 
 
 }

+ 1 - 1
app/src/main/java/com/quansu/heifengwuliu/vmodel/PersonalVerityVModel.kt

@@ -54,7 +54,7 @@ class PersonalVerityVModel : BViewModel<PersonalVerifyRepository>() {
     fun  toSubmit(){
 
         if(TextUtils.isEmpty(imgIDMan.value)){
-            toast("请上传份证人像面图片")
+            toast("请上传份证人像面图片")
             return
         }
 

BIN
app/src/main/res/drawable-xxhdpi/ic_company_bg.png


+ 147 - 56
app/src/main/res/layout/activity_com_verify.xml

@@ -10,57 +10,107 @@
             type="com.quansu.heifengwuliu.vmodel.ComVerityVModel" />
     </data >
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingStart="@dimen/dp_14"
-        android:paddingEnd="@dimen/dp_14" >
+        android:orientation="vertical"
+        android:paddingStart="17dp"
+        android:paddingEnd="16dp" >
+
 
-        <TextView
-            android:id="@+id/tv_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_55"
-            android:text="@string/bl_upload"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
 
-        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
-            android:id="@+id/img_id_man"
+        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            android:id="@+id/ll_top"
             android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:layout_marginTop="@dimen/dp_8"
-            android:onClick="@{v->vm.choseImg()}"
-            android:src="@drawable/ic_default_image"
-            app:layout_constraintStart_toStartOf="@id/tv_title"
-            app:layout_constraintTop_toBottomOf="@id/tv_title"
-            app:qmui_radius="1dp"
-            app:url="@{vm.imgBL}" />
+            android:layout_marginTop="12dp"
+            app:qmui_borderColor="@color/white"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_radius="@dimen/dp_4"
+            android:paddingStart="@dimen/dp_10"
+            android:paddingEnd="@dimen/dp_11"
+            android:orientation="vertical"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dp"
+                android:text="@string/bl_upload"
+                android:textColor="#26292F"
+                android:textSize="14sp"
+                 />
+
+            <com.qmuiteam.qmui.widget.QMUIRadiusImageView
+                android:id="@+id/img_id_man"
+                android:layout_width="match_parent"
+                android:layout_height="166dp"
+                android:layout_marginStart="23dp"
+                android:layout_marginEnd="22dp"
+                android:layout_marginTop="22dp"
+                android:onClick="@{v->vm.choseImg()}"
+                android:src="@drawable/ic_company_bg"
+                app:layout_constraintStart_toStartOf="@id/tv_title"
+                app:layout_constraintTop_toBottomOf="@id/tv_title"
+                app:qmui_radius="1dp"
+                app:url="@{vm.imgBL}" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="9dp"
+                android:layout_gravity="center"
+                android:layout_marginBottom="21dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="点击上传 "
+                    android:textColor="#7B7B7B"
+                    android:textSize="13sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="营业执照"
+                    android:textColor="#F5BF41"
+                    android:textSize="13sp" />
+
+
+            </LinearLayout>
+
+
+
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
 
         <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
             android:id="@+id/lay_input"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_12"
-            android:gravity="center_vertical"
+            android:layout_marginTop="12dp"
             android:orientation="vertical"
-            android:paddingStart="@dimen/dp_8"
-            android:paddingEnd="@dimen/dp_14"
-            app:layout_constraintTop_toBottomOf="@id/img_id_man"
-            app:qmui_borderColor="#F4F3F9"
-            app:qmui_borderWidth="@dimen/dp_1"
-            app:rv_radius="25dp" >
-
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:gravity="center_vertical"
-                android:paddingStart="@dimen/dp_8"
-                android:paddingEnd="@dimen/dp_14" >
+            android:paddingStart="11dp"
+            android:paddingTop="3dp"
+            android:paddingEnd="11dp"
+            android:paddingBottom="3dp"
+            app:qmui_backgroundColor="@color/white"
+            app:qmui_borderColor="@color/white"
+            app:qmui_radius="4dp">
+
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:layout_height="50dp">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:textColor="#26292F"
+                    android:textSize="14sp"
+                    android:minWidth="56dp"
                     android:text="公司名称" />
 
                 <com.ysnows.base.widget.DelEditText
@@ -70,22 +120,36 @@
                     android:background="@color/white"
                     android:hint="请输入公司名称"
                     android:paddingStart="@dimen/dp_18"
+                    android:gravity="right|center"
                     android:text="@={vm.name}"
+                    android:textColorHint="#979899"
+                    android:textColor="#26292F"
                     android:textSize="@dimen/sp_13" />
 
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
 
-            <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout
+            </LinearLayout>
+
+            <View
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:gravity="center_vertical"
-                android:paddingStart="@dimen/dp_8"
-                android:paddingEnd="@dimen/dp_14" >
+                android:layout_marginEnd="3dp"
+                android:layout_marginStart="2dp"
+                android:background="@color/line_color"
+                android:layout_height="@dimen/dp_1"/>
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:layout_height="50dp">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="证件编号" />
+                    android:textColor="#26292F"
+                    android:textSize="14sp"
+                    android:minWidth="56dp"
+                    android:text="统一社会信用代码" />
 
                 <com.ysnows.base.widget.DelEditText
                     android:id="@+id/edt_id_number"
@@ -93,37 +157,64 @@
                     android:layout_height="match_parent"
                     android:background="@color/white"
                     android:hint="请输入证件编号"
+                    android:inputType="phone"
                     android:paddingStart="@dimen/dp_18"
                     android:text="@={vm.iDNumber}"
+                    android:gravity="center|right"
+                    android:textColor="#26292F"
+                    android:textColorHint="#979899"
                     android:textSize="@dimen/sp_13" />
 
-            </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
+            </LinearLayout>
+
+
+
+
+        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
+
+
 
-        </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
 
         <TextView
             android:id="@+id/tv_tip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/sp_12"
+            android:layout_marginTop="14dp"
             android:text="@string/personal_verify_tip"
-            android:textColor="#F17706"
+            android:textColor="#767778"
             android:textSize="@dimen/sp_12"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/lay_input" />
 
-        <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
-            android:id="@+id/btn_submmit"
+
+
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_40"
-            android:layout_marginStart="@dimen/dp_30"
-            android:layout_marginEnd="@dimen/dp_30"
-            android:layout_marginBottom="@dimen/dp_30"
+            android:layout_marginTop="13dp"
             android:onClick="@{v->vm.toSubmit()}"
             android:visibility="@{vm.isShow?View.VISIBLE :View.GONE}"
-            android:text="@string/submit"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_tip"
+            android:layout_height="wrap_content">
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="106dp"
+                android:src="@drawable/ic_details_grab" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_gravity="center"
+                android:text="提交"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:layout_height="wrap_content">
+
+            </TextView>
+
+        </FrameLayout>
+
+
 
-    </androidx.constraintlayout.widget.ConstraintLayout >
+    </LinearLayout >
 
 </layout >