update 企业审核认证驳回状态下修改认证资料传参标识

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

@@ -43,6 +43,9 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
 
     // 认证数据
     const val EXTRA_AUTH_DATA = "authData"
+
+    // 是否审核驳回后修改认证
+    const val EXTRA_IS_AUTH_MODIFY = "isAuthModify"
   }
 
   private val fragmentList: ArrayList<Fragment> by lazy {
@@ -79,6 +82,17 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
     }
   }
 
+  /**
+   * 是否为认证驳回修改情况
+   */
+  private val isAuthModify by lazy {
+    intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let {
+      (it as HashMap<*, *>)[EXTRA_IS_AUTH_MODIFY]?.let { bool ->
+        bool as Boolean
+      } ?: false
+    } ?: false
+  }
+
   /**
    * 上一次选择的商户类型
    */
@@ -310,7 +324,8 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
         Pair(
           LifeAccountEnterpriseAuthCompleteActivity.EXTRA_LIFE_ACCOUNT_ID,
           result?.life_account_id
-        )
+        ),
+        Pair(LifeAccountEnterpriseAuthCompleteActivity.EXTRA_IS_AUTH_MODIFY, isAuthModify)
       )
     )
     XPageManager.pop(null)
@@ -346,7 +361,8 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
         Pair(
           LifeAccountEnterpriseAuthCompleteActivity.EXTRA_LIFE_ACCOUNT_ID,
           result?.life_account_id
-        )
+        ),
+        Pair(LifeAccountEnterpriseAuthCompleteActivity.EXTRA_IS_AUTH_MODIFY, isAuthModify)
       )
     )
     XPageManager.pop(null)

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

@@ -5,7 +5,6 @@ import android.view.View
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
-import com.yidian.shenghuoquan.newscontent.constant.Constant
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountEnterpriseAuthCompleteBinding
 import com.yidian.shenghuoquan.newscontent.utils.SensitiveInfoUtil
 import com.yidian.xpage.XPageManager
@@ -24,6 +23,9 @@ class LifeAccountEnterpriseAuthCompleteActivity :
     const val ID_CARD_NAME = "idCardName"
     const val ID_CARD_NUM = "idCardNum"
     const val EXTRA_LIFE_ACCOUNT_ID = "life_account_id"
+
+    // 是否审核驳回后修改认证
+    const val EXTRA_IS_AUTH_MODIFY = "isAuthModify"
   }
 
   /**

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt

@@ -318,16 +318,11 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
 
   }
 
-  override fun onUpgradeEnterpriseAuth() {
-    // 升级企业认证 先请求企业认证信息
-    ApiService.authMerchantCheck(
-      this,
-      hashMapOf(
-        Pair(
-          MerchantInfoActivity.PARAMS_LIFE_ACCOUNT_ID,
-          curLifeAccount.life_account_id
-        )
-      )
+  override fun onUpgradeAuth() {
+    // 由未认证升级认证 跳转认证首页
+    XPageManager.push(
+      XRouterPathConstants.LIFE_ACCOUNT_AUTH,
+      hashMapOf(Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH))
     )
   }
 
@@ -352,7 +347,9 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
         Pair(
           LifeAccountEnterpriseAuthActivity.EXTRA_LIFE_ACCOUNT_ID,
           curLifeAccount.life_account_id
-        ), Pair(LifeAccountEnterpriseAuthActivity.EXTRA_AUTH_DATA, result)
+        ),
+        Pair(LifeAccountEnterpriseAuthActivity.EXTRA_AUTH_DATA, result),
+        Pair(LifeAccountEnterpriseAuthActivity.EXTRA_IS_AUTH_MODIFY, curLifeAccount.enterprise_audit_status == Constant.STATUS_AUDIT_REJECT)
       )
     )
   }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantInfoActivity.kt

@@ -12,6 +12,7 @@ import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.callback.IAuthMerchantCheckCallback
 import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthMerchantCheckBean
 import com.yidian.shenghuoquan.newscontent.http.httpbean.GetLifeAccountInfoByIdBean
+import com.yidian.shenghuoquan.newscontent.ui.auth.LifeAccountAuthActivity
 import com.yidian.shenghuoquan.newscontent.ui.auth.LifeAccountEnterpriseAuthActivity
 import com.yidian.shenghuoquan.newscontent.widget.MerchantInfoView
 import com.yidian.xarc.xevent.XBaseEvent
@@ -161,7 +162,7 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
         // 未认证 进入认证流程首页 此处需要传参from控制认证流程首页返回按钮显示
         XPageManager.push(
           XRouterPathConstants.LIFE_ACCOUNT_AUTH,
-          hashMapOf(Pair("from", "auth"))
+          hashMapOf(Pair(LifeAccountAuthActivity.EXTRA_PAGE_FROM, LifeAccountAuthActivity.FROM_AUTH))
         )
       } else if (lifeAccountInfo?.audit_status == Constant.STATUS_AUDIT_REJECT) {
         // 认证驳回 请求企业认证信息 此处为升级认证情况 需要传入生活号id
@@ -197,7 +198,9 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
         Pair(
           LifeAccountEnterpriseAuthActivity.EXTRA_LIFE_ACCOUNT_ID,
           lifeAccountInfo?.life_account_id
-        ), Pair(LifeAccountEnterpriseAuthActivity.EXTRA_AUTH_DATA, result)
+        ),
+        Pair(LifeAccountEnterpriseAuthActivity.EXTRA_AUTH_DATA, result),
+        Pair(LifeAccountEnterpriseAuthActivity.EXTRA_IS_AUTH_MODIFY, lifeAccountInfo?.audit_status == Constant.STATUS_AUDIT_REJECT)
       )
     )
   }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/dialog/MerchantCenterBottomHintDialog.kt

@@ -15,90 +15,90 @@ import com.yidian.utils.DensityUtil
  * description: 商户管理中心底部提示弹窗
  */
 class MerchantCenterBottomHintDialog(
-    context: Context,
-    val type: Int,
-    val callback: OnMerchantCenterBottomHintCallback? = null
+  context: Context,
+  val type: Int,
+  val callback: OnMerchantCenterBottomHintCallback? = null
 ) :
-    BaseDialog<DialogMerchantCenterBottomHintBinding>(
-        context,
-        R.style.merchant_center_bottom_hint_dialog
-    ),
-    View.OnClickListener {
+  BaseDialog<DialogMerchantCenterBottomHintBinding>(
+    context,
+    R.style.merchant_center_bottom_hint_dialog
+  ),
+  View.OnClickListener {
 
-    companion object {
-        // 认证升级
-        const val TYPE_AUTH_UPGRADE = 1
+  companion object {
+    // 认证升级
+    const val TYPE_AUTH_UPGRADE = 1
 
-        // 认证驳回
-        const val TYPE_AUTH_REJECT = 2
-    }
+    // 认证驳回
+    const val TYPE_AUTH_REJECT = 2
+  }
 
-    override fun createViewBinding(): DialogMerchantCenterBottomHintBinding {
-        return DialogMerchantCenterBottomHintBinding.inflate(layoutInflater)
-    }
+  override fun createViewBinding(): DialogMerchantCenterBottomHintBinding {
+    return DialogMerchantCenterBottomHintBinding.inflate(layoutInflater)
+  }
 
-    override fun initView() {
-        when (type) {
-            TYPE_AUTH_UPGRADE -> {
-                viewBinding.root.setBackgroundResource(R.drawable.shape_bg_bottom_hint)
-                viewBinding.tvContent.text =
-                    context.resources.getString(R.string.upgrade_auth)
-                viewBinding.tvSubContent.text =
-                    context.resources.getString(R.string.auth_merchant_description)
-                viewBinding.tvNext.setBackgroundResource(R.drawable.shape_bg_common_btn)
-                viewBinding.tvNext.setTextColor(context.resources.getColor(R.color.color_FFFFFFFF))
-                viewBinding.tvNext.text = context.resources.getString(R.string.immediate_upgrade)
-            }
-            TYPE_AUTH_REJECT -> {
-                viewBinding.root.setBackgroundResource(R.drawable.shape_bg_bottom_warn)
-                viewBinding.tvContent.text =
-                    context.resources.getString(R.string.auth_apply_reject)
-                viewBinding.tvSubContent.text =
-                    context.resources.getString(R.string.apply_auth_merchant_description)
-                viewBinding.tvNext.setBackgroundResource(R.drawable.shape_bg_modify_auth_btn)
-                viewBinding.tvNext.setTextColor(context.resources.getColor(R.color.color_FFFF3A3A))
-                viewBinding.tvNext.text = context.resources.getString(R.string.modify_auth)
-            }
-        }
+  override fun initView() {
+    when (type) {
+      TYPE_AUTH_UPGRADE -> {
+        viewBinding.root.setBackgroundResource(R.drawable.shape_bg_bottom_hint)
+        viewBinding.tvContent.text =
+          context.resources.getString(R.string.upgrade_auth)
+        viewBinding.tvSubContent.text =
+          context.resources.getString(R.string.auth_merchant_description)
+        viewBinding.tvNext.setBackgroundResource(R.drawable.shape_bg_common_btn)
+        viewBinding.tvNext.setTextColor(context.resources.getColor(R.color.color_FFFFFFFF))
+        viewBinding.tvNext.text = context.resources.getString(R.string.immediate_upgrade)
+      }
+      TYPE_AUTH_REJECT -> {
+        viewBinding.root.setBackgroundResource(R.drawable.shape_bg_bottom_warn)
+        viewBinding.tvContent.text =
+          context.resources.getString(R.string.auth_apply_reject)
+        viewBinding.tvSubContent.text =
+          context.resources.getString(R.string.apply_auth_merchant_description)
+        viewBinding.tvNext.setBackgroundResource(R.drawable.shape_bg_modify_auth_btn)
+        viewBinding.tvNext.setTextColor(context.resources.getColor(R.color.color_FFFF3A3A))
+        viewBinding.tvNext.text = context.resources.getString(R.string.modify_auth)
+      }
     }
+  }
 
-    override fun initListener() {
-        viewBinding.tvNext.setOnClickListener(this)
-    }
+  override fun initListener() {
+    viewBinding.tvNext.setOnClickListener(this)
+  }
 
-    override fun show() {
-        super.show()
-        window?.setGravity(Gravity.BOTTOM)
-        val params = window?.attributes
-        params?.width = WindowManager.LayoutParams.MATCH_PARENT
-        params?.height = DensityUtil.dp2px(84f)
-        window?.attributes = params
-    }
+  override fun show() {
+    super.show()
+    window?.setGravity(Gravity.BOTTOM)
+    val params = window?.attributes
+    params?.width = WindowManager.LayoutParams.MATCH_PARENT
+    params?.height = DensityUtil.dp2px(84f)
+    window?.attributes = params
+  }
 
-    override fun onClick(v: View?) {
-        if (v?.id == R.id.tv_next) {
-            when (type) {
-                TYPE_AUTH_UPGRADE -> {
-                    // 升级企业认证
-                    callback?.onUpgradeEnterpriseAuth()
-                }
-                TYPE_AUTH_REJECT -> {
-                    // 修改企业认证
-                    callback?.onModifyEnterpriseAuth()
-                }
-            }
+  override fun onClick(v: View?) {
+    if (v?.id == R.id.tv_next) {
+      when (type) {
+        TYPE_AUTH_UPGRADE -> {
+          // 升级认证
+          callback?.onUpgradeAuth()
+        }
+        TYPE_AUTH_REJECT -> {
+          // 修改企业认证
+          callback?.onModifyEnterpriseAuth()
         }
+      }
     }
+  }
 
-    interface OnMerchantCenterBottomHintCallback {
-        /**
-         * 升级企业认证
-         */
-        fun onUpgradeEnterpriseAuth()
+  interface OnMerchantCenterBottomHintCallback {
+    /**
+     * 由未认证升级认证
+     */
+    fun onUpgradeAuth()
 
-        /**
-         * 修改企业认证
-         */
-        fun onModifyEnterpriseAuth()
-    }
-}
+    /**
+     * 修改企业认证
+     */
+    fun onModifyEnterpriseAuth()
+  }
+}
\ No newline at end of file