1.公司认证。

app/src/main/java/com/quansu/heifengwuliu/activity/ComVerityActivity.kt

@@ -1,15 +1,28 @@
 package com.quansu.heifengwuliu.activity
 
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import com.luck.picture.lib.PictureSelector
 import com.quansu.heifengwuliu.R
 import com.quansu.heifengwuliu.base.MBActivity
+import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.databinding.ActivityComVerifyBinding
+import com.quansu.heifengwuliu.inte.OnUploadCallback
 import com.quansu.heifengwuliu.repository.ComVerifyRepository
+import com.quansu.heifengwuliu.utils.OssUtils
 import com.quansu.heifengwuliu.vmodel.ComVerityVModel
 import com.ysnows.base.base.BRepository
+import java.util.ArrayList
 
-class ComVerityActivity : MBActivity<ComVerityVModel, ActivityComVerifyBinding>() {
+class ComVerityActivity : MBActivity<ComVerityVModel, ActivityComVerifyBinding>() , OnUploadCallback<String> {
 
 
+    override fun initCreate(savedInstanceState: Bundle?) {
+        super.initCreate(savedInstanceState)
+        vm.getInfo()
+    }
+
     override fun title(): String? {
         return getString(R.string.com_verify)
     }
@@ -25,4 +38,48 @@ class ComVerityActivity : MBActivity<ComVerityVModel, ActivityComVerifyBinding>(
     override fun createRepository(): BRepository {
         return ComVerifyRepository()
     }
-}
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode != Activity.RESULT_OK) {
+            return
+        }
+        if (requestCode == MIntentAction.REQUEST_CODE_THREE) {//图片
+
+            val selectList = PictureSelector.obtainMultipleResult(data)
+            val list = ArrayList<String>()
+            if (null != selectList) {
+                for (path in selectList) {
+                    list.add(path.path)
+                }
+
+                OssUtils(this)
+                        .setUpLoad("company", list, this)
+
+            }
+
+            return
+
+        }
+        if (requestCode == MIntentAction.REQUEST_CODE_CAMERA) {//拍照
+            //拍照
+            val selectList = PictureSelector.obtainMultipleResult(data) ?: return
+            val list = ArrayList<String>()
+            list.add(selectList[0].path)
+            OssUtils(this)
+                    .setUpLoad("idcard", list, this)
+
+            return
+        }
+
+    }
+
+    override fun onUploadSuccess(t: String) {
+        val ss: Array<String> = t.split(",".toRegex()).toTypedArray()
+        vm.imgBL.value = ss[1]
+    }
+
+    override fun onUploadError(error: String?) {
+
+    }
+}

app/src/main/java/com/quansu/heifengwuliu/activity/PersonalVerityActivity.kt

@@ -57,17 +57,18 @@ class PersonalVerityActivity : MBActivity<PersonalVerityVModel, ActivityPersonal
                 OssUtils(this)
                         .setUpLoad("idcard", list, this)
 
-
             }
 
-
             return
 
         }
         if (requestCode == MIntentAction.REQUEST_CODE_CAMERA) {//拍照
             //拍照
             val selectList = PictureSelector.obtainMultipleResult(data) ?: return
-            vm.imgIDEmblem.value = selectList[0].path
+            val list = ArrayList<String>()
+            list.add(selectList[0].path)
+            OssUtils(this)
+                    .setUpLoad("idcard", list, this)
 
             return
         }
@@ -79,7 +80,6 @@ class PersonalVerityActivity : MBActivity<PersonalVerityVModel, ActivityPersonal
         val ss: Array<String> = t.split(",".toRegex()).toTypedArray()
         //ss[0]--//不完整路径-接口需要   ss[1]完整路径
 
-        //todo:
         if (vm.type == "1") {
             vm.imgIDMan.value = ss[1]
         } else {

app/src/main/java/com/quansu/heifengwuliu/model/InfoBean.kt

@@ -13,6 +13,8 @@ class InfoBean(var info_id:String,var uid:String,
                var name:String,var idcard:String,
                var status:String,
                var create_time:String,var update_time:String,
-               var delete_time:String
+               var delete_time:String,var license_img:String,
+               var license_sn:String,var company_name:String
+
      ): IModel {
 }

app/src/main/java/com/quansu/heifengwuliu/utils/PopupUtils.java

@@ -55,6 +55,8 @@ public class PopupUtils {
         startDate.set(1980, 0, 23);
 
         Calendar endDate = Calendar.getInstance();
+        endDate.set(2020, 12, 31);
+
 
         TimePickerView timePickerView = new TimePickerBuilder(context, new OnTimeSelectListener() {
             @Override
@@ -67,7 +69,7 @@ public class PopupUtils {
             }
         }).setRangDate(startDate, endDate)
                 .setDate(endDate)
-                .setType(new boolean[]{true, true, true, false, false, false})
+                .setType(new boolean[]{true, true, true, true, true, true})
                 .build();
 
         timePickerView.setDate(Calendar.getInstance());

app/src/main/java/com/quansu/heifengwuliu/utils/net/ApiService.kt

@@ -282,10 +282,22 @@ interface ApiService {
 
 
     /**
-     * 所有司机
+     * 获取信息-认证信息 身份 车辆 公司
      * @return
      */
     @GET("api/user/getInfo")
     fun getInfo(@Query("type") type: String?): Observable<Response<InfoBean>>
 
+
+    /**
+     * 公司认证
+     * @return
+     */
+    @POST("api/user/setCompany")
+    @FormUrlEncoded
+    fun setCompany(@Field("license_img") license_img: String?, @Field("license_sn") license_sn: String?,
+                @Field("company_name") company_name: String?
+    ): Observable<Response<Any>>
+
+
 }

app/src/main/java/com/quansu/heifengwuliu/vmodel/ComVerityVModel.kt

@@ -1,14 +1,20 @@
 package com.quansu.heifengwuliu.vmodel
 
+import android.app.Activity
+import android.text.TextUtils
 import androidx.databinding.Bindable
 import androidx.lifecycle.MutableLiveData
 import com.quansu.heifengwuliu.BR
 import com.quansu.heifengwuliu.repository.ComVerifyRepository
+import com.quansu.heifengwuliu.utils.ChosePhotoUtils
+import com.quansu.heifengwuliu.utils.net.NetEngine
 import com.ysnows.base.base.BViewModel
 
 class ComVerityVModel : BViewModel<ComVerifyRepository>() {
 
     var imgBL: MutableLiveData<String> = MutableLiveData("")
+    var isShow: MutableLiveData<Boolean> = MutableLiveData(true)
+
 
     @Bindable
     var name: String? = null
@@ -24,5 +30,58 @@ class ComVerityVModel : BViewModel<ComVerifyRepository>() {
             notifyPropertyChanged(BR.iDNumber)
         }
 
+    fun choseImg(){
+        //选择照片
+        ChosePhotoUtils.getChosePhoto(view()!!.context(), 1)
+
+    }
+
+    fun  toSubmit(){
+
+        if(TextUtils.isEmpty(imgBL.value)){
+            toast("请上传营业执照照片")
+            return
+        }
+        if(TextUtils.isEmpty(name)){
+            toast("请输入公司名称")
+            return
+        }
+
+        if(TextUtils.isEmpty(iDNumber)){
+            toast("请输入证件编号")
+            return
+        }
+
+        repository().lreq(NetEngine.service.setCompany(imgBL.value,iDNumber,name))
+                .doOnNext {
+                    if (it.ok(true)) {
+                        (repository().context as Activity).finish()
+                    }
+                }
+                .subscribe()
+    }
+
+    fun getInfo(){
+        //获取个人信息
+        repository().lreq(NetEngine.service.getInfo("3"))
+                .doOnNext {
+                    if (it.ok(true)) {
+                        var bean=it.data()
+                        if(null!=bean){
+                            isShow.value = bean.status != "1"
+                            //设置值
+                            imgBL.value=bean.license_img
+                            name=bean.company_name
+                            iDNumber=bean.license_sn
+
+                        }
+
+                    }
+                }
+                .subscribe()
+
+    }
+
+
 
-}
+}

app/src/main/res/layout/activity_com_verify.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <data >
+        <import type="android.view.View" />
 
         <variable
             name="vm"
@@ -29,6 +30,7 @@
             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"
@@ -44,7 +46,6 @@
             android:orientation="vertical"
             android:paddingStart="@dimen/dp_8"
             android:paddingEnd="@dimen/dp_14"
-            android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/img_id_man"
             app:qmui_borderColor="#F4F3F9"
             app:qmui_borderWidth="@dimen/dp_1"
@@ -60,15 +61,14 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/name" />
+                    android:text="公司名称" />
 
                 <com.ysnows.base.widget.DelEditText
                     android:id="@+id/edt_name"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="@color/white"
-                    android:hint="@string/name_must_equal_to_id_card"
-                    android:inputType="phone"
+                    android:hint="请输入公司名称"
                     android:paddingStart="@dimen/dp_18"
                     android:text="@={vm.name}"
                     android:textSize="@dimen/sp_13" />
@@ -85,17 +85,16 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/id_number" />
+                    android:text="证件编号" />
 
                 <com.ysnows.base.widget.DelEditText
                     android:id="@+id/edt_id_number"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="@color/white"
-                    android:hint="@string/please_input_id_number"
-                    android:inputType="phone"
+                    android:hint="请输入证件编号"
                     android:paddingStart="@dimen/dp_18"
-                    android:text="@={vm.IDNumber}"
+                    android:text="@={vm.iDNumber}"
                     android:textSize="@dimen/sp_13" />
 
             </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
@@ -120,9 +119,11 @@
             android:layout_marginStart="@dimen/dp_30"
             android:layout_marginEnd="@dimen/dp_30"
             android:layout_marginBottom="@dimen/dp_30"
+            android:onClick="@{v->vm.toSubmit()}"
+            android:visibility="@{vm.isShow?View.VISIBLE :View.GONE}"
             android:text="@string/submit"
             app:layout_constraintBottom_toBottomOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout >
 
-</layout >
+</layout >

base/src/main/java/com/ysnows/base/utils/TimeUtil.java

@@ -422,6 +422,7 @@ public class TimeUtil {
         return format.format(date);
     }
 
+
     public static String getHMTime(Date date) {//可根据需要自行截取数据显示
         SimpleDateFormat format = new SimpleDateFormat("HH:mm");
         return format.format(date);