Skip to content

S
ShenghuoquanBusiness
Commit 0ac4ebf6 authored by yinjiacheng's avatar yinjiacheng
Browse files
Options

update XInsight执行结果回调中的业务逻辑切换到主线程执行

parent 151400d4
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 59 deletions
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountBusinessLicenseAuthFragmentV2.kt
View file @ 0ac4ebf6
...@@ -274,22 +274,26 @@ class LifeAccountBusinessLicenseAuthFragmentV2 : ...@@ -274,22 +274,26 @@ class LifeAccountBusinessLicenseAuthFragmentV2 :
} }
override fun onSucceed(businessLicenseResult: BusinessLicenseResult?, result: String?) { override fun onSucceed(businessLicenseResult: BusinessLicenseResult?, result: String?) {
businessLicenseResult?.let { LifeAccountAuthDataManagerV2.generateBusinessLicenseData(it) } activity?.runOnUiThread {
// 回显OCR结果 businessLicenseResult?.let { LifeAccountAuthDataManagerV2.generateBusinessLicenseData(it) }
viewBinding.evRegistrationName.fillEditContent(businessLicenseResult?.name) // 回显OCR结果
viewBinding.evRegistrationCode.fillEditContent(businessLicenseResult?.code) viewBinding.evRegistrationName.fillEditContent(businessLicenseResult?.name)
// 此时营业执照已上传并OCR识别完成 删除本地临时存储文件 viewBinding.evRegistrationCode.fillEditContent(businessLicenseResult?.code)
File(commonPath + Constant.FILE_PATH_BUSINESS_LICENSE).delete() // 此时营业执照已上传并OCR识别完成 删除本地临时存储文件
// 检查下一步条件 File(commonPath + Constant.FILE_PATH_BUSINESS_LICENSE).delete()
activity?.let { (it as LifeAccountEnterpriseAuthActivity).checkNextCondition() } // 检查下一步条件
activity?.let { (it as LifeAccountEnterpriseAuthActivity).checkNextCondition() }
}
} }
override fun onFail(code: Int, errMsg: String?, errDomain: String?) { override fun onFail(code: Int, errMsg: String?, errDomain: String?) {
// 营业执照OCR识别失败提示 activity?.runOnUiThread {
viewBinding.tvUploadErrorTips.isVisible = true // 营业执照OCR识别失败提示
viewBinding.tvUploadErrorTips.text = viewBinding.tvUploadErrorTips.isVisible = true
resources.getString(R.string.check_business_license_distinct) viewBinding.tvUploadErrorTips.text =
activity?.let { viewBinding.viewBusinessLicenseUploadDivider.setBackgroundColor(ContextCompat.getColor(it, R.color.color_FFFF3A3A)) } 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?) { override fun onUploadTask(imageUrl: String?) {
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountIDCardAuthFragmentV2.kt
View file @ 0ac4ebf6
...@@ -367,32 +367,34 @@ class LifeAccountIDCardAuthFragmentV2 : BaseFragment<FragmentLifeAccountIdCardAu ...@@ -367,32 +367,34 @@ class LifeAccountIDCardAuthFragmentV2 : BaseFragment<FragmentLifeAccountIdCardAu
uploadFile, uploadFile,
object : IdentityCardVerifyCallBack { object : IdentityCardVerifyCallBack {
override fun onSucceed(identityCardResult: IdentityCardResult?, result: String?) { override fun onSucceed(identityCardResult: IdentityCardResult?, result: String?) {
if (face == Constant.ID_CARD_PORTRAIT_FACE) { activity?.runOnUiThread {
identityCardResult?.let { LifeAccountAuthDataManagerV2.generateIDCardPortraitFaceData(it) } if (face == Constant.ID_CARD_PORTRAIT_FACE) {
// 回显OCR结果 identityCardResult?.let { LifeAccountAuthDataManagerV2.generateIDCardPortraitFaceData(it) }
viewBinding.evRealName.fillEditContent(identityCardResult?.posit?.name) // 回显OCR结果
viewBinding.evIdCardNumber.fillEditContent(identityCardResult?.posit?.idcard_number) viewBinding.evRealName.fillEditContent(identityCardResult?.posit?.name)
// 此时身份证人像面已上传并OCR识别完成 删除本地临时存储文件 viewBinding.evIdCardNumber.fillEditContent(identityCardResult?.posit?.idcard_number)
File(cachePath + Constant.FILE_PATH_ID_CARD_PORTRAIT_FACE).apply { // 此时身份证人像面已上传并OCR识别完成 删除本地临时存储文件
if (exists()) delete() File(cachePath + Constant.FILE_PATH_ID_CARD_PORTRAIT_FACE).apply {
} if (exists()) delete()
// 检查下一步条件 }
if (authType == Constant.TYPE_AUTH_PERSONAL) { // 检查下一步条件
activity?.let { (it as LifeAccountPersonalAuthActivity).checkNextCondition() } if (authType == Constant.TYPE_AUTH_PERSONAL) {
} else { activity?.let { (it as LifeAccountPersonalAuthActivity).checkNextCondition() }
activity?.let { (it as LifeAccountEnterpriseAuthActivity).checkNextCondition() } } else {
} activity?.let { (it as LifeAccountEnterpriseAuthActivity).checkNextCondition() }
} else { }
identityCardResult?.let { LifeAccountAuthDataManagerV2.generateIDCardNationEmblemFaceData(it) }
// 此时身份证国徽面已上传并OCR识别完成 删除本地临时存储文件
File(cachePath + Constant.FILE_PATH_ID_CARD_NATIONAL_EMBLEM_FACE).apply {
if (exists()) delete()
}
// 检查下一步条件
if (authType == Constant.TYPE_AUTH_PERSONAL) {
activity?.let { (it as LifeAccountPersonalAuthActivity).checkNextCondition() }
} else { } else {
activity?.let { (it as LifeAccountEnterpriseAuthActivity).checkNextCondition() } identityCardResult?.let { LifeAccountAuthDataManagerV2.generateIDCardNationEmblemFaceData(it) }
// 此时身份证国徽面已上传并OCR识别完成 删除本地临时存储文件
File(cachePath + Constant.FILE_PATH_ID_CARD_NATIONAL_EMBLEM_FACE).apply {
if (exists()) delete()
}
// 检查下一步条件
if (authType == Constant.TYPE_AUTH_PERSONAL) {
activity?.let { (it as LifeAccountPersonalAuthActivity).checkNextCondition() }
} else {
activity?.let { (it as LifeAccountEnterpriseAuthActivity).checkNextCondition() }
}
} }
} }
} }
...@@ -623,32 +625,36 @@ class LifeAccountIDCardAuthFragmentV2 : BaseFragment<FragmentLifeAccountIdCardAu ...@@ -623,32 +625,36 @@ class LifeAccountIDCardAuthFragmentV2 : BaseFragment<FragmentLifeAccountIdCardAu
// 活体认证回调 // 活体认证回调
override fun onSucceed(liveVerityResult: LiveVerityResult?, result: String?) { override fun onSucceed(liveVerityResult: LiveVerityResult?, result: String?) {
if (liveVerityResult?.verify_result == true) { activity?.runOnUiThread {
// 保存人脸验证结果 if (liveVerityResult?.verify_result == true) {
LifeAccountAuthDataManagerV2.personalAuthData.isFaceAuthPass = true // 保存人脸验证结果
// 人脸验证通过UI LifeAccountAuthDataManagerV2.personalAuthData.isFaceAuthPass = true
viewBinding.avFaceAuth.showFaceAuthResult(true) // 人脸验证通过UI
// 人脸验证通过锁定信息 viewBinding.avFaceAuth.showFaceAuthResult(true)
lockPersonalAuthInfo() // 人脸验证通过锁定信息
// 回调server 保存活体识别认证状态 lockPersonalAuthInfo()
if (authType == Constant.TYPE_AUTH_PERSONAL) { // 回调server 保存活体识别认证状态
ApiService.authLiveIdentity(this@LifeAccountIDCardAuthFragmentV2) if (authType == Constant.TYPE_AUTH_PERSONAL) {
// 检查下一步条件 ApiService.authLiveIdentity(this@LifeAccountIDCardAuthFragmentV2)
activity?.let { (it as LifeAccountPersonalAuthActivity).checkNextCondition() } // 检查下一步条件
} else { activity?.let { (it as LifeAccountPersonalAuthActivity).checkNextCondition() }
ApiService.authEnterpriseLiveIdentity( } else {
this@LifeAccountIDCardAuthFragmentV2, ApiService.authEnterpriseLiveIdentity(
hashMapOf("record_id" to LifeAccountAuthDataManagerV2.merchantAuthData.authRecordId.toString()) this@LifeAccountIDCardAuthFragmentV2,
) hashMapOf("record_id" to LifeAccountAuthDataManagerV2.merchantAuthData.authRecordId.toString())
// 检查下一步条件 )
activity?.let { (it as LifeAccountEnterpriseAuthActivity).checkNextCondition() } // 检查下一步条件
activity?.let { (it as LifeAccountEnterpriseAuthActivity).checkNextCondition() }
}
} }
} }
} }
override fun onFail(code: Int, errMsg: String?, errDomain: String?) { override fun onFail(code: Int, errMsg: String?, errDomain: String?) {
LifeAccountAuthDataManagerV2.personalAuthData.isFaceAuthPass = false activity?.runOnUiThread {
viewBinding.avFaceAuth.showFaceAuthResult(false) LifeAccountAuthDataManagerV2.personalAuthData.isFaceAuthPass = false
viewBinding.avFaceAuth.showFaceAuthResult(false)
}
} }
override fun onUploadTask(imageUrl: String?) { override fun onUploadTask(imageUrl: String?) {
......
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