fix 生活号名称修改后同步商户基本信息页面和商户管理中心页面

CommonLib/Common/src/main/java/com/yidian/common/XEventConfig.kt

@@ -15,5 +15,6 @@ class XEventConfig {
         const val UPDATE_LIKE: String = "updateLike"
         const val GIF_DATA: String = "gifData"
         const val CHOOSE_CAREER: String = "chooseCareer"
+        const val LIFE_ACCOUNT_NAME_MODIFY = "lifeAccountNameModify"
     }
 }

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

@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.newscontent.ui.center
 
 import android.os.Bundle
 import android.text.InputFilter
+import com.yidian.common.XEventConfig
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
@@ -11,6 +12,8 @@ import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.utils.InputFilterUtil
 import com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
 import com.yidian.shenghuoquan.newscontent.widget.LifeAccountAuthIdentityInfoEditView
+import com.yidian.xarc.xevent.XBaseEvent
+import com.yidian.xarc.xevent.XEventManager
 import com.yidian.xpage.XPageManager
 
 /**
@@ -89,7 +92,8 @@ class LifeAccountModifyNameActivity : BaseActivity<ActivityLifeAccountModifyName
 
   override fun createLifeAccountCallback(result: Boolean) {
     if (result) {
-      // 生活号名称修改成功
+      // 生活号名称修改成功 发送事件通知商户基本信息页面和商户管理中心页面
+      XEventManager.post(XBaseEvent(XEventConfig.LIFE_ACCOUNT_NAME_MODIFY, viewBind.evLifeAccountName.getEditContent()))
       XPageManager.pop(null)
     } else {
       // 生活号名称修改失败 提示

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

@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.yidian.common.XEventConfig
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
@@ -27,7 +28,11 @@ import com.yidian.shenghuoquan.newscontent.ui.dialog.HintDialog
 import com.yidian.shenghuoquan.newscontent.ui.dialog.MerchantCenterBottomHintDialog
 import com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
 import com.yidian.shenghuoquan.newscontent.widget.LifeAccountLabelView
+import com.yidian.xarc.xevent.XBaseEvent
+import com.yidian.xarc.xevent.XEventManager
 import com.yidian.xpage.XPageManager
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 
 /**
  * author: yinjiacheng
@@ -74,6 +79,12 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
     initView()
     initListener()
     initData()
+    XEventManager.register(this)
+  }
+
+  override fun onDestroy() {
+    super.onDestroy()
+    XEventManager.unRegister(this)
   }
 
   private fun initView() {
@@ -384,4 +395,15 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
     // 切换主体 请求生活号列表接口
     ApiService.getLifeAccountList(this)
   }
+
+  @Subscribe(sticky = false, threadMode = ThreadMode.MAIN)
+  fun onEvent(event: XBaseEvent?) {
+    when (event?.name) {
+      XEventConfig.LIFE_ACCOUNT_NAME_MODIFY -> {
+        // 更新生活号名称
+        val accountName = event.body as String
+        viewBind.lvLifeAccountLabel.setLifeAccountName(accountName)
+      }
+    }
+  }
 }

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

@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.newscontent.ui.center
 
 import android.os.Bundle
 import androidx.core.view.isVisible
+import com.yidian.common.XEventConfig
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
@@ -11,9 +12,14 @@ import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.callback.IAuthMerchantCheckCallback
 import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthMerchantCheckBean
 import com.yidian.shenghuoquan.newscontent.http.httpbean.GetLifeAccountInfoByIdBean
+import com.yidian.shenghuoquan.newscontent.ui.auth.LifeAccountAuthDataManager
 import com.yidian.shenghuoquan.newscontent.ui.auth.LifeAccountEnterpriseAuthActivity
 import com.yidian.shenghuoquan.newscontent.widget.MerchantInfoView
+import com.yidian.xarc.xevent.XBaseEvent
+import com.yidian.xarc.xevent.XEventManager
 import com.yidian.xpage.XPageManager
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 
 /**
  * author: yinjiacheng
@@ -39,6 +45,11 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
     }
   }
 
+  /**
+   * 修改后的生活号名称
+   */
+  private var modifyAccountName: String? = null
+
   override fun createViewBinding(): ActivityMerchantInfoBinding {
     return ActivityMerchantInfoBinding.inflate(layoutInflater)
   }
@@ -47,11 +58,17 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
     return XRouterPathConstants.MERCHANT_INFO
   }
 
+  override fun onDestroy() {
+    super.onDestroy()
+    XEventManager.unRegister(this)
+  }
+
   override fun init(savedInstanceState: Bundle?) {
     super.init(savedInstanceState)
     initView()
     initListener()
     initData()
+    XEventManager.register(this)
   }
 
   private fun initView() {
@@ -119,7 +136,7 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
           ),
           Pair(
             LifeAccountModifyNameActivity.EXTRA_LIFE_ACCOUNT_NAME,
-            lifeAccountInfo?.life_account_name
+            modifyAccountName ?: lifeAccountInfo?.life_account_name
           )
         )
       )
@@ -184,4 +201,16 @@ class MerchantInfoActivity : BaseActivity<ActivityMerchantInfoBinding>(), Mercha
 
   }
 
+  @Subscribe(sticky = false, threadMode = ThreadMode.MAIN)
+  fun onEvent(event: XBaseEvent?) {
+    when (event?.name) {
+      XEventConfig.LIFE_ACCOUNT_NAME_MODIFY -> {
+        // 更新生活号名称
+        val accountName = event.body as String
+        modifyAccountName = accountName
+        viewBind.ivLifeAccountName.fillContent(accountName)
+      }
+    }
+  }
+
 }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/LifeAccountLabelView.kt

@@ -84,6 +84,14 @@ class LifeAccountLabelView @JvmOverloads constructor(
     }
   }
 
+  /**
+   * 设置生活号名称
+   * @param name 修改后的生活号名称
+   */
+  fun setLifeAccountName(name: String) {
+    viewBinding.tvLifeAccountName.text = name
+  }
+
   override fun onClick(v: View?) {
     if (v?.id == R.id.iv_life_account_detail) {
       // 跳转生活号基本信息