Browse Source

1.身份认证完成。

石慧云 4 năm trước cách đây
mục cha
commit
a066a01e37

+ 4 - 11
app/src/main/java/com/quansu/heifengwuliu/activity/PersonalVerityActivity.kt

@@ -3,14 +3,12 @@ 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
 import com.quansu.heifengwuliu.config.MIntentAction
 import com.quansu.heifengwuliu.databinding.ActivityPersonalVerifyBinding
 import com.quansu.heifengwuliu.inte.OnUploadCallback
-import com.quansu.heifengwuliu.model.User
 import com.quansu.heifengwuliu.repository.PersonalVerifyRepository
 import com.quansu.heifengwuliu.utils.OssUtils
 import com.quansu.heifengwuliu.vmodel.PersonalVerityVModel
@@ -22,11 +20,7 @@ class PersonalVerityActivity : MBActivity<PersonalVerityVModel, ActivityPersonal
 
     override fun initCreate(savedInstanceState: Bundle?) {
         super.initCreate(savedInstanceState)
-        var user= User.get()
-        if(null!=user&&user.isInfo){
-            vm.getInfo()
-        }
-
+        vm.getInfo()
     }
 
     override fun binding(): ActivityPersonalVerifyBinding {
@@ -64,7 +58,6 @@ class PersonalVerityActivity : MBActivity<PersonalVerityVModel, ActivityPersonal
                         .setUpLoad("idcard", list, this)
 
 
-
             }
 
 
@@ -74,7 +67,7 @@ class PersonalVerityActivity : MBActivity<PersonalVerityVModel, ActivityPersonal
         if (requestCode == MIntentAction.REQUEST_CODE_CAMERA) {//拍照
             //拍照
             val selectList = PictureSelector.obtainMultipleResult(data) ?: return
-            vm.imgIDEmblem.value=selectList[0].path
+            vm.imgIDEmblem.value = selectList[0].path
 
             return
         }
@@ -87,9 +80,9 @@ class PersonalVerityActivity : MBActivity<PersonalVerityVModel, ActivityPersonal
         //ss[0]--//不完整路径-接口需要   ss[1]完整路径
 
         //todo:
-        if(vm.type=="1") {
+        if (vm.type == "1") {
             vm.imgIDMan.value = ss[1]
-        }else{
+        } else {
             vm.imgIDEmblem.value = ss[1]
         }
 

+ 0 - 2
app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerMoreFragment.kt

@@ -409,7 +409,6 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
                     area_out = item.area!!.code.toString()
                     province_out = item.province!!.code.toString()
                     city_out = item.city!!.code.toString()
-                    time_out = item.create_time.toString()
 
                 } else {
                     var list=adapter!!.data as ArrayList<ReceiveBean>
@@ -418,7 +417,6 @@ class OwnerMoreFragment : MBFragment<OwnerMoreVModel, FragmentOwnermoreBinding>(
                     list[vm.position].city=item.city!!.code.toString()
                     list[vm.position].lat=item.lat.toString()
                     list[vm.position].lng=item.lng.toString()
-                    list[vm.position].time=item.create_time.toString()
 
                     list[vm.position].address=item.address.toString()
                     list[vm.position].address=item.address.toString()

+ 0 - 2
app/src/main/java/com/quansu/heifengwuliu/fragment/OwnerSingleFragment.kt

@@ -370,7 +370,6 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
             area_out = info.default_send.area!!.code.toString()
             province_out = info.default_send.province!!.code.toString()
             city_out = info.default_send.city!!.code.toString()
-            time_out = info.default_send.create_time.toString()
         }
         if(null!=info.default_receive){
 
@@ -384,7 +383,6 @@ class OwnerSingleFragment : MBFragment<OwnerSingleVModel, FragmentOwnersingleBin
             area_in = info.default_receive.area!!.code.toString()
             province_in = info.default_receive.province!!.code.toString()
             city_in = info.default_receive.city!!.code.toString()
-            time_in = info.default_receive.create_time.toString()
         }
 
         binding.viewHead.getImgNext()!!.setOnClickListener {

+ 18 - 0
app/src/main/java/com/quansu/heifengwuliu/model/InfoBean.kt

@@ -0,0 +1,18 @@
+package com.quansu.heifengwuliu.model
+
+import com.ysnows.base.inter.IModel
+
+/**
+ *Created by shihuiyun
+ *on 2020/9/17
+ *
+ * status:0 审核中 1已审核
+ */
+class InfoBean(var info_id:String,var uid:String,
+               var idcard_z:String,var idcard_f:String,
+               var name:String,var idcard:String,
+               var status:String,
+               var create_time:String,var update_time:String,
+               var delete_time:String
+     ): IModel {
+}

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

@@ -286,6 +286,6 @@ interface ApiService {
      * @return
      */
     @GET("api/user/getInfo")
-    fun getInfo(@Query("type") type: String?): Observable<Response<Any>>
+    fun getInfo(@Query("type") type: String?): Observable<Response<InfoBean>>
 
 }

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

@@ -7,6 +7,7 @@ import androidx.lifecycle.MutableLiveData
 import com.quansu.heifengwuliu.BR
 import com.quansu.heifengwuliu.activity.HomeActivity
 import com.quansu.heifengwuliu.model.LoginBean
+import com.quansu.heifengwuliu.model.User
 import com.quansu.heifengwuliu.repository.PersonalVerifyRepository
 import com.quansu.heifengwuliu.utils.ChosePhotoUtils
 import com.quansu.heifengwuliu.utils.net.NetEngine
@@ -21,6 +22,8 @@ class PersonalVerityVModel : BViewModel<PersonalVerifyRepository>() {
     var imgIDEmblem: MutableLiveData<String> = MutableLiveData("")
     var type:String="1"//1:身份证正面  2:身份证背面
 
+    var isShow: MutableLiveData<Boolean> = MutableLiveData(true)
+
 
     @Bindable
     var name: String? = null
@@ -38,6 +41,9 @@ class PersonalVerityVModel : BViewModel<PersonalVerifyRepository>() {
 
 
     fun choseImg(type:Int){
+        if(!isShow.value!!){
+            return
+        }
         //选择照片
         this.type=type.toString()
         ChosePhotoUtils.getChosePhoto(view()!!.context(), 1)
@@ -81,7 +87,17 @@ class PersonalVerityVModel : BViewModel<PersonalVerifyRepository>() {
         repository().lreq(NetEngine.service.getInfo("1"))
                 .doOnNext {
                     if (it.ok(true)) {
-                        (repository().context as Activity).finish()
+                        var bean=it.data()
+                        if(null!=bean){
+                            isShow.value = bean.status != "1"
+                            //设置值
+                            imgIDMan.value=bean.idcard_z
+                            imgIDEmblem.value=bean.idcard_f
+                            name=bean.name
+                            iDNumber=bean.idcard
+
+                        }
+
                     }
                 }
                 .subscribe()

+ 5 - 3
app/src/main/res/layout/activity_personal_verify.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <data >
+        <import type="android.view.View" />
 
         <variable
             name="vm"
@@ -25,6 +26,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
 <!--     app:url="@{vm.imgIDMan}"    -->
+
         <com.qmuiteam.qmui.widget.QMUIRadiusImageView
             android:id="@+id/img_id_man"
             android:layout_width="146dp"
@@ -36,8 +38,7 @@
             app:layout_constraintStart_toStartOf="@id/tv_title"
             app:layout_constraintTop_toBottomOf="@id/tv_title"
             app:qmui_radius="1dp"
-            app:url="@{vm.imgIDMan}"
-            />
+            app:url="@{vm.imgIDMan}" />
 
         <com.qmuiteam.qmui.widget.QMUIRadiusImageView
             android:id="@+id/img_id_emblem"
@@ -109,7 +110,7 @@
                     android:hint="@string/please_input_id_number"
                     android:inputType="phone"
                     android:paddingStart="@dimen/dp_18"
-                    android:text="@={vm.IDNumber}"
+                    android:text="@={vm.iDNumber}"
                     android:textSize="@dimen/sp_13" />
 
             </com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout >
@@ -135,6 +136,7 @@
             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" />