update 个人认证成功页、企业认证提交成功页、生活号创建成功页

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

@@ -24,7 +24,7 @@ class XRouterPathConstants {
     const val LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE = "/lifeAccountPersonalAuthComplete"
     const val LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE = "/lifeAccountEnterpriseAuthComplete"
     const val LIFE_ACCOUNT_ENTERPRISE_AUTH = "/lifeAccountEnterpriseAuth"
-    const val LIFE_NUMBER = "/lifeNumberActivity"
+    const val LIFE_ACCOUNT_CREATE_COMPLETE = "/lifeAccountCreateComplete"
     // 选择职业标签
     const val CHOOSE_CAREER = "/chooseCareerActivity"
 

Components/newscontent/src/main/AndroidManifest.xml

@@ -50,7 +50,7 @@
             android:name=".ui.auth.LifeAccountPersonalAuthCompleteActivity"
             android:theme="@style/Transparent" />
         <activity
-            android:name=".ui.auth.LifeNumberActivity"
+            android:name=".ui.auth.LifeAccountCreateCompleteActivity"
             android:theme="@style/Transparent" />
         <activity
             android:name=".ui.idcard.IDCardResultActivity"

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt

@@ -8,6 +8,7 @@ import com.yidian.common.XRouterPathConstants.Companion.GALLERY
 import com.yidian.common.XRouterPathConstants.Companion.ID_CARD_TEST
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_AUTH
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE
+import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_CREATE_COMPLETE
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_AUTH
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_AUTH_COMPLETE
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_ENTERPRISE_CERTIFICATION
@@ -15,7 +16,6 @@ import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_IDENTITY
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_MODIFY_NAME
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH
 import com.yidian.common.XRouterPathConstants.Companion.LIFE_ACCOUNT_PERSONAL_AUTH_COMPLETE
-import com.yidian.common.XRouterPathConstants.Companion.LIFE_NUMBER
 import com.yidian.common.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
 import com.yidian.common.XRouterPathConstants.Companion.MERCHANT_AUTH_INFO
 import com.yidian.common.XRouterPathConstants.Companion.MERCHANT_CENTER
@@ -212,13 +212,13 @@ class NewsContentApplication : YdBaseApplication() {
           }
         }),
 
-        XPageNode(LIFE_NUMBER, XPageNodePageType.NATIVE, object : XPageHandler {
+        XPageNode(LIFE_ACCOUNT_CREATE_COMPLETE, XPageNodePageType.NATIVE, object : XPageHandler {
           override fun handler(params: Map<String, Any?>?) {
             val intent = Intent()
             if (params != null) {
               intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
             }
-            intent.setClass(context, LifeNumberActivity::class.java)
+            intent.setClass(context, LifeAccountCreateCompleteActivity::class.java)
             intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
             context.startActivity(intent)
           }

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

@@ -131,10 +131,10 @@ class LifeAccountCreateActivity : BaseActivity<ActivityLifeAccountCreateBinding>
     //创建生活号的回调
     if (result) {
       XPageManager.push(
-        XRouterPathConstants.LIFE_NUMBER,
+        XRouterPathConstants.LIFE_ACCOUNT_CREATE_COMPLETE,
         hashMapOf(
-          Pair(LifeNumberActivity.EXTRA_LIFE_ACCOUNT_NAME, lifeAccountName),
-          Pair(LifeNumberActivity.EXTRA_LIFE_ACCOUNT_ID, lifeAccountId)
+          Pair(LifeAccountCreateCompleteActivity.EXTRA_LIFE_ACCOUNT_NAME, lifeAccountName),
+          Pair(LifeAccountCreateCompleteActivity.EXTRA_LIFE_ACCOUNT_ID, lifeAccountId)
         )
       )
     } else {

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeNumberActivity.kt → Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountCreateCompleteActivity.kt

 package com.yidian.shenghuoquan.newscontent.ui.auth
 
 import android.os.Bundle
-import androidx.core.view.isVisible
+import android.view.View
 import com.orhanobut.hawk.Hawk
 import com.yidian.common.HawkConfig
 import com.yidian.common.XRouterPathConstants
-import com.yidian.common.XRouterPathConstants.Companion.LIFE_NUMBER
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
-import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeNumberBinding
+import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountCreateCompleteBinding
 import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.callback.IGetLifeAccountListCallback
 import com.yidian.shenghuoquan.newscontent.http.httpbean.LifeAccountItemBean
 import com.yidian.shenghuoquan.newscontent.ui.center.MerchantCenterActivity
 import com.yidian.xpage.XPageManager
-import kotlinx.android.synthetic.main.top_bar.view.*
 
 /**
- * Author: houzhenpu
- * Date: 2021/5/26 15:44 PM
- * Describe:  activity_enterprise_certification  创建生活号
+ * author: yinjiacheng
+ * date: 6/17/21 00:31 AM
+ * description: 生活号创建成功
  */
-class LifeNumberActivity : BaseActivity<ActivityLifeNumberBinding>(), IGetLifeAccountListCallback {
+class LifeAccountCreateCompleteActivity : BaseActivity<ActivityLifeAccountCreateCompleteBinding>(), IGetLifeAccountListCallback,
+  View.OnClickListener {
 
   companion object {
-    private const val TAG = "LifeNumberActivity"
     const val EXTRA_LIFE_ACCOUNT_NAME = "live_account_name"
     const val EXTRA_LIFE_ACCOUNT_ID = "life_account_id"
   }
 
-  override fun createViewBinding(): ActivityLifeNumberBinding {
-    return ActivityLifeNumberBinding.inflate(layoutInflater)
+  override fun createViewBinding(): ActivityLifeAccountCreateCompleteBinding {
+    return ActivityLifeAccountCreateCompleteBinding.inflate(layoutInflater)
   }
 
   override fun getXPageName(): String {
-    return LIFE_NUMBER
+    return XRouterPathConstants.LIFE_ACCOUNT_CREATE_COMPLETE
   }
 
-  private var managerName: String? = null
-  private var phoneNumber: String? = null
-  private var lifeAccountName: String? = null
-  private var lifeAccountId: String? = null
+  /**
+   * 由生活号创建页传递的参数
+   */
+  private val params by lazy {
+    intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let {
+      it as HashMap<*, *>
+    }
+  }
 
   override fun init(savedInstanceState: Bundle?) {
     super.init(savedInstanceState)
-    viewBind.root.title.text = resources.getString(R.string.create_a_life_number)
-    viewBind.root.back.isVisible = false
+    initView()
     initListener()
     initData()
   }
 
-  private fun initData() {
-    val params = intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let {
-      it as HashMap<*, *>
-    } ?: return
-    lifeAccountName = params[EXTRA_LIFE_ACCOUNT_NAME] as String? ?: ""
-    lifeAccountId = params[EXTRA_LIFE_ACCOUNT_ID] as String
-    managerName = Hawk.get<String>(HawkConfig.Nickname) ?: ""
-    phoneNumber = Hawk.get<String>(HawkConfig.Mobile) ?: ""
-    showData()
+  private fun initView() {
+    // 此页面不可返回
+    viewBind.bvTopBar.setBackVisibility(false)
   }
 
-  private fun showData() {
-    viewBind.personalShop.text = lifeAccountName
-    viewBind.occupationLabelValue.text = managerName
-    viewBind.actualNameValue.text = phoneNumber
+  private fun initData() {
+    viewBind.ivMerchantInfo.fillAuthInfo(
+      params?.get(EXTRA_LIFE_ACCOUNT_NAME)?.let { it as String },
+      Hawk.get(HawkConfig.Nickname, ""),
+      Hawk.get(HawkConfig.Mobile, "")
+    )
   }
 
   private fun initListener() {
-    viewBind.root.back.setOnClickListener {
-      XPageManager.pop(null)
-    }
-    viewBind.tvEnterMerchantCenter.setOnClickListener {
-      // 跳转商户管理中心 先请求生活号列表 带参跳转
-      ApiService.getLifeAccountList(this)
-    }
+    viewBind.tvEnterMerchantCenter.setOnClickListener(this)
   }
 
   override fun getLifeAccountListSuccess(result: ArrayList<LifeAccountItemBean.Response>?) {
     // 生活号列表请求成功
+    val curLifeAccountId = params?.get(EXTRA_LIFE_ACCOUNT_ID)?.let { it as String }
     result?.forEach {
-      if (it.life_account_id == lifeAccountId) {
+      if (it.life_account_id == curLifeAccountId) {
         XPageManager.push(
           XRouterPathConstants.MERCHANT_CENTER,
           hashMapOf(
@@ -97,4 +89,11 @@ class LifeNumberActivity : BaseActivity<ActivityLifeNumberBinding>(), IGetLifeAc
 
   }
 
+  override fun onClick(v: View?) {
+    if (v?.id == R.id.tv_enter_merchant_center) {
+      // 跳转商户管理中心 先请求生活号列表 带参跳转
+      ApiService.getLifeAccountList(this)
+    }
+  }
+
 }

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

@@ -38,7 +38,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
     companion object {
 
         // 生活号id 个人生活号主动升级企业生活号的认证流程传入
-        const val EXTRA_LIFE_ACCOUNT_ID = "lifeAccountId"
+        const val EXTRA_LIFE_ACCOUNT_ID = "life_account_id"
 
         // 认证数据
         const val EXTRA_AUTH_DATA = "authData"
@@ -312,7 +312,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
                     LifeAccountAuthDataManager.personalAuthData.idCardNum
                 ),
                 Pair(
-                    LifeAccountEnterpriseAuthCompleteActivity.LIFE_ACCOUNT_ID,
+                    LifeAccountEnterpriseAuthCompleteActivity.EXTRA_LIFE_ACCOUNT_ID,
                     result?.life_account_id
                 )
             )
@@ -350,7 +350,7 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
                     LifeAccountAuthDataManager.personalAuthData.idCardNum
                 ),
                 Pair(
-                    LifeAccountEnterpriseAuthCompleteActivity.LIFE_ACCOUNT_ID,
+                    LifeAccountEnterpriseAuthCompleteActivity.EXTRA_LIFE_ACCOUNT_ID,
                     result?.life_account_id
                 )
             )

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

 package com.yidian.shenghuoquan.newscontent.ui.auth
 
 import android.os.Bundle
-import androidx.core.view.isVisible
+import android.view.View
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
+import com.yidian.shenghuoquan.newscontent.constant.Constant
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountEnterpriseAuthCompleteBinding
 import com.yidian.shenghuoquan.newscontent.utils.SensitiveInfoUtil
 import com.yidian.xpage.XPageManager
 
 /**
- * Author: houzhenpu
- * Date: 2021/5/26 10:44 AM
- * Describe:  activity_life_account_enterprise_auth_complete  企业认证成功页面
+ * author: yinjiacheng
+ * date: 6/16/21 11:36 PM
+ * description: 生活号企业认证提交成功页面
  */
 class LifeAccountEnterpriseAuthCompleteActivity :
-    BaseActivity<ActivityLifeAccountEnterpriseAuthCompleteBinding>() {
+  BaseActivity<ActivityLifeAccountEnterpriseAuthCompleteBinding>(), View.OnClickListener {
 
   companion object {
     const val REGISTRATION_NAME = "registrationName"
     const val REGISTRATION_CODE = "registrationCode"
     const val ID_CARD_NAME = "idCardName"
     const val ID_CARD_NUM = "idCardNum"
-        const val LIFE_ACCOUNT_ID = "lifeAccountId"
+    const val EXTRA_LIFE_ACCOUNT_ID = "life_account_id"
   }
 
   /**
-     * 跳转参数
+   * 由企业认证页传递的参数
    */
-    private val params by lazy { intent.getSerializableExtra(XRouterPathConstants.ParamsKey) as HashMap<*, *> }
+  private val params by lazy {
+    intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let {
+      it as HashMap<*, *>
+    }
+  }
 
   override fun createViewBinding(): ActivityLifeAccountEnterpriseAuthCompleteBinding {
     return ActivityLifeAccountEnterpriseAuthCompleteBinding.inflate(layoutInflater)
@@ -46,28 +51,38 @@ class LifeAccountEnterpriseAuthCompleteActivity :
   }
 
   private fun initView() {
-        viewBind.viewCommonHeader.tvTitle.text = resources.getString(R.string.enterprise_auth)
-        viewBind.viewCommonHeader.ivBack.isVisible = false
+    // 此页面不可返回
+    viewBind.bvTopBar.setBackVisibility(false)
   }
 
   private fun initListener() {
-        viewBind.createLifeAccount.setOnClickListener {
+    viewBind.tvCreateLifeAccount.setOnClickListener(this)
+  }
+
+  private fun initData() {
+    viewBind.ivEnterpriseAuthInfo.fillAuthInfo(
+      -1,
+      Constant.STATUS_AUDIT_UNDER,
+      params?.get(REGISTRATION_NAME)?.let { it as String },
+      params?.get(REGISTRATION_CODE)
+        ?.let { it as String },
+      params?.get(ID_CARD_NAME)?.let { it as String },
+      SensitiveInfoUtil.idCardNumEncrypt(params?.get(ID_CARD_NUM)?.let { it as String } ?: "")
+    )
+  }
+
+  override fun onClick(v: View?) {
+    if (v?.id == R.id.tv_create_life_account) {
+      // 跳转创建生活号页面
       XPageManager.push(
         XRouterPathConstants.LIFE_ACCOUNT_CREATE,
         hashMapOf(
           Pair(
             LifeAccountCreateActivity.LIFE_ACCOUNT_ID,
-                        params[LIFE_ACCOUNT_ID]
+            params?.get(EXTRA_LIFE_ACCOUNT_ID)
           )
         )
       )
     }
   }
-
-    private fun initData() {
-        viewBind.companyName.text = params[REGISTRATION_NAME] as String
-        viewBind.creditCode.text = params[REGISTRATION_CODE] as String
-        viewBind.operatorInformation.text =
-            "${params[ID_CARD_NAME]} ${SensitiveInfoUtil.idCardNumEncrypt(params[ID_CARD_NUM] as String)}"
-    }
 }

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

@@ -177,7 +177,7 @@ class LifeAccountPersonalAuthActivity :
           LifeAccountAuthDataManager.personalAuthData.idCardNum
         ),
         Pair(
-          LifeAccountPersonalAuthCompleteActivity.LIFE_ACCOUNT_ID,
+          LifeAccountPersonalAuthCompleteActivity.EXTRA_LIFE_ACCOUNT_ID,
           result?.life_account_id
         )
       )

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

 package com.yidian.shenghuoquan.newscontent.ui.auth
 
 import android.os.Bundle
-import androidx.core.view.isVisible
+import android.view.View
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.R
@@ -13,25 +13,29 @@ import com.yidian.shenghuoquan.newscontent.ui.center.MerchantCenterActivity
 import com.yidian.xpage.XPageManager
 
 /**
- * Author: houzhenpu
- * Date: 2021/5/26 15:44 PM
- * Describe: 个人认证成功页面 activity_life_account_personal_auth_complete
+ * author: yinjiacheng
+ * date: 6/16/21 11:04 PM
+ * description: 生活号个人认证成功页面
  */
 class LifeAccountPersonalAuthCompleteActivity :
-  BaseActivity<ActivityLifeAccountPersonalAuthCompleteBinding>(), IGetLifeAccountListCallback {
+  BaseActivity<ActivityLifeAccountPersonalAuthCompleteBinding>(), IGetLifeAccountListCallback, View.OnClickListener {
 
   companion object {
     const val OCCUPATION = "occupation"
     const val REAL_NAME = "realName"
     const val ID_CARD_NUM = "idCardNum"
     const val PHONE_NUM = "phoneNum"
-    const val LIFE_ACCOUNT_ID = "lifeAccountId" // 个人生活号升级用
+    const val EXTRA_LIFE_ACCOUNT_ID = "life_account_id" // 个人生活号升级用
   }
 
   /**
-   * 跳转参数
+   * 由个人认证页传递的参数
    */
-  private val params by lazy { intent.getSerializableExtra(XRouterPathConstants.ParamsKey) as HashMap<*, *> }
+  private val params by lazy {
+    intent.getSerializableExtra(XRouterPathConstants.ParamsKey)?.let {
+      it as HashMap<*, *>
+    }
+  }
 
   override fun createViewBinding(): ActivityLifeAccountPersonalAuthCompleteBinding {
     return ActivityLifeAccountPersonalAuthCompleteBinding.inflate(layoutInflater)
@@ -48,44 +52,28 @@ class LifeAccountPersonalAuthCompleteActivity :
   }
 
   private fun initView() {
-    viewBind.viewCommonHeader.tvTitle.text =
-      resources.getString(R.string.personal_auth)
-    viewBind.viewCommonHeader.ivBack.isVisible = false
+    // 此页面不可返回
+    viewBind.bvTopBar.setBackVisibility(false)
   }
 
   private fun initData() {
     viewBind.ivPersonAuthInfo.fillAuthInfo(
-      params[OCCUPATION] as String,
-      params[REAL_NAME] as String,
-      params[ID_CARD_NUM] as String,
-      params[PHONE_NUM] as String
+      params?.get(OCCUPATION)?.let { it as String },
+      params?.get(REAL_NAME)?.let { it as String },
+      params?.get(ID_CARD_NUM)?.let { it as String },
+      params?.get(PHONE_NUM)?.let { it as String }
     )
   }
 
   private fun initListener() {
-    viewBind.tvEnterMerchantCenter.setOnClickListener {
-      // 跳转商户管理中心 先请求生活号列表 带参跳转
-      ApiService.getLifeAccountList(this)
-    }
-    viewBind.upgradeEnterpriseAuth.setOnClickListener {
-      // 传入生活号id 请求企业认证升级相关接口用
-      XPageManager.push(
-        XRouterPathConstants.LIFE_ACCOUNT_ENTERPRISE_AUTH,
-        hashMapOf(
-          Pair(
-            LifeAccountEnterpriseAuthActivity.EXTRA_LIFE_ACCOUNT_ID,
-            params[LIFE_ACCOUNT_ID]
-          )
-        )
-      )
-      XPageManager.pop(null)
-    }
+    viewBind.tvEnterMerchantCenter.setOnClickListener(this)
+    viewBind.tvUpgradeEnterpriseAuth.setOnClickListener(this)
   }
 
   override fun getLifeAccountListSuccess(result: ArrayList<LifeAccountItemBean.Response>?) {
-    // 生活号列表请求成功
+    // 生活号列表请求成功 跳转商户管理中心
     result?.forEach {
-      if (it.life_account_id == params[LIFE_ACCOUNT_ID]) {
+      if (it.life_account_id == params?.get(EXTRA_LIFE_ACCOUNT_ID)) {
         XPageManager.push(
           XRouterPathConstants.MERCHANT_CENTER,
           hashMapOf(
@@ -101,4 +89,22 @@ class LifeAccountPersonalAuthCompleteActivity :
   override fun getLifeAccountListFailure(message: String?) {
 
   }
+
+  override fun onClick(v: View?) {
+    if (v?.id == R.id.tv_enter_merchant_center) {
+      // 跳转商户管理中心 先请求生活号列表 带参跳转
+      ApiService.getLifeAccountList(this)
+    } else if (v?.id == R.id.tv_upgrade_enterprise_auth) {
+      // 传入生活号id 请求企业认证升级相关接口用
+      XPageManager.push(
+        XRouterPathConstants.LIFE_ACCOUNT_ENTERPRISE_AUTH,
+        hashMapOf(
+          Pair(
+            LifeAccountEnterpriseAuthActivity.EXTRA_LIFE_ACCOUNT_ID,
+            params?.get(EXTRA_LIFE_ACCOUNT_ID)
+          )
+        )
+      )
+    }
+  }
 }

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

@@ -68,6 +68,12 @@ class LifeAccountEnterpriseAuthInfoView @JvmOverloads constructor(
         viewBinding.tvAuthType.text = resources.getText(R.string.enterprise_auth)
         viewBinding.tvTitleManagerInfo.text = resources.getText(R.string.legal_person_info)
       }
+      else -> {
+        // 不区分
+        viewBinding.tvAuthType.text = resources.getText(R.string.enterprise_auth)
+        viewBinding.tvTitleManagerInfo.text =
+          resources.getText(R.string.operator_information)
+      }
     }
     when (auditStatus) {
       Constant.STATUS_AUDIT_UNDER -> {

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

+package com.yidian.shenghuoquan.newscontent.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.yidian.shenghuoquan.newscontent.R
+import com.yidian.shenghuoquan.newscontent.databinding.ViewLifeAccountMerchantInfoBinding
+
+/**
+ * author: yinjiacheng
+ * date: 6/17/21 00:10 AM
+ * description: 生活号创建成功-商户信息
+ */
+class LifeAccountMerchantInfoView @JvmOverloads constructor(
+  context: Context,
+  attrs: AttributeSet? = null,
+  defStyle: Int = 0
+) : ConstraintLayout(context, attrs, defStyle) {
+
+  private val viewBinding by lazy {
+    ViewLifeAccountMerchantInfoBinding.bind(
+      View.inflate(
+        getContext(),
+        R.layout.view_life_account_merchant_info,
+        this
+      )
+    )
+  }
+
+  /**
+   * 填充商户信息
+   * @param lifeAccountName 生活号名称
+   * @param manager 管理员
+   * @param phoneNum 手机号
+   */
+  fun fillAuthInfo(lifeAccountName: String?, manager: String?, phoneNum: String?) {
+    viewBinding.tvLifeAccountName.text = lifeAccountName
+    viewBinding.tvContentManager.text = manager
+    viewBinding.tvContentPhoneNumber.text = phoneNum
+  }
+}

Components/newscontent/src/main/res/drawable/shape_stroke2_radius18_skin_primary_1852f1.xml → Components/newscontent/src/main/res/drawable/shape_bg_enter_merchant_center_btn.xml

 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="18dp" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
     <stroke
-        android:color="#1852F1"
-        android:width="2px"/>
-    <solid
-        android:color="@color/transparent"/>
+        android:width="@dimen/dp1"
+        android:color="@color/color_FF1852F1" />
+
+    <corners android:radius="21dp" />
+
 </shape>

Components/newscontent/src/main/res/drawable/shape_bg_enterprise_auth_info_card.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/color_FFFFFFFF" />
+
+    <corners android:radius="@dimen/dp12" />
+
+</shape>
+

Components/newscontent/src/main/res/layout/activity_life_account_create_complete.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/color_FFFFFFFF"
+    android:fitsSystemWindows="true">
+
+    <com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
+        android:id="@+id/bv_top_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:CommonTopBarView_title_text="@string/create_life_account"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_create_success"
+        android:layout_width="@dimen/dp221"
+        android:layout_height="@dimen/dp105"
+        android:background="@mipmap/icon_fireworks"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/bv_top_bar">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp36"
+            android:drawableStart="@mipmap/success_icon"
+            android:drawablePadding="@dimen/dp6"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:text="@string/created_successfully"
+            android:textColor="@color/color_FFF26E3D"
+            android:textSize="@dimen/sp23"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp11"
+            android:includeFontPadding="false"
+            android:text="@string/create_enterprise_life_account_success"
+            android:textColor="@color/color_999999"
+            android:textSize="@dimen/sp15"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <com.yidian.shenghuoquan.newscontent.widget.LifeAccountMerchantInfoView
+        android:id="@+id/iv_merchant_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp31"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/cl_create_success" />
+
+    <TextView
+        android:id="@+id/tv_enter_merchant_center"
+        android:layout_width="@dimen/dp115"
+        android:layout_height="@dimen/dp35"
+        android:layout_marginTop="@dimen/dp31"
+        android:background="@drawable/shape_bg_enter_merchant_center_btn"
+        android:gravity="center"
+        android:text="@string/to_experience"
+        android:textColor="@color/color_FF1852F1"
+        android:textSize="@dimen/sp15"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/iv_merchant_info" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

Components/newscontent/src/main/res/layout/activity_life_account_enterprise_auth_complete.xml

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
-    android:fitsSystemWindows="true"
-    android:gravity="center_horizontal"
-    android:orientation="vertical">
+    android:background="@color/color_FFFFFFFF"
+    android:fitsSystemWindows="true">
 
-    <include
-        android:id="@+id/view_common_header"
-        layout="@layout/layout_common_header"
+    <com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
+        android:id="@+id/bv_top_bar"
         android:layout_width="match_parent"
-        android:layout_height="42dp"
-        android:layout_marginTop="10dp" />
+        android:layout_height="wrap_content"
+        app:CommonTopBarView_title_text="@string/enterprise_auth"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
+        android:id="@+id/tv_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="38dp"
+        android:layout_marginTop="@dimen/dp36"
         android:drawableStart="@mipmap/success_icon"
-        android:drawablePadding="6dp"
-        android:gravity="center"
+        android:drawablePadding="@dimen/dp6"
+        android:includeFontPadding="false"
         android:text="@string/submitted_successfully"
-        android:textColor="#FFF26E3D"
-        android:textSize="24sp" />
+        android:textColor="@color/color_FFF26E3D"
+        android:textSize="@dimen/sp23"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/bv_top_bar" />
 
     <TextView
-        android:layout_width="240dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:gravity="center"
-        android:text="@string/mobile_phone_number_notification_information"
-        android:textColor="#FF999999"
-        android:textSize="16sp" />
-
-    <LinearLayout
+        android:id="@+id/tv_sub_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="25dp"
-        android:layout_marginTop="25dp"
-        android:layout_marginEnd="25dp"
-        android:background="@mipmap/enterprise_certification_bg"
-        android:orientation="vertical"
-        android:paddingStart="30dp"
-        android:paddingBottom="30dp">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="40dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="10dp"
-                android:gravity="left"
-                android:text="@string/enterprise_certification"
-                android:textColor="#FF333333"
-                android:textSize="24sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/shape_solid_radius9_da3838"
+        android:layout_marginTop="@dimen/dp4"
         android:gravity="center"
-                android:paddingLeft="6dp"
-                android:paddingTop="2dp"
-                android:paddingRight="6dp"
-                android:paddingBottom="2dp"
-                android:text="@string/pending_review"
-                android:textColor="#FFF26E3D"
-                android:textSize="14sp" />
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="left"
-            android:text="@string/company_name"
-            android:textColor="#FF999999"
-            android:textSize="16sp" />
-
-        <TextView
-            android:id="@+id/company_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:gravity="left"
-            android:text="北京一点网聚科技有限公司"
-            android:textColor="#FF333333"
-            android:textSize="16sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="left"
-            android:text="@string/credit_code"
-            android:textColor="#FF999999"
-            android:textSize="16sp" />
-
-        <TextView
-            android:id="@+id/credit_code"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:gravity="left"
-            android:text="WD1212312223331"
-            android:textColor="#FF333333"
-            android:textSize="16sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:gravity="left"
-            android:text="@string/operator_information"
-            android:textColor="#FF999999"
-            android:textSize="16sp" />
-
-        <TextView
-            android:id="@+id/operator_information"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:gravity="left"
-            android:text="兰花花 120803********0660"
-            android:textColor="#FF333333"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
+        android:includeFontPadding="false"
+        android:paddingStart="@dimen/dp65"
+        android:paddingEnd="@dimen/dp65"
+        android:text="@string/mobile_phone_number_notification_information"
+        android:textColor="@color/color_999999"
+        android:textSize="@dimen/sp15"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_content" />
+
+    <com.yidian.shenghuoquan.newscontent.widget.LifeAccountEnterpriseAuthInfoView
+        android:id="@+id/iv_enterprise_auth_info"
+        android:layout_width="@dimen/dp302"
+        android:layout_height="@dimen/dp284"
+        android:layout_marginTop="@dimen/dp31"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_sub_content" />
 
     <TextView
-        android:id="@+id/create_life_account"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:background="@drawable/shape_stroke2_radius18_skin_primary_1852f1"
+        android:id="@+id/tv_create_life_account"
+        android:layout_width="@dimen/dp115"
+        android:layout_height="@dimen/dp35"
+        android:layout_marginTop="@dimen/dp31"
+        android:background="@drawable/shape_bg_enter_merchant_center_btn"
         android:gravity="center"
-        android:paddingLeft="20dp"
-        android:paddingTop="7dp"
-        android:paddingRight="20dp"
-        android:paddingBottom="7dp"
-        android:text="@string/create_a_life_number"
-        android:textColor="#1852F1"
-        android:textSize="16sp" />
-
-</LinearLayout>
+        android:text="@string/create_life_account"
+        android:textColor="@color/color_FF1852F1"
+        android:textSize="@dimen/sp15"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/iv_enterprise_auth_info" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file

Components/newscontent/src/main/res/layout/activity_life_account_personal_auth_complete.xml

 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/color_FFFFFFFF"
     android:fitsSystemWindows="true">
 
-    <include
-        android:id="@+id/view_common_header"
-        layout="@layout/layout_common_header"
+    <com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
+        android:id="@+id/bv_top_bar"
         android:layout_width="match_parent"
-        android:layout_height="42dp"
-        android:layout_marginTop="10dp" />
-
-    <LinearLayout
-        android:id="@+id/created_successfully_root"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/view_common_header"
-        android:layout_centerHorizontal="true"
+        app:CommonTopBarView_title_text="@string/personal_auth"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_create_success"
+        android:layout_width="@dimen/dp211"
+        android:layout_height="@dimen/dp94"
         android:background="@mipmap/icon_fireworks"
-        android:gravity="center_horizontal"
-        android:orientation="vertical">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/bv_top_bar">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="38dp"
+            android:layout_marginTop="@dimen/dp36"
             android:drawableStart="@mipmap/success_icon"
-            android:drawablePadding="6dp"
+            android:drawablePadding="@dimen/dp6"
             android:gravity="center"
+            android:includeFontPadding="false"
             android:text="@string/created_successfully"
-            android:textColor="#FFF26E3D"
-            android:textSize="24sp" />
+            android:textColor="@color/color_FFF26E3D"
+            android:textSize="@dimen/sp23"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:layout_width="240dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:gravity="center"
-            android:text="@string/activate_a_personal_life_account"
-            android:textColor="#FF999999"
-            android:textSize="16sp" />
-    </LinearLayout>
+            android:includeFontPadding="false"
+            android:text="@string/create_personal_life_account_success"
+            android:textColor="@color/color_999999"
+            android:textSize="@dimen/sp15"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.yidian.shenghuoquan.newscontent.widget.LifeAccountPersonalAuthInfoView
         android:id="@+id/iv_person_auth_info"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/created_successfully_root"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/dp20" />
+        android:layout_marginTop="@dimen/dp20"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/cl_create_success" />
 
     <TextView
         android:id="@+id/tv_enter_merchant_center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/iv_person_auth_info"
-        android:layout_centerHorizontal="true"
+        android:layout_width="@dimen/dp115"
+        android:layout_height="@dimen/dp35"
         android:layout_marginTop="@dimen/dp31"
-        android:background="@drawable/shape_stroke2_radius18_skin_primary_1852f1"
+        android:background="@drawable/shape_bg_enter_merchant_center_btn"
         android:gravity="center"
-        android:paddingLeft="20dp"
-        android:paddingTop="4dp"
-        android:paddingRight="20dp"
-        android:paddingBottom="7dp"
         android:text="@string/to_experience"
-        android:textColor="#1852F1"
-        android:textSize="16sp" />
+        android:textColor="@color/color_FF1852F1"
+        android:textSize="@dimen/sp15"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/iv_person_auth_info" />
 
     <TextView
-        android:id="@+id/upgrade_enterprise_auth"
-        android:layout_width="match_parent"
-        android:layout_height="44dp"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="30dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginRight="30dp"
-        android:layout_marginBottom="34dp"
+        android:id="@+id/tv_upgrade_enterprise_auth"
+        android:layout_width="@dimen/dp302"
+        android:layout_height="@dimen/dp42"
+        android:layout_marginBottom="@dimen/dp33"
         android:background="@drawable/account_btn_gradient_bg"
         android:gravity="center"
-        android:paddingTop="7dp"
-        android:paddingBottom="7dp"
         android:text="@string/turn_on_enterprise_certification"
-        android:textColor="#FFFFFF"
-        android:textSize="18sp" />
+        android:textColor="@color/color_FFFFFFFF"
+        android:textSize="@dimen/sp17"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@id/upgrade_enterprise_auth"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="30dp"
-        android:layout_marginRight="30dp"
-        android:gravity="left"
+        android:layout_marginBottom="@dimen/dp19"
+        android:paddingStart="@dimen/dp29"
+        android:paddingEnd="@dimen/dp29"
         android:text="@string/personal_authentication_tips"
-        android:textColor="#FF999999"
-        android:textSize="12sp" />
-</RelativeLayout>
+        android:textColor="@color/color_999999"
+        android:textSize="@dimen/sp12"
+        app:layout_constraintBottom_toTopOf="@id/tv_upgrade_enterprise_auth" />
\ No newline at end of file
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

Components/newscontent/src/main/res/layout/activity_life_number.xml

-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:background="@color/white">
-
-    <include
-        android:id="@+id/top"
-        layout="@layout/top_bar" />
-
-    <LinearLayout
-        android:id="@+id/created_successfully_root"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@id/top"
-        android:gravity="center_horizontal"
-        android:background="@mipmap/icon_fireworks">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="38dp"
-            android:gravity="center"
-            android:text="@string/created_successfully"
-            android:drawablePadding="6dp"
-            android:drawableStart="@mipmap/success_icon"
-            android:textColor="#FFF26E3D"
-            android:textSize="24sp" />
-
-        <TextView
-            android:layout_width="240dp"
-            android:layout_height="wrap_content"
-            android:text="@string/activate_a_personal_life_account"
-            android:textSize="16sp"
-            android:textColor="#FF999999"
-            android:layout_marginTop="4dp"
-            android:gravity="center" />
-    </LinearLayout>
-
-
-    <View
-        android:id="@+id/icon_shop_root"
-        android:layout_below="@id/created_successfully_root"
-        android:layout_width="wrap_content"
-        android:layout_height="56dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="25dp"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:background="@mipmap/icon_shop"/>
-
-    <RelativeLayout
-        android:id="@+id/information"
-        android:layout_below="@id/icon_shop_root"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="25dp"
-        android:layout_marginStart="25dp"
-        android:paddingStart="30dp"
-        android:paddingBottom="45dp"
-        android:layout_centerHorizontal="true"
-        android:background="@drawable/personal_authentication_bg">
-
-        <TextView
-            android:id="@+id/personal_shop"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/recruitment_life_number"
-            android:textSize="24sp"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="25dp"
-            android:textColor="#FF333333"
-            android:layout_marginRight="10dp"
-            android:gravity="left" />
-
-        <LinearLayout
-            android:id="@+id/column_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_below="@id/personal_shop"
-            android:layout_marginTop="23dp"
-            android:layout_marginEnd="12dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/occupation_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/administrator"
-                android:textSize="16sp"
-                android:textColor="#FF999999"
-                android:gravity="left" />
-
-            <TextView
-                android:id="@+id/actual_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/phone_number"
-                android:layout_marginTop="20dp"
-                android:textSize="16sp"
-                android:textColor="#FF999999"
-                android:gravity="left" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_below="@id/personal_shop"
-            android:layout_toRightOf="@id/column_name"
-            android:layout_marginTop="23dp"
-            android:layout_marginEnd="12dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/occupation_label_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/occupation_label"
-                android:textSize="16sp"
-                android:textColor="#333333"
-                android:gravity="left" />
-
-            <TextView
-                android:id="@+id/actual_name_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/occupation_label"
-                android:layout_marginTop="20dp"
-                android:textSize="16sp"
-                android:textColor="#333333"
-                android:gravity="left" />
-
-        </LinearLayout>
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_alignParentEnd="true"
-            android:src="@mipmap/icon_seal"/>
-    </RelativeLayout>
-
-    <TextView
-        android:id="@+id/tv_enter_merchant_center"
-        android:layout_below="@id/information"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/to_experience"
-        android:textSize="16sp"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="7dp"
-        android:layout_marginTop="10dp"
-        android:layout_centerHorizontal="true"
-        android:textColor="#1852F1"
-        android:background="@drawable/shape_stroke2_radius18_skin_primary_1852f1"
-        android:gravity="center" />
-
-</RelativeLayout>
\ No newline at end of file

Components/newscontent/src/main/res/layout/view_life_account_merchant_info.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="@dimen/dp283"
+        android:layout_height="@dimen/dp174"
+        android:layout_marginTop="@dimen/dp32"
+        android:background="@drawable/shape_bg_merchant_info"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/tv_life_account_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp19"
+            android:layout_marginTop="@dimen/dp38"
+            android:includeFontPadding="false"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp23"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_title_manager"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp19"
+            android:includeFontPadding="false"
+            android:text="@string/manager"
+            android:textColor="@color/color_999999"
+            android:textSize="@dimen/sp15"
+            app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
+            app:layout_constraintTop_toBottomOf="@id/tv_life_account_name" />
+
+        <TextView
+            android:id="@+id/tv_content_manager"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp92"
+            android:layout_marginTop="@dimen/dp19"
+            android:includeFontPadding="false"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp15"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_life_account_name" />
+
+        <TextView
+            android:id="@+id/tv_title_phone_number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp19"
+            android:includeFontPadding="false"
+            android:text="@string/phone_number"
+            android:textColor="@color/color_999999"
+            android:textSize="@dimen/sp15"
+            app:layout_constraintStart_toStartOf="@id/tv_life_account_name"
+            app:layout_constraintTop_toBottomOf="@id/tv_title_manager" />
+
+        <TextView
+            android:id="@+id/tv_content_phone_number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp92"
+            android:layout_marginTop="@dimen/dp19"
+            android:includeFontPadding="false"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp15"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title_manager" />
+
+        <View
+            android:layout_width="@dimen/dp49"
+            android:layout_height="@dimen/dp58"
+            android:layout_marginTop="@dimen/dp36"
+            android:layout_marginEnd="@dimen/dp1"
+            android:background="@mipmap/icon_seal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <View
+        android:id="@+id/view_top"
+        android:layout_width="@dimen/dp322"
+        android:layout_height="@dimen/dp54"
+        android:background="@mipmap/icon_shop"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -62,10 +62,11 @@
     <string name="company_name">公司名称</string>
     <string name="credit_code">统一社会信用代码</string>
     <string name="operator_information">经营者信息</string>
-    <string name="create_a_life_number">创建生活号</string>
+    <string name="create_life_account">创建生活号</string>
     <string name="personal_authentication">个人认证</string>
     <string name="created_successfully">创建成功</string>
-    <string name="activate_a_personal_life_account">恭喜成功开通个人生活号</string>
+    <string name="create_personal_life_account_success">恭喜成功开通个人生活号</string>
+    <string name="create_enterprise_life_account_success">恭喜成功开通企业生活号</string>
     <string name="personal_shop">个人小店</string>
     <string name="occupation_label">职业标签</string>
     <string name="actual_name">真实姓名</string>
@@ -74,7 +75,7 @@
     <string name="to_experience">去体验</string>
     <string name="personal_authentication_tips">当前你已完成个人生活号认证，拥有生活号个人小店相关权益，如有个体工商户或企业需求，可通过下放入口升级企业，升级后可点亮V标，同时可进行多个子账号管理，拥有更多企业级权益。</string>
     <string name="turn_on_enterprise_certification">升级为企业认证</string>
-    <string name="administrator">管理员</string>
+    <string name="manager">管理员</string>
     <string name="recruitment_life_number">一点招聘生活号</string>
     <string name="join_life_circle_and_upgrade_to_life_account">加入生活圈升级成为生活号</string>
     <string name="provide_more_and_better_services">为你提供更多更优的服务</string>