Skip to content

S
ShenghuoquanBusiness
Commit 06b37701 authored by yinjiacheng's avatar yinjiacheng
Browse files
Options

update 企业认证切换XInsight API

parent 7a2cd839
Hide whitespace changes
Inline Side-by-side
Showing with 354 additions and 55 deletions
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountAuthDataManagerV2.kt
View file @ 06b37701
package com.yidian.shenghuoquan.newscontent.ui.auth
import com.yidian.framework.mobile.insight.identity.IdentityCardResult
import com.yidian.framework.mobile.insight.ocr.BusinessLicenseResult
import com.yidian.shenghuoquan.newscontent.bean.LifeAccountMerchantAuthData
import com.yidian.shenghuoquan.newscontent.bean.LifeAccountPersonalAuthData
import com.yidian.shenghuoquan.newscontent.constant.Constant
import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthAuthenticationBean
import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthMerchantCheckBean
import com.yidian.shenghuoquan.newscontent.http.httpbean.BusinessLicenseOCRBean
/**
* author: yinjiacheng
......@@ -88,7 +88,7 @@ object LifeAccountAuthDataManagerV2 {
/**
* 将营业执照OCR结果填入
*/
fun generateMerchantAuthData(data: BusinessLicenseOCRBean.Response) {
fun generateBusinessLicenseData(data: BusinessLicenseResult) {
merchantAuthData.registrationName = data.name
merchantAuthData.registrationCode = data.code
merchantAuthData.type = data.type
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountBusinessLicenseAuthFragmentV2.kt 0 → 100644
View file @ 06b37701
package com.yidian.shenghuoquan.newscontent.ui.auth
import android.Manifest
import android.app.Activity
import android.content.Intent
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.provider.MediaStore
import android.text.InputFilter
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider
import androidx.core.view.isVisible
import com.bumptech.glide.Glide
import com.tbruyelle.rxpermissions3.RxPermissions
import com.yidian.common.base.BaseFragment
import com.yidian.common.constant.GlobalConstants
import com.yidian.framework.mobile.insight.manage.XInsight
import com.yidian.framework.mobile.insight.ocr.BusinessLicenseCallBack
import com.yidian.framework.mobile.insight.ocr.BusinessLicenseResult
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.adapter.BottomSelectAdapter
import com.yidian.shenghuoquan.newscontent.bean.BottomSelectBean
import com.yidian.shenghuoquan.newscontent.constant.Constant
import com.yidian.shenghuoquan.newscontent.databinding.FragmentLifeAccountBusinessLicenseAuthBinding
import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthMerchantCheckBean
import com.yidian.shenghuoquan.newscontent.ui.dialog.BottomSelectDialog
import com.yidian.shenghuoquan.newscontent.utils.BitmapUtil
import com.yidian.shenghuoquan.newscontent.utils.FileUtil
import com.yidian.shenghuoquan.newscontent.utils.InputFilterUtil
import com.yidian.shenghuoquan.newscontent.widget.LifeAccountAuthBusinessInfoEditView
import com.yidian.utils.ToastUtil
import java.io.File
/**
* author: yinjiacheng
* date: 7/15/21 7:38 PM
* description: 生活号认证 营业执照认证 接入XInsight
*/
class LifeAccountBusinessLicenseAuthFragmentV2 :
BaseFragment<FragmentLifeAccountBusinessLicenseAuthBinding>(), View.OnClickListener,
BottomSelectAdapter.OnItemClickListener<BottomSelectBean>,
LifeAccountAuthBusinessInfoEditView.OnLifeAccountAuthBusinessInfoEditViewCallback, BusinessLicenseCallBack {
companion object {
// 认证数据
const val EXTRA_AUTH_DATA = "authData"
}
/**
* sdcard/Android/data/package/cache
*/
private val commonPath by lazy { activity?.externalCacheDir?.absolutePath }
/**
* 调用系统相机拍照，照片保存位置的Uri
*/
private var photoUri: Uri? = null
override fun createViewBinding(
inflater: LayoutInflater,
container: ViewGroup?
): FragmentLifeAccountBusinessLicenseAuthBinding {
return FragmentLifeAccountBusinessLicenseAuthBinding.inflate(inflater, container, false)
}
override fun init(savedInstanceState: Bundle?) {
super.init(savedInstanceState)
initView()
initListener()
initData()
}
private fun initView() {
// 输入过滤
// 企业名称限制40汉字
viewBinding.evRegistrationName.setInputFilters(InputFilterUtil.getRegistrationNameFilter(), InputFilter.LengthFilter(40))
// 统一信用代码限制18位数字+大小写英文字母 小写字母自动转换大写字母
viewBinding.evRegistrationCode.setInputFilters(
InputFilterUtil.getRegistrationCodeFilter(),
InputFilter.LengthFilter(18),
InputFilter.AllCaps()
)
}
private fun initListener() {
viewBinding.clBusinessLicenseUpload.setOnClickListener(this)
viewBinding.ivClear.setOnClickListener(this)
viewBinding.evRegistrationName.setOnLifeAccountAuthBusinessInfoEditViewCallback(this)
viewBinding.evRegistrationCode.setOnLifeAccountAuthBusinessInfoEditViewCallback(this)
}
private fun initData() {
// 还原认证数据
val authData =
arguments?.getSerializable(EXTRA_AUTH_DATA) ?: return
fillAuthInfo(authData as AuthMerchantCheckBean.Response)
}
/**
* 认证流程中断，下次进入认证流程时还原进度
*/
private fun fillAuthInfo(data: AuthMerchantCheckBean.Response) {
// 营业执照区域
Glide.with(this).load(data.entterprise_image_url).into(viewBinding.ivBusinessLicense)
viewBinding.ivClear.isVisible = true
viewBinding.clBusinessLicenseUpload.isEnabled = false
// 填入注册名称和注册码
viewBinding.evRegistrationName.fillEditContent(data.name)
viewBinding.evRegistrationCode.fillEditContent(data.code)
// 检查下一步条件
(activity as LifeAccountEnterpriseAuthActivity).checkNextCondition()
}
override fun onClick(v: View?) {
when (v?.id) {
R.id.cl_business_license_upload -> {
// 弹出上传方式选择
context?.let {
BottomSelectDialog(
it,
this,
arrayListOf(
BottomSelectBean(Constant.ITEM_TAKE_PHOTO),
BottomSelectBean(Constant.ITEM_OPEN_ALBUM)
)
).show()
}
}
R.id.iv_clear -> {
clearBusinessLicenseInfo()
// 检查下一步条件
(activity as LifeAccountEnterpriseAuthActivity).checkNextCondition()
}
}
}
override fun onItemClick(view: View, position: Int, data: BottomSelectBean) {
when (data.item) {
Constant.ITEM_TAKE_PHOTO -> {
// 调用系统相机进行营业执照采集
val file = File(commonPath + Constant.FILE_PATH_BUSINESS_LICENSE_CAMERA)
if (file.exists()) file.delete()
if (file.parentFile?.exists() == false) file.parentFile?.mkdirs()
file.createNewFile()
photoUri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
//适配Android 7.0文件权限，通过FileProvider创建一个content类型的Uri
activity?.let {
FileProvider.getUriForFile(
it,
GlobalConstants.AUTHORITY,
file
)
}
} else {
Uri.fromFile(file)
}
// 判断camera权限
RxPermissions(this).request(Manifest.permission.CAMERA).subscribe {
if (it) {
startActivityForResult(
Intent(MediaStore.ACTION_IMAGE_CAPTURE).putExtra(
MediaStore.EXTRA_OUTPUT,
photoUri
),
Constant.REQUEST_CODE_OPEN_CAMERA
)
} else {
ToastUtil.showToast(activity, "请在设置里同意相关权限")
}
}
}
Constant.ITEM_OPEN_ALBUM -> {
// 打开系统相册
startActivityForResult(
Intent(Intent.ACTION_PICK).setDataAndType(
MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
"image/*"
),
Constant.REQUEST_CODE_OPEN_ALBUM
)
}
}
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (resultCode == Activity.RESULT_OK) {
val uri = if (requestCode == Constant.REQUEST_CODE_OPEN_ALBUM) data?.data else photoUri
val bitmap =
BitmapUtil.generateBitmapFromUri(activity, uri, viewBinding.ivBusinessLicense)
viewBinding.ivBusinessLicense.setImageBitmap(bitmap)
FileUtil.generateFileFromUri(
activity, uri,
commonPath + Constant.FILE_PATH_BUSINESS_LICENSE
)
// 删除从相机拍摄的照片
if (requestCode == Constant.REQUEST_CODE_OPEN_CAMERA) File(commonPath + Constant.FILE_PATH_BUSINESS_LICENSE_CAMERA).delete()
// 显示清除按钮
viewBinding.ivClear.visibility = View.VISIBLE
// 上传区域不可点击
viewBinding.clBusinessLicenseUpload.isEnabled = false
// 执行营业执照OCR
startBusinessLicenseOCR()
}
}
/**
* 执行营业执照OCR
*/
private fun startBusinessLicenseOCR() {
// 上传前压缩图像
BitmapUtil.compressImage(
commonPath + Constant.FILE_PATH_BUSINESS_LICENSE,
10
)
XInsight.getBusinessLicenseOcrInfo(File(commonPath + Constant.FILE_PATH_BUSINESS_LICENSE), this)
}
/**
* 清除已输入的营业执照相关信息
* 用户更换商户类型操作
*/
fun clearBusinessLicenseInfo() {
// 清除已上传的营业执照
viewBinding.ivBusinessLicense.setImageDrawable(null)
// 清除错误提示
viewBinding.tvUploadErrorTips.isVisible = false
activity?.let { viewBinding.viewBusinessLicenseUploadDivider.setBackgroundColor(ContextCompat.getColor(it, R.color.color_FFF2F2F2)) }
viewBinding.ivClear.isVisible = false
// 清除OCR或用户输入内容
viewBinding.evRegistrationName.clearEditContent()
viewBinding.evRegistrationCode.clearEditContent()
// 设置上传区域可点击
viewBinding.clBusinessLicenseUpload.isEnabled = true
LifeAccountAuthDataManagerV2.merchantAuthData.isBusinessLicenseUpload = false
LifeAccountAuthDataManagerV2.merchantAuthData.registrationName = null
LifeAccountAuthDataManagerV2.merchantAuthData.registrationCode = null
// 标识修改
LifeAccountAuthDataManagerV2.merchantAuthData.isAuthInfoModify = true
}
override fun onTextClear(from: LifeAccountAuthBusinessInfoEditView) {
// 标识修改
LifeAccountAuthDataManagerV2.merchantAuthData.isAuthInfoModify = true
if (from == viewBinding.evRegistrationName) {
LifeAccountAuthDataManagerV2.merchantAuthData.registrationName = ""
} else {
LifeAccountAuthDataManagerV2.merchantAuthData.registrationCode = ""
}
// 检查下一步条件
(activity as LifeAccountEnterpriseAuthActivity).checkNextCondition()
}
override fun onTextChange(from: LifeAccountAuthBusinessInfoEditView, text: String) {
if (from == viewBinding.evRegistrationName) {
// 标识修改
if (text != LifeAccountAuthDataManagerV2.merchantAuthData.registrationName) {
LifeAccountAuthDataManagerV2.merchantAuthData.isAuthInfoModify = true
}
LifeAccountAuthDataManagerV2.merchantAuthData.registrationName = text
} else {
if (text != LifeAccountAuthDataManagerV2.merchantAuthData.registrationCode) {
LifeAccountAuthDataManagerV2.merchantAuthData.isAuthInfoModify = true
}
LifeAccountAuthDataManagerV2.merchantAuthData.registrationCode = text
}
// 检查下一步条件
(activity as LifeAccountEnterpriseAuthActivity).checkNextCondition()
}
override fun onSucceed(businessLicenseResult: BusinessLicenseResult?, result: String?) {
businessLicenseResult?.let { LifeAccountAuthDataManagerV2.generateBusinessLicenseData(it) }
// 回显OCR结果
viewBinding.evRegistrationName.fillEditContent(businessLicenseResult?.name)
viewBinding.evRegistrationCode.fillEditContent(businessLicenseResult?.code)
// 此时营业执照已上传并OCR识别完成 删除本地临时存储文件
File(commonPath + Constant.FILE_PATH_BUSINESS_LICENSE).delete()
// 检查下一步条件
activity?.let { (it as LifeAccountEnterpriseAuthActivity).checkNextCondition() }
}
override fun onFail(code: Int, errMsg: String?, errDomain: String?) {
// 营业执照OCR识别失败提示
viewBinding.tvUploadErrorTips.isVisible = true
viewBinding.tvUploadErrorTips.text =
resources.getString(R.string.check_business_license_distinct)
activity?.let { viewBinding.viewBusinessLicenseUploadDivider.setBackgroundColor(ContextCompat.getColor(it, R.color.color_FFFF3A3A)) }
}
override fun onUploadTask(imageUrl: String?) {
LifeAccountAuthDataManagerV2.merchantAuthData.isBusinessLicenseUpload = true
LifeAccountAuthDataManagerV2.merchantAuthData.businessLicenseUrl = imageUrl
}
}
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountEnterpriseAuthActivity.kt
View file @ 06b37701
......@@ -48,8 +48,8 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
private val fragmentList: ArrayList<Fragment> by lazy {
arrayListOf(
LifeAccountBusinessLicenseAuthFragment(),
LifeAccountIDCardAuthFragment()
LifeAccountBusinessLicenseAuthFragmentV2(),
LifeAccountIDCardAuthFragmentV2()
)
}
......@@ -126,28 +126,28 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
*/
fun checkNextCondition() {
if (viewBind.pvAuthProcess.curProcess == LifeAccountAuthProcessView.PROCESS_ENTERPRISE_QUALIFICATION
&& LifeAccountAuthDataManager.merchantAuthData.merchantType != 0
&& LifeAccountAuthDataManager.merchantAuthData.isBusinessLicenseUpload
&& !LifeAccountAuthDataManager.merchantAuthData.registrationName.isNullOrEmpty()
&& !LifeAccountAuthDataManager.merchantAuthData.registrationCode.isNullOrEmpty()
&& LifeAccountAuthDataManagerV2.merchantAuthData.merchantType != 0
&& LifeAccountAuthDataManagerV2.merchantAuthData.isBusinessLicenseUpload
&& !LifeAccountAuthDataManagerV2.merchantAuthData.registrationName.isNullOrEmpty()
&& !LifeAccountAuthDataManagerV2.merchantAuthData.registrationCode.isNullOrEmpty()
) {
viewBind.tvNext.alpha = 1f
viewBind.tvNext.isEnabled = true
} else if (viewBind.pvAuthProcess.curProcess == LifeAccountAuthProcessView.PROCESS_ENTERPRISE_MANAGER
&& LifeAccountAuthDataManager.personalAuthData.isAgreePrivacyAgreement
&& LifeAccountAuthDataManager.merchantAuthData.merchantType == Constant.TYPE_INDIVIDUAL_BUSINESS
&& LifeAccountAuthDataManager.personalAuthData.isFaceAuthPass
&& LifeAccountAuthDataManagerV2.personalAuthData.isAgreePrivacyAgreement
&& LifeAccountAuthDataManagerV2.merchantAuthData.merchantType == Constant.TYPE_INDIVIDUAL_BUSINESS
&& LifeAccountAuthDataManagerV2.personalAuthData.isFaceAuthPass
) {
viewBind.tvNext.alpha = 1f
viewBind.tvNext.isEnabled = true
} else if (viewBind.pvAuthProcess.curProcess == LifeAccountAuthProcessView.PROCESS_ENTERPRISE_MANAGER
&& LifeAccountAuthDataManager.personalAuthData.isAgreePrivacyAgreement
&& LifeAccountAuthDataManager.merchantAuthData.merchantType == Constant.TYPE_COMMON_ENTERPRISE
&& LifeAccountAuthDataManager.personalAuthData.isIDCardPortraitFaceUpload
&& LifeAccountAuthDataManager.personalAuthData.isIDCardNationalEmblemFaceUpload
&& !LifeAccountAuthDataManager.personalAuthData.realName.isNullOrEmpty()
&& !LifeAccountAuthDataManager.personalAuthData.idCardNum.isNullOrEmpty()
&& !LifeAccountAuthDataManager.personalAuthData.phoneNum.isNullOrEmpty()
&& LifeAccountAuthDataManagerV2.personalAuthData.isAgreePrivacyAgreement
&& LifeAccountAuthDataManagerV2.merchantAuthData.merchantType == Constant.TYPE_COMMON_ENTERPRISE
&& LifeAccountAuthDataManagerV2.personalAuthData.isIDCardPortraitFaceUpload
&& LifeAccountAuthDataManagerV2.personalAuthData.isIDCardNationalEmblemFaceUpload
&& !LifeAccountAuthDataManagerV2.personalAuthData.realName.isNullOrEmpty()
&& !LifeAccountAuthDataManagerV2.personalAuthData.idCardNum.isNullOrEmpty()
&& !LifeAccountAuthDataManagerV2.personalAuthData.phoneNum.isNullOrEmpty()
) {
viewBind.tvNext.alpha = 1f
viewBind.tvNext.isEnabled = true
......@@ -166,7 +166,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
private fun initData() {
// 如果有已存在的认证流程则还原进度
authData?.let { LifeAccountAuthDataManager.generateMerchantAuthData(it) }
authData?.let { LifeAccountAuthDataManagerV2.generateMerchantAuthData(it) }
authData?.data_type?.let {
// 商户类型
val type = if (it == Constant.TYPE_INDIVIDUAL_BUSINESS) {
......@@ -178,7 +178,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
lastSelectedMerchantType = type
}
val bundle = Bundle()
bundle.putSerializable(LifeAccountBusinessLicenseAuthFragment.EXTRA_AUTH_DATA, authData)
bundle.putSerializable(LifeAccountBusinessLicenseAuthFragmentV2.EXTRA_AUTH_DATA, authData)
fragmentList[0].arguments = bundle
switchFragment(fragmentList[0])
}
......@@ -217,18 +217,18 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
* 避免在修改认证时出现数据异常
*/
private fun clearLifeAccountAuthData() {
LifeAccountAuthDataManager.merchantAuthData.merchantType = 0
LifeAccountAuthDataManager.merchantAuthData.authRecordId = -1
LifeAccountAuthDataManager.merchantAuthData.isBusinessLicenseUpload = false
LifeAccountAuthDataManager.merchantAuthData.registrationName = null
LifeAccountAuthDataManager.merchantAuthData.registrationCode = null
LifeAccountAuthDataManager.personalAuthData.isAgreePrivacyAgreement = false
LifeAccountAuthDataManager.personalAuthData.isFaceAuthPass = false
LifeAccountAuthDataManager.personalAuthData.isIDCardPortraitFaceUpload = false
LifeAccountAuthDataManager.personalAuthData.isIDCardNationalEmblemFaceUpload = false
LifeAccountAuthDataManager.personalAuthData.realName = null
LifeAccountAuthDataManager.personalAuthData.idCardNum = null
LifeAccountAuthDataManager.personalAuthData.phoneNum = null
LifeAccountAuthDataManagerV2.merchantAuthData.merchantType = 0
LifeAccountAuthDataManagerV2.merchantAuthData.authRecordId = -1
LifeAccountAuthDataManagerV2.merchantAuthData.isBusinessLicenseUpload = false
LifeAccountAuthDataManagerV2.merchantAuthData.registrationName = null
LifeAccountAuthDataManagerV2.merchantAuthData.registrationCode = null
LifeAccountAuthDataManagerV2.personalAuthData.isAgreePrivacyAgreement = false
LifeAccountAuthDataManagerV2.personalAuthData.isFaceAuthPass = false
LifeAccountAuthDataManagerV2.personalAuthData.isIDCardPortraitFaceUpload = false
LifeAccountAuthDataManagerV2.personalAuthData.isIDCardNationalEmblemFaceUpload = false
LifeAccountAuthDataManagerV2.personalAuthData.realName = null
LifeAccountAuthDataManagerV2.personalAuthData.idCardNum = null
LifeAccountAuthDataManagerV2.personalAuthData.phoneNum = null
}
override fun onClick(v: View?) {
......@@ -251,25 +251,25 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
// 402接口 直接企业认证生活号id和审核id均不传 个人认证升级只传生活号id 认证修改只传审核id
ApiService.authBusinessLicenseCommit(
this,
LifeAccountAuthDataManager.generateAuthBusinessLicenseCommitRequest(
LifeAccountAuthDataManagerV2.generateAuthBusinessLicenseCommitRequest(
if (isAuthModify) null else lifeAccountId,
LifeAccountAuthDataManager.merchantAuthData.authRecordId
LifeAccountAuthDataManagerV2.merchantAuthData.authRecordId
)
)
} else if (viewBind.pvAuthProcess.curProcess == LifeAccountAuthProcessView.PROCESS_ENTERPRISE_MANAGER) {
// 406接口 直接企业认证和认证修改不传生活号id 个人认证升级传生活号id
if (LifeAccountAuthDataManager.merchantAuthData.merchantType == Constant.TYPE_INDIVIDUAL_BUSINESS) {
if (LifeAccountAuthDataManagerV2.merchantAuthData.merchantType == Constant.TYPE_INDIVIDUAL_BUSINESS) {
ApiService.authIndividualBusinessComplete(
this,
LifeAccountAuthDataManager.generateAuthIndividualBusinessCompleteRequest(
LifeAccountAuthDataManagerV2.generateAuthIndividualBusinessCompleteRequest(
if (isAuthModify) null else lifeAccountId
)
)
} else if (LifeAccountAuthDataManager.merchantAuthData.merchantType == Constant.TYPE_COMMON_ENTERPRISE) {
} else if (LifeAccountAuthDataManagerV2.merchantAuthData.merchantType == Constant.TYPE_COMMON_ENTERPRISE) {
// 403接口 直接企业认证和认证修改不传生活号id 个人认证升级传生活号id
ApiService.authEnterpriseLegalIdentityCommit(
this,
LifeAccountAuthDataManager.generateAuthEnterpriseLegalIdentityCommitRequest(
LifeAccountAuthDataManagerV2.generateAuthEnterpriseLegalIdentityCommitRequest(
if (isAuthModify) null else lifeAccountId
)
)
......@@ -287,12 +287,12 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
// 回显选择的商户类型
viewBind.svMerchantType.setContentResult(data.item)
// 保存选择的商户类型
LifeAccountAuthDataManager.merchantAuthData.merchantType =
LifeAccountAuthDataManagerV2.merchantAuthData.merchantType =
if (data.item == Constant.ITEM_INDIVIDUAL_BUSINESSES) Constant.TYPE_INDIVIDUAL_BUSINESS else Constant.TYPE_COMMON_ENTERPRISE
// 第一次选择商户类型不清空营业执照信息
if (lastSelectedMerchantType != null) {
// 更换商户类型，清空营业执照图片、清空注册名称和注册码
(fragmentList[0] as LifeAccountBusinessLicenseAuthFragment).clearBusinessLicenseInfo()
(fragmentList[0] as LifeAccountBusinessLicenseAuthFragmentV2).clearBusinessLicenseInfo()
}
// 检查下一步条件
checkNextCondition()
......@@ -302,25 +302,25 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
override fun authBusinessLicenseCommitSuccess(result: AuthBusinessLicenseCommitBean.Response?) {
// 营业执照提交成功
result?.enterprise_auth_record_id?.let { LifeAccountAuthDataManager.merchantAuthData.authRecordId = it }
result?.enterprise_auth_record_id?.let { LifeAccountAuthDataManagerV2.merchantAuthData.authRecordId = it }
viewBind.pvAuthProcess.setProcess(++viewBind.pvAuthProcess.curProcess)
viewBind.svMerchantType.enableSelect(false)
if (LifeAccountAuthDataManager.merchantAuthData.isAuthInfoModify) {
if (LifeAccountAuthDataManagerV2.merchantAuthData.isAuthInfoModify) {
// 认证信息修改 清空第二步回显数据
LifeAccountAuthDataManager.merchantAuthData.isAuthInfoModify = false
LifeAccountAuthDataManager.personalAuthData.isIDCardPortraitFaceUpload = false
LifeAccountAuthDataManager.personalAuthData.isIDCardNationalEmblemFaceUpload = false
LifeAccountAuthDataManager.personalAuthData.realName = null
LifeAccountAuthDataManager.personalAuthData.idCardNum = null
LifeAccountAuthDataManager.personalAuthData.isFaceAuthPass = false
LifeAccountAuthDataManager.personalAuthData.phoneNum = null
LifeAccountAuthDataManagerV2.merchantAuthData.isAuthInfoModify = false
LifeAccountAuthDataManagerV2.personalAuthData.isIDCardPortraitFaceUpload = false
LifeAccountAuthDataManagerV2.personalAuthData.isIDCardNationalEmblemFaceUpload = false
LifeAccountAuthDataManagerV2.personalAuthData.realName = null
LifeAccountAuthDataManagerV2.personalAuthData.idCardNum = null
LifeAccountAuthDataManagerV2.personalAuthData.isFaceAuthPass = false
LifeAccountAuthDataManagerV2.personalAuthData.phoneNum = null
fragmentList.removeAt(viewBind.pvAuthProcess.curProcess)
val fragment = LifeAccountIDCardAuthFragment()
val fragment = LifeAccountIDCardAuthFragmentV2()
fragmentList.add(viewBind.pvAuthProcess.curProcess, fragment)
val bundle = Bundle()
bundle.putInt(
Constant.TYPE_AUTH,
LifeAccountAuthDataManager.merchantAuthData.merchantType
LifeAccountAuthDataManagerV2.merchantAuthData.merchantType
)
fragment.arguments = bundle
} else {
......@@ -329,9 +329,9 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
val bundle = Bundle()
bundle.putInt(
Constant.TYPE_AUTH,
LifeAccountAuthDataManager.merchantAuthData.merchantType
LifeAccountAuthDataManagerV2.merchantAuthData.merchantType
)
bundle.putSerializable(LifeAccountIDCardAuthFragment.EXTRA_AUTH_DATA, authData)
bundle.putSerializable(LifeAccountIDCardAuthFragmentV2.EXTRA_AUTH_DATA, authData)
fragment.arguments = bundle
}
switchFragment(fragmentList[viewBind.pvAuthProcess.curProcess])
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountIDCardAuthFragmentV2.kt
View file @ 06b37701
......@@ -353,7 +353,7 @@ class LifeAccountIDCardAuthFragmentV2 : BaseFragment<FragmentLifeAccountIdCardAu
}
/**
* 执行身份证上传金山云
* 执行身份证识别
* @param face 身份证两面标识
*/
private fun startIDCardVerify(face: Int) {
......
config/config.gradle
View file @ 06b37701
......@@ -104,7 +104,7 @@ ext.dependencies = [
'com.yidian.framework.mobile:ydutils:1.0.1-SNAPSHOT',
'com.yidian.framework.mobile:xdiamond:1.0.7',
// 慧眼
'com.yidian.framework.mobile.xinsight:xinsight:1.1.2',
'com.yidian.framework.mobile.xinsight:xinsight:1.1.5',
'com.loopj.android:android-async-http:1.4.9',
// 屏幕适配
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment