Merge branch 'feature/dev_order' of...

Merge branch 'feature/dev_order' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into feature/dev_order

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

@@ -30,7 +30,6 @@ import com.yidian.shenghuoquan.bmanagercenter.databinding.ActivityMerchantCenter
 import com.yidian.shenghuoquan.bmanagercenter.http.ApiService
 import com.yidian.shenghuoquan.bmanagercenter.http.callback.*
 import com.yidian.shenghuoquan.bmanagercenter.http.httpbean.AuthMerchantCheckBean
-import com.yidian.shenghuoquan.bmanagercenter.http.httpbean.GetLifeAccountInfoByIdBean
 import com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountAuthActivity
 import com.yidian.shenghuoquan.bmanagercenter.ui.auth.LifeAccountEnterpriseAuthActivity
 import com.yidian.shenghuoquan.bmanagercenter.ui.dialog.MerchantCenterBottomHintDialog
@@ -51,10 +50,9 @@ import org.greenrobot.eventbus.ThreadMode
  * description: 商户管理中心
  */
 class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), MerchantSwitchDialog.OnMerchantSwitchCallback,
-  LifeAccountLabelView.OnLifeAccountLabelCallback, IGetLifeAccountInfoByIdCallback,
-  MerchantCenterBottomHintDialog.OnMerchantCenterBottomHintCallback, IAuthMerchantCheckCallback,
-  MerchantServiceFunctionAdapter.OnItemClickListener, CommonTopBarView.OnCommonTopBarActionCallback, OnRefreshListener,
-  DialogInterface.OnShowListener, DialogInterface.OnDismissListener, IGetCommonConfigCallback {
+  LifeAccountLabelView.OnLifeAccountLabelCallback, MerchantCenterBottomHintDialog.OnMerchantCenterBottomHintCallback,
+  IAuthMerchantCheckCallback, MerchantServiceFunctionAdapter.OnItemClickListener, CommonTopBarView.OnCommonTopBarActionCallback,
+  OnRefreshListener, DialogInterface.OnShowListener, DialogInterface.OnDismissListener, IGetCommonConfigCallback {
 
   companion object {
     // 传递的生活号信息
@@ -260,23 +258,8 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), Me
   }
 
   override fun onEnterLifeAccountInfo(lifeAccountId: String) {
-    // 请求生活号详情接口
-    ApiService.getLifeAccountInfoById(
-      this,
-      hashMapOf(Pair(PARAMS_LIFE_ACCOUNT_ID, lifeAccountId))
-    )
-  }
-
-  override fun getLifeAccountInfoByIdSuccess(result: GetLifeAccountInfoByIdBean.Response?) {
     // 跳转生活号基本信息
-    XPageManager.push(
-      XRouterPathConstants.LIFE_ACCOUNT_INFO,
-      hashMapOf(Pair(MerchantInfoActivity.EXTRA_LIFE_ACCOUNT_INFO, result))
-    )
-  }
-
-  override fun getLifeAccountInfoByIdFailure(message: String?) {
-
+    XPageManager.push(XRouterPathConstants.LIFE_ACCOUNT_INFO, null)
   }
 
   override fun onUpgradeAuth() {