update 商户管理中心切换主体、生活号选择页存储选择的生活号id

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

@@ -22,6 +22,7 @@ import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthEnterpriseLegalIden
 import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthIndividualBusinessCompleteBean
 import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthMerchantCheckBean
 import com.yidian.shenghuoquan.newscontent.ui.dialog.BottomSelectDialog
+import com.yidian.shenghuoquan.newscontent.utils.StorageUtil
 import com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
 import com.yidian.shenghuoquan.newscontent.widget.LifeAccountAuthProcessView
 import com.yidian.xpage.XPageManager
@@ -276,7 +277,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
 
   override fun authEnterpriseLegalIdentityCommitSuccess(result: AuthEnterpriseLegalIdentityCommitBean.Response?) {
     // 本地保存生活号id
-    Hawk.put(HawkConfig.LifeAccountId, result?.life_account_id)
+    StorageUtil.putLifeAccountId(result?.life_account_id)
     // 普通企业法人身份信息提交成功
     XPageManager.push(
       XRouterPathConstants.LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE,
@@ -314,7 +315,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
 
   override fun authIndividualBusinessCompleteSuccess(result: AuthIndividualBusinessCompleteBean.Response?) {
     // 本地保存生活号id
-    Hawk.put(HawkConfig.LifeAccountId, result?.life_account_id)
+    StorageUtil.putLifeAccountId(result?.life_account_id)
     // 个体工商户认证完成
     XPageManager.push(
       XRouterPathConstants.LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE,

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

@@ -11,6 +11,7 @@ import com.yidian.shenghuoquan.newscontent.adapter.LifeAccountIdentityAdapter
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountIdentityBinding
 import com.yidian.shenghuoquan.newscontent.http.httpbean.LifeAccountItemBean
 import com.yidian.shenghuoquan.newscontent.ui.center.MerchantCenterActivity
+import com.yidian.shenghuoquan.newscontent.utils.StorageUtil
 import com.yidian.xpage.XPageManager
 
 /**
@@ -72,6 +73,7 @@ class LifeAccountIdentityActivity : BaseActivity<ActivityLifeAccountIdentityBind
       XPageManager.pop(null)
     }
     viewBind.tvEnterLifeAccount.setOnClickListener {
+      StorageUtil.putLifeAccountId(curSelectedItem.life_account_id)
       // 进入商户管理中心页
       XPageManager.push(
         XRouterPathConstants.MERCHANT_CENTER,

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

@@ -18,6 +18,7 @@ import com.yidian.shenghuoquan.newscontent.http.callback.IAuthPersonalCompleteCa
 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.shenghuoquan.newscontent.utils.StorageUtil
 import com.yidian.xarc.xevent.XBaseEvent
 import com.yidian.xarc.xevent.XEventManager
 import com.yidian.xpage.XPageManager
@@ -153,7 +154,7 @@ class LifeAccountPersonalAuthActivity :
 
   override fun authPersonalCompleteSuccess(result: AuthPersonalCompleteBean.Response?) {
     // 本地保存生活号id
-    Hawk.put(HawkConfig.LifeAccountId, result?.life_account_id)
+    StorageUtil.putLifeAccountId(result?.life_account_id)
     // 跳转个人认证成功页
     XPageManager.push(
       XRouterPathConstants.LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE,

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

@@ -10,6 +10,7 @@ import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.adapter.MerchantSwitchAdapter
 import com.yidian.shenghuoquan.newscontent.databinding.DialogMerchantSwitchBinding
 import com.yidian.shenghuoquan.newscontent.http.httpbean.LifeAccountItemBean
+import com.yidian.shenghuoquan.newscontent.utils.StorageUtil
 import com.yidian.utils.DensityUtil
 
 /**
@@ -18,51 +19,53 @@ import com.yidian.utils.DensityUtil
  * description: 商户管理中心-切换主体
  */
 class MerchantSwitchDialog(
-    context: Context,
-    private val curLifeAccountId: String,
-    val data: List<LifeAccountItemBean.Response>,
-    val callback: OnMerchantSwitchCallback? = null
+  context: Context,
+  private val curLifeAccountId: String,
+  val data: List<LifeAccountItemBean.Response>,
+  val callback: OnMerchantSwitchCallback? = null
 ) : BaseDialog<DialogMerchantSwitchBinding>(context, R.style.merchant_switch_dialog),
-    MerchantSwitchAdapter.OnItemClickListener, View.OnClickListener {
+  MerchantSwitchAdapter.OnItemClickListener, View.OnClickListener {
 
-    override fun createViewBinding(): DialogMerchantSwitchBinding {
-        return DialogMerchantSwitchBinding.inflate(layoutInflater)
-    }
+  override fun createViewBinding(): DialogMerchantSwitchBinding {
+    return DialogMerchantSwitchBinding.inflate(layoutInflater)
+  }
 
-    override fun initView() {
-        viewBinding.rvLifeAccount.layoutManager = LinearLayoutManager(context)
-        viewBinding.rvLifeAccount.adapter = MerchantSwitchAdapter(curLifeAccountId, data, this)
-    }
+  override fun initView() {
+    viewBinding.rvLifeAccount.layoutManager = LinearLayoutManager(context)
+    viewBinding.rvLifeAccount.adapter = MerchantSwitchAdapter(curLifeAccountId, data, this)
+  }
 
-    override fun initListener() {
-        viewBinding.root.setOnClickListener(this)
-    }
+  override fun initListener() {
+    viewBinding.root.setOnClickListener(this)
+  }
 
-    override fun onItemClick(view: View, position: Int, data: LifeAccountItemBean.Response) {
-        // 选择某个生活号 弹窗消失
-        callback?.onLifeAccountSelect(data)
-        dismiss()
-    }
+  override fun onItemClick(view: View, position: Int, data: LifeAccountItemBean.Response) {
+    // 选择某个生活号 弹窗消失
+    callback?.onLifeAccountSelect(data)
+    // 更新当前生活号id
+    StorageUtil.putLifeAccountId(data.life_account_id)
+    dismiss()
+  }
 
-    override fun show() {
-        super.show()
-        window?.setGravity(Gravity.TOP)
-        val params = window?.attributes
-        params?.width = WindowManager.LayoutParams.MATCH_PARENT
-        params?.height = DensityUtil.getScreenHeight() - DensityUtil.dp2px(42f)
-        params?.y = DensityUtil.dp2px(42f)
-        window?.attributes = params
-    }
+  override fun show() {
+    super.show()
+    window?.setGravity(Gravity.TOP)
+    val params = window?.attributes
+    params?.width = WindowManager.LayoutParams.MATCH_PARENT
+    params?.height = DensityUtil.getScreenHeight() - DensityUtil.dp2px(42f)
+    params?.y = DensityUtil.dp2px(42f)
+    window?.attributes = params
+  }
 
-    override fun onClick(v: View?) {
-        dismiss()
-    }
+  override fun onClick(v: View?) {
+    dismiss()
+  }
 
-    interface OnMerchantSwitchCallback {
-        /**
-         * 选择某个生活号
-         * @param data 生活号信息
-         */
-        fun onLifeAccountSelect(data: LifeAccountItemBean.Response)
-    }
-}
\ No newline at end of file
+  interface OnMerchantSwitchCallback {
+    /**
+     * 选择某个生活号
+     * @param data 生活号信息
+     */
+    fun onLifeAccountSelect(data: LifeAccountItemBean.Response)
+  }
+}

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

+package com.yidian.shenghuoquan.newscontent.utils
+
+import com.orhanobut.hawk.Hawk
+import com.yidian.common.HawkConfig
+
+/**
+ * author: yinjiacheng
+ * date: 6/17/21 4:16 PM
+ * description: 统一管理Hawk存储
+ */
+object StorageUtil {
+
+  /**
+   * 存储生活号id
+   */
+  fun putLifeAccountId(lifeAccountId: String?) {
+    Hawk.put(HawkConfig.LifeAccountId, lifeAccountId ?: "")
+  }
+
+  /**
+   * 获取生活号id
+   */
+  fun getLifeAccountId(): String {
+    return Hawk.get(HawkConfig.LifeAccountId, "")
+  }
+}