update 生活号认证流程首页、生活号个人认证页、生活号企业认证页TopBar

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

@@ -38,9 +38,8 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
   }
 
   private fun initView() {
-    viewBind.layoutCommonHeader.ivBack.visibility = View.GONE
-
-    viewBind.layoutCommonHeader.tvTitle.text = resources.getString(R.string.join_life_circle)
+    // 此页面默认不可返回
+    viewBind.bvTopBar.setBackVisibility(false)
     viewBind.viewPersonalAuth.setData(
       resources.getString(R.string.personal_auth),
       resources.getString(R.string.personal_auth_condition),
@@ -54,15 +53,15 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
     )
     if (intent.getSerializableExtra(XRouterPathConstants.ParamsKey) != null) {
       val paramsMap = intent.getSerializableExtra(XRouterPathConstants.ParamsKey) as HashMap<*, *>
-      var fromTag = paramsMap["from"] as String
+      val fromTag = paramsMap["from"] as String
       if (fromTag == "auth") {
-        viewBind.layoutCommonHeader.ivBack.visibility = View.VISIBLE
+        // 如果由商户基本信息跳转至此页面 则此页面可返回
+        viewBind.bvTopBar.setBackVisibility(true)
       }
     }
   }
 
   private fun initListener() {
-    viewBind.layoutCommonHeader.ivBack.setOnClickListener(this)
     viewBind.tvJoinStrategy.setOnClickListener(this)
     viewBind.viewPersonalAuth.setOnClickListener(this)
     viewBind.viewEnterpriseAuth.setOnClickListener(this)
@@ -70,9 +69,6 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
 
   override fun onClick(v: View?) {
     when (v?.id) {
-      R.id.iv_back -> {
-        XPageManager.pop(null)
-      }
       R.id.tv_join_strategy -> {
         // TODO: 5/26/21 入驻攻略
       }

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.widget.CommonTopBarView
 import com.yidian.shenghuoquan.newscontent.widget.LifeAccountAuthProcessView
 import com.yidian.xpage.XPageManager
 
@@ -33,7 +34,7 @@ import com.yidian.xpage.XPageManager
 class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterpriseAuthBinding>(),
   View.OnClickListener, BottomSelectAdapter.OnItemClickListener<BottomSelectBean>,
   IAuthBusinessLicenseCommitCallback, IAuthEnterpriseLegalIdentityCommitCallback,
-    IAuthIndividualBusinessCompleteCallback {
+  IAuthIndividualBusinessCompleteCallback, CommonTopBarView.OnCommonTopBarBackCallback {
 
   companion object {
 
@@ -94,12 +95,11 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
   }
 
   private fun initView() {
-        viewBind.viewCommonHeader.tvTitle.text = resources.getString(R.string.enterprise_auth)
     viewBind.pvAuthProcess.setProcess(LifeAccountAuthProcessView.PROCESS_ENTERPRISE_QUALIFICATION)
   }
 
   private fun initListener() {
-        viewBind.viewCommonHeader.ivBack.setOnClickListener(this)
+    viewBind.bvTopBar.setOnCommonTopBarCallback(this, null)
     viewBind.svMerchantType.setOnClickListener(this)
     viewBind.btnNext.setOnClickListener(this)
   }
@@ -194,20 +194,6 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
 
   override fun onClick(v: View?) {
     when (v?.id) {
-            R.id.iv_back -> {
-                if (viewBind.pvAuthProcess.curProcess == 0) {
-                    // 当前是第一个fragment 则退出当前activity
-                    XPageManager.pop(null)
-                } else {
-                    viewBind.pvAuthProcess.setProcess(--viewBind.pvAuthProcess.curProcess)
-                    if (viewBind.pvAuthProcess.curProcess == 0) {
-                        viewBind.svMerchantType.enableSelect(true)
-                    }
-                    // 回退fragment
-                    switchFragment(fragmentList[viewBind.pvAuthProcess.curProcess])
-                    checkNextCondition()
-                }
-            }
       R.id.sv_merchant_type -> {
         // 弹出商户类型选择
         BottomSelectDialog(
@@ -364,4 +350,20 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
     )
   }
 
+  override fun onDoBack() {
+    // 返回上一步/上一页
+    if (viewBind.pvAuthProcess.curProcess == 0) {
+      // 当前是第一个fragment 则退出当前activity
+      XPageManager.pop(null)
+    } else {
+      viewBind.pvAuthProcess.setProcess(--viewBind.pvAuthProcess.curProcess)
+      if (viewBind.pvAuthProcess.curProcess == 0) {
+        viewBind.svMerchantType.enableSelect(true)
+      }
+      // 回退fragment
+      switchFragment(fragmentList[viewBind.pvAuthProcess.curProcess])
+      checkNextCondition()
+    }
+  }
+
 }

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

@@ -71,11 +71,10 @@ class LifeAccountPersonalAuthActivity :
   }
 
   private fun initView() {
-    viewBind.viewCommonHeader.tvTitle.text = resources.getString(R.string.personal_auth)
+
   }
 
   private fun initListener() {
-    viewBind.viewCommonHeader.ivBack.setOnClickListener(this)
     viewBind.svOccupation.setOnClickListener(this)
     viewBind.cbProtocol.setOnCheckedChangeListener(this)
     viewBind.btnNext.setOnClickListener(this)
@@ -119,7 +118,6 @@ class LifeAccountPersonalAuthActivity :
 
   override fun onClick(v: View?) {
     when (v?.id) {
-      R.id.iv_back -> XPageManager.pop(null)
       R.id.sv_occupation -> {
         XPageManager.push(XRouterPathConstants.CHOOSE_CAREER, null)
       }

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

@@ -19,7 +19,7 @@ import com.yidian.xpage.XPageManager
  * description: 生活号名称修改
  */
 class LifeAccountModifyNameActivity : BaseActivity<ActivityLifeAccountModifyNameBinding>(),
-    CommonTopBarView.OnCommonTopBarCallback,
+  CommonTopBarView.OnCommonTopBarActionCallback,
   LifeAccountAuthIdentityInfoEditView.OnLifeAccountAuthIdentityInfoEditViewCallback,
   ICreateLifeAccountCallback {
 
@@ -52,7 +52,7 @@ class LifeAccountModifyNameActivity : BaseActivity<ActivityLifeAccountModifyName
   }
 
   private fun initListener() {
-        viewBind.bvTopBar.setOnCommonTopBarCallback(this)
+    viewBind.bvTopBar.setOnCommonTopBarCallback(null, this)
     viewBind.evLifeAccountName.setOnLifeAccountAuthIdentityInfoEditViewCallback(this)
   }
 

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

@@ -33,7 +33,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
   IGetConfigListCallback, IGetLifeAccountListCallback, MerchantSwitchDialog.OnMerchantSwitchCallback,
   LifeAccountLabelView.OnLifeAccountLabelCallback, IGetLifeAccountInfoByIdCallback,
   MerchantCenterBottomHintDialog.OnMerchantCenterBottomHintCallback, IAuthMerchantCheckCallback,
-  MerchantServiceFunctionAdapter.OnItemClickListener, CommonTopBarView.OnCommonTopBarCallback {
+  MerchantServiceFunctionAdapter.OnItemClickListener, CommonTopBarView.OnCommonTopBarActionCallback {
 
   companion object {
     // 传递的生活号信息

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

@@ -30,7 +30,15 @@ class CommonTopBarView @JvmOverloads constructor(
     )
   }
 
-  private var callback: OnCommonTopBarCallback? = null
+  /**
+   * 返回按钮点击回调
+   */
+  private var backCallback: OnCommonTopBarBackCallback? = null
+
+  /**
+   * 操作按钮点击回调
+   */
+  private var actionCallback: OnCommonTopBarActionCallback? = null
 
   init {
     val typeArray = context.obtainStyledAttributes(attrs, R.styleable.CommonTopBarView)
@@ -62,20 +70,36 @@ class CommonTopBarView @JvmOverloads constructor(
 
   override fun onClick(v: View?) {
     if (v?.id == R.id.iv_back) {
-      XPageManager.pop(null)
+      // 若没有设置返回点击回调则默认pop
+      backCallback?.onDoBack() ?: XPageManager.pop(null)
     } else if (v?.id == R.id.tv_action) {
-      callback?.onDoAction()
+      actionCallback?.onDoAction()
     }
   }
 
-  fun setOnCommonTopBarCallback(callback: OnCommonTopBarCallback) {
-    this.callback = callback
+  /**
+   * 设置回调
+   * @param backCallback 返回按钮点击回调
+   * @param actionCallback 操作按钮点击回调
+   */
+  fun setOnCommonTopBarCallback(backCallback: OnCommonTopBarBackCallback?, actionCallback: OnCommonTopBarActionCallback?) {
+    this.backCallback = backCallback
+    this.actionCallback = actionCallback
   }
 
-  interface OnCommonTopBarCallback {
+  interface OnCommonTopBarActionCallback {
     /**
-     * 操作回调
+     * 操作按钮回调
      */
     fun onDoAction()
   }
+
+  interface OnCommonTopBarBackCallback {
+    /**
+     * 返回按钮回调
+     */
+    fun onDoBack()
+
+
+  }
 }

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

@@ -2,15 +2,14 @@
 <com.yidian.nightmode.widget.YdConstraintLayout 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:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
-    <include
-        android:id="@+id/layout_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"
-        app:layout_constraintStart_toStartOf="parent"
+        android:layout_height="wrap_content"
+        app:CommonTopBarView_title_text="@string/join_life_circle"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.yidian.nightmode.widget.YdTextView
@@ -24,7 +23,7 @@
         android:textColor="#DE000000"
         android:textSize="15sp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/layout_common_header" />
+        app:layout_constraintTop_toBottomOf="@id/bv_top_bar" />
 
     <com.yidian.nightmode.widget.YdTextView
         android:id="@+id/tv_provide_services"

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

@@ -2,15 +2,14 @@
 <com.yidian.nightmode.widget.YdConstraintLayout 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:layout_height="match_parent"
+    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"
-        app:layout_constraintStart_toStartOf="parent"
+        android:layout_height="wrap_content"
+        app:CommonTopBarView_title_text="@string/enterprise_auth"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.yidian.shenghuoquan.newscontent.widget.LifeAccountAuthProcessView
@@ -19,7 +18,7 @@
         android:layout_height="61dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/view_common_header" />
+        app:layout_constraintTop_toBottomOf="@id/bv_top_bar" />
 
     <com.yidian.shenghuoquan.newscontent.widget.LifeAccountAuthSelectView
         android:id="@+id/sv_merchant_type"

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

@@ -2,15 +2,14 @@
 <com.yidian.nightmode.widget.YdConstraintLayout 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:layout_height="match_parent"
+    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"
-        app:layout_constraintStart_toStartOf="parent"
+        android:layout_height="wrap_content"
+        app:CommonTopBarView_title_text="@string/personal_auth"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.yidian.shenghuoquan.newscontent.widget.LifeAccountAuthSelectView
@@ -19,7 +18,7 @@
         android:layout_height="58dp"
         app:LifeAccountAuthSelectView_content_hint_text="@string/describe_yourself"
         app:LifeAccountAuthSelectView_name_text="@string/occupation_label"
-        app:layout_constraintTop_toBottomOf="@id/view_common_header" />
+        app:layout_constraintTop_toBottomOf="@id/bv_top_bar" />
 
     <com.yidian.nightmode.widget.YdFrameLayout
         android:id="@+id/fragment_container"

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

-<?xml version="1.0" encoding="utf-8"?>
-<com.yidian.nightmode.widget.YdConstraintLayout 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="@dimen/toolbar_height"
-    android:fitsSystemWindows="true">
-
-    <com.yidian.nightmode.widget.YdImageView
-        android:id="@+id/iv_back"
-        android:layout_width="27dp"
-        android:layout_height="27dp"
-        android:layout_marginStart="19dp"
-        android:src="@drawable/icon_back"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.yidian.nightmode.widget.YdTextView
-        android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:includeFontPadding="false"
-        android:textColor="#FF333333"
-        android:textSize="17sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</com.yidian.nightmode.widget.YdConstraintLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/addressBar"
-    android:layout_width="match_parent"
-    android:layout_height="44dp"
-    android:background="@color/white">
-
-    <ImageButton
-        android:id="@+id/back"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:background="@null"
-        android:paddingStart="@dimen/back_button_padding_left"
-        android:paddingEnd="@dimen/back_button_padding_right"
-        android:scaleType="fitCenter"
-        android:src="@drawable/selector_big_back_black_button" />
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:layout_marginStart="5dp"
-        android:textColor="#333333"
-        android:textSize="18sp" />
-</RelativeLayout>
\ No newline at end of file