fix 商户管理中心切换主体时更新本地存储的生活号id

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

@@ -65,7 +65,7 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>(), IGetLifeAccountListC
       }
       else -> {
         // 关联多个生活号
-        StorageUtil.getLifeAccountId().apply {
+        StorageUtil.getLifeAccountId()?.apply {
           if (isNotEmpty()) {
             // 如果本地有上次操作的生活号则遍历生活号列表进入对应生活号的管理中心
             result?.forEach {

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

@@ -158,7 +158,7 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>(), IGetLifeAc
     // 登录状态
     Hawk.put(HawkConfig.LoginStatus, false)
     // 生活号id
-    Hawk.delete(HawkConfig.LifeAccountId)
+    StorageUtil.deleteLifeAccountId()
   }
 
   override fun onDestroy() {

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

@@ -67,7 +67,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
     intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let {
       (it as HashMap<*, *>)[EXTRA_LIFE_ACCOUNT_ID]?.let { id ->
         id as String
-      } ?: Hawk.get(HawkConfig.LifeAccountId, null)
+      } ?: StorageUtil.getLifeAccountId()
     }
   }
 

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

@@ -25,6 +25,7 @@ import com.yidian.shenghuoquan.newscontent.ui.auth.LifeAccountAuthActivity
 import com.yidian.shenghuoquan.newscontent.ui.auth.LifeAccountEnterpriseAuthActivity
 import com.yidian.shenghuoquan.newscontent.ui.dialog.HintDialog
 import com.yidian.shenghuoquan.newscontent.ui.dialog.MerchantCenterBottomHintDialog
+import com.yidian.shenghuoquan.newscontent.utils.StorageUtil
 import com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
 import com.yidian.shenghuoquan.newscontent.widget.LifeAccountLabelView
 import com.yidian.utils.ToastUtil
@@ -329,6 +330,8 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
   override fun onLifeAccountSelect(data: LifeAccountItemBean.Response) {
     // 用户切换主体 更新当前生活号信息
     curLifeAccount = data
+    // 更新本地存储的生活号id
+    StorageUtil.putLifeAccountId(data.life_account_id)
     viewBind.rlRefresh.autoRefresh()
   }
 
@@ -518,6 +521,8 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
         if (result?.contains(curLifeAccount) == false) {
           // 当前选择的生活号已不存在则切换第一个生活号 目前为企业员工被解除关系会触发
           curLifeAccount = result[0]
+          // 更新本地存储的生活号id
+          StorageUtil.putLifeAccountId(result[0].life_account_id)
           // 刷新数据
           refreshMerchantCenterData(result[0])
           // 切换主体入口是否展示判断

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/utils/StorageUtil.kt

@@ -20,7 +20,14 @@ object StorageUtil {
   /**
    * 获取生活号id
    */
-  fun getLifeAccountId(): String {
-    return Hawk.get(HawkConfig.LifeAccountId, "")
+  fun getLifeAccountId(): String? {
+    return Hawk.get(HawkConfig.LifeAccountId, null)
+  }
+
+  /**
+   * 删除生活号id
+   */
+  fun deleteLifeAccountId() {
+    Hawk.delete(HawkConfig.LifeAccountId)
   }
 }