fix SHQBD-247 处理商户管理中心页面企业员工被解除关系后刷新页面的情况

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

@@ -16,10 +16,7 @@ import com.yidian.shenghuoquan.newscontent.bean.HintOptionBean
 import com.yidian.shenghuoquan.newscontent.constant.Constant
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityMerchantCenterBinding
 import com.yidian.shenghuoquan.newscontent.http.ApiService
-import com.yidian.shenghuoquan.newscontent.http.callback.IAuthMerchantCheckCallback
-import com.yidian.shenghuoquan.newscontent.http.callback.IGetConfigListCallback
-import com.yidian.shenghuoquan.newscontent.http.callback.IGetLifeAccountInfoByIdCallback
-import com.yidian.shenghuoquan.newscontent.http.callback.IGetLifeAccountListCallback
+import com.yidian.shenghuoquan.newscontent.http.callback.*
 import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthMerchantCheckBean
 import com.yidian.shenghuoquan.newscontent.http.httpbean.GetConfigListBean
 import com.yidian.shenghuoquan.newscontent.http.httpbean.GetLifeAccountInfoByIdBean
@@ -46,7 +43,8 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
   IGetConfigListCallback, MerchantSwitchDialog.OnMerchantSwitchCallback,
   LifeAccountLabelView.OnLifeAccountLabelCallback, IGetLifeAccountInfoByIdCallback,
   MerchantCenterBottomHintDialog.OnMerchantCenterBottomHintCallback, IAuthMerchantCheckCallback,
-  MerchantServiceFunctionAdapter.OnItemClickListener, CommonTopBarView.OnCommonTopBarActionCallback, OnRefreshListener {
+  MerchantServiceFunctionAdapter.OnItemClickListener, CommonTopBarView.OnCommonTopBarActionCallback, OnRefreshListener,
+  IUserLogoutCallBack {
 
   companion object {
     // 传递的生活号信息
@@ -511,6 +509,21 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
       override fun getLifeAccountListSuccess(result: ArrayList<LifeAccountItemBean.Response>?) {
         // 刷新成功
         refreshLayout.finishRefresh(true)
+        if (result?.size == 0) {
+          // 如果当前无生活号则退出登录
+          ToastUtil.showToast(this@MerchantCenterActivity, resources.getString(R.string.no_life_account))
+          ApiService.userLogout(this@MerchantCenterActivity)
+          return
+        }
+        if (result?.contains(curLifeAccount) == false) {
+          // 当前选择的生活号已不存在则切换第一个生活号 目前为企业员工被解除关系会触发
+          curLifeAccount = result[0]
+          // 刷新数据
+          refreshMerchantCenterData(result[0])
+          // 切换主体入口是否展示判断
+          viewBind.bvTopBar.setActionVisibility(result.size > 1)
+          return
+        }
         result?.forEach {
           if (curLifeAccount.life_account_id == it.life_account_id) {
             curLifeAccount = it
@@ -530,4 +543,8 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
       }
     })
   }
+
+  override fun userLogoutSuccess() {
+    XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
+  }
 }

Components/newscontent/src/main/res/values/strings.xml

@@ -173,5 +173,6 @@
     <string name="input_legal_person_phone_number">请输入法人手机号</string>
     <string name="change">更换</string>
     <string name="login_again">重新登录</string>
+    <string name="no_life_account">当前无生活号，请重新登录</string>
 
 </resources>
\ No newline at end of file