update 认证流程

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/AuthAuthenticationBean.kt

@@ -10,15 +10,23 @@ import java.io.Serializable
 class AuthAuthenticationBean(val response: Response) : Serializable {
 
     data class Response(
+        val address: String,
         val audit_status: Int,
+        val auth: Int,
         val back_id_card: String,
+        val back_id_card_url: String,
         val create_time: String,
         val front_id_card: String,
+        val front_id_card_url: String,
         val full_name: String,
+        val gender: String,
         val id_card: String,
+        val issued_by: String,
         val live_identity_status: Int,
+        val nationality: String,
         val occupation: String,
-        val auth: Int
+        val validity_end_time: String,
+        val validity_start_time: String
     ) : Serializable
 
 }
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/AuthMerchantCheckBean.kt

@@ -7,7 +7,7 @@ import java.io.Serializable
  * date: 6/3/21 6:05 PM
  * description: API /merchant/enterprise/check
  */
-class AuthMerchantCheckBean : Serializable{
+class AuthMerchantCheckBean : Serializable {
 
     data class Request(
         val life_account_id: Long?,
@@ -16,17 +16,37 @@ class AuthMerchantCheckBean : Serializable{
     data class Response(
         val audit_opinion: String,
         val audit_status: Int,
+        val businesss_scope: String,
         val code: String,
         val data_type: Int,
+        val enterprice_address: String,
+        val enterprice_type: String,
         val enterprise_auth_record_id: Long,
         val entterprise_image: String,
+        val entterprise_image_url: String,
+        val establishment_date: String,
+        val form: String,
+        val funding: String,
+        val issue_date: String,
+        val legal_address: String,
         val legal_back_id_card: String,
+        val legal_back_id_card_url: String,
         val legal_front_id_card: String,
+        val legal_front_id_card_url: String,
         val legal_id_card: String,
+        val legal_issued_by: String,
+        val legal_nationality: String,
         val legal_person: String,
+        val legal_validity_end_time: String,
+        val legal_validity_start_time: String,
         val live_identity_status: Int,
         val mobile: String,
-        val name: String
+        val name: String,
+        val num: String,
+        val organizer: String,
+        val registered_capital: String,
+        val registration_authority: String,
+        val term_time: String
     ) : Serializable
 
 }
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountAuthActivity.kt

@@ -11,7 +11,8 @@ import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountAuthBi
 import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.callback.IAuthAuthenticationCallback
 import com.yidian.shenghuoquan.newscontent.http.callback.IAuthMerchantCheckCallback
-import com.yidian.shenghuoquan.newscontent.http.httpbean.*
+import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthAuthenticationBean
+import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthMerchantCheckBean
 import com.yidian.xpage.XPageManager
 
 /**

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountAuthDataManager.kt

@@ -57,12 +57,24 @@ object LifeAccountAuthDataManager {
     /**
      * 填入个人认证流程回显数据
      */
-    // TODO: 6/10/21 完善数据
+    // TODO: 6/11/21 完善身份证两面完整度
     fun generatePersonalAuthData(data: AuthAuthenticationBean.Response) {
         personalAuthData.isFaceAuthPass = data.live_identity_status == Constant.ALIVE_DETECT_SUCCESS
         personalAuthData.realName = data.full_name
         personalAuthData.idCardNum = data.id_card
         personalAuthData.occupation = data.occupation
+        personalAuthData.idCardPortraitFaceObjectKey = data.front_id_card
+        personalAuthData.idCardNationalEmblemFaceObjectKey = data.back_id_card
+        personalAuthData.address = data.address
+        personalAuthData.nationality = data.nationality
+        personalAuthData.gender = data.gender
+        personalAuthData.validDateStart = data.validity_start_time
+        personalAuthData.validDateEnd = data.validity_end_time
+        personalAuthData.issuedBy = data.issued_by
+        personalAuthData.isIDCardPortraitFaceUpload = true
+        personalAuthData.isIDCardNationalEmblemFaceUpload = true
+        personalAuthData.idCardPortraitFaceCompleteness = 0
+        personalAuthData.idCardNationalEmblemFaceCompleteness = 0
     }
 
     /**
@@ -112,17 +124,41 @@ object LifeAccountAuthDataManager {
     /**
      * 填入企业认证回显数据
      */
-    // TODO: 6/10/21 完善数据
+    // TODO: 6/10/21 完善身份证两面完整度
     fun generateMerchantAuthData(data: AuthMerchantCheckBean.Response) {
         merchantAuthData.authRecordId = data.enterprise_auth_record_id
         merchantAuthData.registrationName = data.name
         merchantAuthData.registrationCode = data.code
+        merchantAuthData.merchantType = data.data_type
+        merchantAuthData.isBusinessLicenseUpload = true
+        merchantAuthData.type = data.enterprice_type
+        merchantAuthData.addr = data.enterprice_address
+        merchantAuthData.scope = data.businesss_scope
+        merchantAuthData.time = data.term_time
+        merchantAuthData.regi = data.registered_capital
+        merchantAuthData.organizer = data.organizer
+        merchantAuthData.date = data.establishment_date
+        merchantAuthData.comp = data.registration_authority
+        merchantAuthData.num = data.num
+        merchantAuthData.form = data.form
+        merchantAuthData.funding = data.funding
+        merchantAuthData.date_issue = data.issue_date
+        merchantAuthData.businessLicenseObjectKey = data.entterprise_image
         personalAuthData.realName = data.legal_person
         personalAuthData.idCardNum = data.legal_id_card
         personalAuthData.phoneNum = data.mobile
-        merchantAuthData.merchantType = data.data_type
         personalAuthData.isFaceAuthPass = data.live_identity_status == Constant.ALIVE_DETECT_SUCCESS
-        merchantAuthData.isBusinessLicenseUpload = true
+        personalAuthData.address = data.legal_address
+        personalAuthData.nationality = data.legal_nationality
+        personalAuthData.issuedBy = data.legal_issued_by
+        personalAuthData.validDateStart = data.legal_validity_start_time
+        personalAuthData.validDateEnd = data.legal_validity_end_time
+        personalAuthData.idCardPortraitFaceObjectKey = data.legal_front_id_card
+        personalAuthData.idCardNationalEmblemFaceObjectKey = data.legal_back_id_card
+        personalAuthData.isIDCardPortraitFaceUpload = true
+        personalAuthData.isIDCardNationalEmblemFaceUpload = true
+        personalAuthData.idCardPortraitFaceCompleteness = 0
+        personalAuthData.idCardNationalEmblemFaceCompleteness = 0
     }
 
     /**

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountBusinessLicenseAuthFragment.kt

@@ -94,7 +94,7 @@ class LifeAccountBusinessLicenseAuthFragment :
      */
     private fun fillAuthInfo(data: AuthMerchantCheckBean.Response) {
         // 营业执照区域
-        Glide.with(this).load(data.entterprise_image).into(viewBinding.ivBusinessLicense)
+        Glide.with(this).load(data.entterprise_image_url).into(viewBinding.ivBusinessLicense)
         viewBinding.ivClear.isVisible = true
         viewBinding.clBusinessLicenseUpload.isEnabled = false
         // 填入注册名称和注册码

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountEnterpriseAuthActivity.kt

@@ -63,7 +63,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
         intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let {
             (it as HashMap<*, *>)[EXTRA_LIFE_ACCOUNT_ID]?.let { id ->
                 id as Long
-            }
+            } ?: Hawk.get(HawkConfig.LifeAccountId, null)
         }
     }
 

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountIDCardAuthFragment.kt

@@ -207,11 +207,11 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
      * 个人认证流程中断，下次进入认证流程时还原进度
      */
     private fun fillPersonalAuthInfo(data: AuthAuthenticationBean.Response) {
-        viewBinding.ivIdCardPortraitFace.addImage(data.front_id_card)
-        viewBinding.ivIdCardNationalEmblemFace.addImage(data.back_id_card)
+        viewBinding.ivIdCardPortraitFace.addImage(data.front_id_card_url)
+        viewBinding.ivIdCardNationalEmblemFace.addImage(data.back_id_card_url)
         viewBinding.evRealName.fillEditContent(data.full_name)
         viewBinding.evIdCardNumber.fillEditContent(data.id_card)
-        viewBinding.avFaceAuth.showFaceAuthResult(data.live_identity_status == Constant.ALIVE_DETECT_SUCCESS)
+        if (data.live_identity_status == Constant.ALIVE_DETECT_SUCCESS) viewBinding.avFaceAuth.showFaceAuthSuccess()
         // 如果人脸验证已通过 则直接锁定输入状态
         if (data.live_identity_status == Constant.ALIVE_DETECT_SUCCESS) lockPersonalAuthInfo()
         // 检查下一步条件
@@ -222,13 +222,13 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
      * 企业认证流程中断，下次进入认证流程时还原进度
      */
     private fun fillEnterpriseAuthInfo(data: AuthMerchantCheckBean.Response) {
-        viewBinding.ivIdCardPortraitFace.addImage(data.legal_front_id_card)
-        viewBinding.ivIdCardNationalEmblemFace.addImage(data.legal_back_id_card)
+        viewBinding.ivIdCardPortraitFace.addImage(data.legal_front_id_card_url)
+        viewBinding.ivIdCardNationalEmblemFace.addImage(data.legal_back_id_card_url)
         viewBinding.evRealName.fillEditContent(data.legal_person)
         viewBinding.evIdCardNumber.fillEditContent(data.legal_id_card)
         if (authType == Constant.TYPE_AUTH_INDIVIDUAL_BUSINESS) {
             // 个体工商户
-            viewBinding.avFaceAuth.showFaceAuthResult(data.live_identity_status == Constant.ALIVE_DETECT_SUCCESS)
+            if (data.live_identity_status == Constant.ALIVE_DETECT_SUCCESS) viewBinding.avFaceAuth.showFaceAuthSuccess()
             // 如果人脸验证已通过 则直接锁定输入状态
             if (data.live_identity_status == Constant.ALIVE_DETECT_SUCCESS) lockEnterpriseAuthInfo()
         } else {
@@ -248,8 +248,10 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
         viewBinding.ivIdCardNationalEmblemFace.disableModify()
         viewBinding.evRealName.disableModify()
         viewBinding.evIdCardNumber.disableModify()
+        if (authType == Constant.TYPE_AUTH_PERSONAL) {
             (activity as LifeAccountPersonalAuthActivity).disableModifyOccupation()
         }
+    }
 
     /**
      * 锁定当前输入状态

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountPersonalAuthActivity.kt

@@ -134,6 +134,8 @@ class LifeAccountPersonalAuthActivity :
     }
 
     override fun authPersonalCompleteSuccess(result: AuthPersonalCompleteBean.Response?) {
+        // 本地保存生活号id
+        Hawk.put(HawkConfig.LifeAccountId, result?.life_account_id)
         // 跳转个人认证成功页
         XPageManager.push(
             XRouterPathConstants.LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE,

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/LifeAccountFaceAuthView.kt

@@ -49,6 +49,16 @@ class LifeAccountFaceAuthView @JvmOverloads constructor(
         }
     }
 
+    /**
+     * 人脸验证结果成功UI
+     */
+    fun showFaceAuthSuccess() {
+        viewBinding.tvFaceAuthResult.text = resources.getText(R.string.face_auth_success)
+        viewBinding.tvFaceAuthResult.setTextColor(Color.parseColor("#FF6BB81F"))
+        viewBinding.ivFaceAuthStart.visibility = View.GONE
+        viewBinding.tvFaceAuthErrorTips.visibility = View.GONE
+    }
+
     override fun onClick(v: View?) {
         if (v?.id == R.id.iv_face_auth_start) {
             callback?.onStartFaceAuth()