update Activity finish改为XPage.pop

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

@@ -47,7 +47,7 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>(), IGetLifeAccountListC
       } else {
         // 未登录 跳转登录
         XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
-                finish()
+        XPageManager.pop(null)
       }
     } else {
       // TODO: 6/12/21 协议dialog
@@ -92,11 +92,10 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>(), IGetLifeAccountListC
         )
       }
     }
-        finish()
+    XPageManager.pop(null)
   }
 
   override fun getLifeAccountListFailure(message: String?) {
-        // TODO: 6/12/21 处理请求失败情况
-        finish()
+
   }
 }

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

 package com.yidian.shenghuoquan.newscontent.ui
 
 import android.os.Bundle
-import android.view.View
 import com.orhanobut.hawk.Hawk
 import com.yidian.common.AppConfig
 import com.yidian.common.HawkConfig
@@ -10,7 +9,6 @@ import com.yidian.common.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
 import com.yidian.common.base.BaseActivity
 import com.yidian.common.extensions.hide
 import com.yidian.common.extensions.show
-import com.yidian.common.extensions.toggleVisibility
 import com.yidian.common.http.HttpResult
 import com.yidian.common.widget.EditTextInputCallback
 import com.yidian.common.widget.PhoneNumberTextWatcher
@@ -167,8 +165,10 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>(), IGetLifeAc
         // 关联一个生活号 进入商户管理中心
         XPageManager.push(
           XRouterPathConstants.MERCHANT_CENTER,
-          hashMapOf(Pair(MerchantCenterActivity.EXTRA_LIFE_ACCOUNT_INFO, result[0]),
-              Pair(MerchantCenterActivity.EXTRA_IS_MULTI, false))
+          hashMapOf(
+            Pair(MerchantCenterActivity.EXTRA_LIFE_ACCOUNT_INFO, result[0]),
+            Pair(MerchantCenterActivity.EXTRA_IS_MULTI, false)
+          )
         )
       }
       else -> {
@@ -179,12 +179,11 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>(), IGetLifeAc
         )
       }
     }
-    finish()
+    XPageManager.pop(null)
   }
 
   override fun getLifeAccountListFailure(message: String?) {
-    // TODO: 6/12/21 处理请求失败情况
-    finish()
+
   }
 
   override fun sendSmsCodeCallBack(t: HttpResult<Any?>?) {

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

@@ -95,7 +95,6 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
       XRouterPathConstants.LIFE_ACCOUNT_PERSONAL_AUTH,
       hashMapOf(Pair(LifeAccountPersonalAuthActivity.EXTRA_AUTH_DATA, result))
     )
-        finish()
   }
 
   override fun authAuthenticationFailure(message: String?) {
@@ -113,7 +112,6 @@ 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/LifeAccountCreateActivity.kt

@@ -62,7 +62,7 @@ class LifeAccountCreateActivity : BaseActivity<ActivityLifeAccountCreateBinding>
   }
 
   private fun initListener() {
-        viewBind.ivBack.setOnClickListener { finish() }
+    viewBind.ivBack.setOnClickListener { XPageManager.pop(null) }
     viewBind.etAccount.addTextChangedListener(object : TextWatcherAdapter() {
       override fun afterTextChanged(s: Editable?) {
         if (s == null) return

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

@@ -80,7 +80,7 @@ class LifeAccountIdentityActivity : BaseActivity<ActivityLifeAccountIdentityBind
           Pair(MerchantCenterActivity.EXTRA_IS_MULTI, true)
         )
       )
-            finish()
+      XPageManager.pop(null)
     }
   }
 

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

@@ -17,9 +17,9 @@ import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.callback.IAuthPersonalCompleteCallback
 import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthAuthenticationBean
 import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthPersonalCompleteBean
+import com.yidian.shenghuoquan.newscontent.ui.ProtocolActivity
 import com.yidian.xarc.xevent.XBaseEvent
 import com.yidian.xarc.xevent.XEventManager
-import com.yidian.shenghuoquan.newscontent.ui.ProtocolActivity
 import com.yidian.xpage.XPageManager
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -182,7 +182,7 @@ class LifeAccountPersonalAuthActivity :
         )
       )
     )
-    finish()
+    XPageManager.pop(null)
   }
 
   override fun authPersonalCompleteFailure(message: String?) {

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

@@ -78,7 +78,7 @@ class LifeAccountPersonalAuthCompleteActivity :
           )
         )
       )
-            finish()
+      XPageManager.pop(null)
     }
   }
 
@@ -93,7 +93,7 @@ class LifeAccountPersonalAuthCompleteActivity :
             Pair(MerchantCenterActivity.EXTRA_LIFE_ACCOUNT_INFO, it)
           )
         )
-                finish()
+        XPageManager.pop(null)
       }
     }
   }

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

@@ -69,7 +69,7 @@ class LifeNumberActivity : BaseActivity<ActivityLifeNumberBinding>(), IGetLifeAc
 
   private fun initListener() {
     viewBind.root.back.setOnClickListener {
-            finish()
+      XPageManager.pop(null)
     }
     viewBind.tvEnterMerchantCenter.setOnClickListener {
       // 跳转商户管理中心 先请求生活号列表 带参跳转
@@ -88,7 +88,7 @@ class LifeNumberActivity : BaseActivity<ActivityLifeNumberBinding>(), IGetLifeAc
             Pair(MerchantCenterActivity.EXTRA_LIFE_ACCOUNT_INFO, it)
           )
         )
-                finish()
+        XPageManager.pop(null)
       }
     }
   }