update 个人认证成功跳转管理中心

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

@@ -85,6 +85,7 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
             XRouterPathConstants.LIFE_ACCOUNT_PERSONAL_AUTH,
             hashMapOf(Pair(LifeAccountPersonalAuthActivity.EXTRA_AUTH_DATA, result))
         )
+        finish()
     }
 
     override fun authAuthenticationFailure(message: String?) {
@@ -102,6 +103,7 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
             XRouterPathConstants.LIFE_ACCOUNT_ENTERPRISE_AUTH,
             hashMapOf(Pair(LifeAccountEnterpriseAuthActivity.EXTRA_AUTH_DATA, result))
         )
+        finish()
     }
 
     override fun authMerchantCheckFailure(message: String?) {

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

@@ -162,6 +162,7 @@ class LifeAccountPersonalAuthActivity :
                 )
             )
         )
+        finish()
     }
 
     override fun authPersonalCompleteFailure(message: String?) {

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

@@ -6,6 +6,10 @@ import com.yidian.common.XRouterPathConstants
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountPersonalAuthCompleteBinding
+import com.yidian.shenghuoquan.newscontent.http.ApiService
+import com.yidian.shenghuoquan.newscontent.http.callback.IGetLifeAccountListCallback
+import com.yidian.shenghuoquan.newscontent.http.httpbean.LifeAccountItemBean
+import com.yidian.shenghuoquan.newscontent.ui.center.MerchantCenterActivity
 import com.yidian.xpage.XPageManager
 
 /**
@@ -14,7 +18,7 @@ import com.yidian.xpage.XPageManager
  * Describe: 个人认证成功页面 activity_life_account_personal_auth_complete
  */
 class LifeAccountPersonalAuthCompleteActivity :
-    BaseActivity<ActivityLifeAccountPersonalAuthCompleteBinding>() {
+    BaseActivity<ActivityLifeAccountPersonalAuthCompleteBinding>(), IGetLifeAccountListCallback {
 
     companion object {
         const val OCCUPATION = "occupation"
@@ -57,10 +61,9 @@ class LifeAccountPersonalAuthCompleteActivity :
     }
 
     private fun initListener() {
-        viewBind.enterLifeAccount.setOnClickListener {
-            // 跳转生活号管理首页
-            XPageManager.push(XRouterPathConstants.MERCHANT_CENTER, null)
-            finish()
+        viewBind.tvEnterMerchantCenter.setOnClickListener {
+            // 跳转商户管理中心 先请求生活号列表 带参跳转
+            ApiService.getLifeAccountList(this)
         }
         viewBind.upgradeEnterpriseAuth.setOnClickListener {
             // 传入生活号id 请求企业认证升级相关接口用
@@ -69,11 +72,31 @@ class LifeAccountPersonalAuthCompleteActivity :
                 hashMapOf(
                     Pair(
                         LifeAccountEnterpriseAuthActivity.EXTRA_LIFE_ACCOUNT_ID,
-                        params[LIFE_ACCOUNT_ID] as Long
+                        params[LIFE_ACCOUNT_ID]
                     )
                 )
             )
             finish()
         }
     }
+
+    override fun getLifeAccountListSuccess(result: ArrayList<LifeAccountItemBean.Response>?) {
+        // 生活号列表请求成功
+        result?.forEach {
+            if (it.life_account_id == params[LIFE_ACCOUNT_ID]) {
+                XPageManager.push(
+                    XRouterPathConstants.MERCHANT_CENTER,
+                    hashMapOf(
+                        Pair(MerchantCenterActivity.EXTRA_IS_MULTI, result.size > 1),
+                        Pair(MerchantCenterActivity.EXTRA_LIFE_ACCOUNT_INFO, it)
+                    )
+                )
+                finish()
+            }
+        }
+    }
+
+    override fun getLifeAccountListFailure(message: String?) {
+
+    }
 }
\ No newline at end of file

Components/newscontent/src/main/res/layout/activity_life_account_personal_auth_complete.xml

@@ -56,7 +56,7 @@
         android:background="@mipmap/icon_shop" />
 
     <RelativeLayout
-        android:id="@+id/enter_life_account"
+        android:id="@+id/rl_personal_auth_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/icon_shop_root"
@@ -188,9 +188,10 @@
     </RelativeLayout>
 
     <TextView
+        android:id="@+id/tv_enter_merchant_center"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/enter_life_account"
+        android:layout_below="@id/rl_personal_auth_info"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="10dp"
         android:background="@drawable/shape_stroke2_radius18_skin_primary_1852f1"