Skip to content

S
ShenghuoquanBusiness
Commit 8fac35ef authored by yinjiacheng's avatar yinjiacheng
Browse files
Options

update 企业认证页面跳转

parent 745f3312
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 83 deletions
Components/newscontent/src/main/AndroidManifest.xml
View file @ 8fac35ef
......@@ -90,7 +90,7 @@
android:theme="@style/Transparent"
android:windowSoftInputMode="stateHidden|adjustResize"/>
<activity android:name=".ui.LifeAccountPersonalAuthActivity"
<activity android:name=".ui.auth.LifeAccountPersonalAuthActivity"
android:theme="@style/Transparent" />
<activity android:name=".ui.auth.LifeAccountEnterpriseAuthActivity"
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt
View file @ 8fac35ef
......@@ -21,6 +21,7 @@ import com.yidian.nightmode.util.NightModeUtil
import com.yidian.shenghuoquan.newscontent.service.*
import com.yidian.shenghuoquan.newscontent.ui.*
import com.yidian.shenghuoquan.newscontent.ui.auth.LifeAccountEnterpriseAuthActivity
import com.yidian.shenghuoquan.newscontent.ui.auth.LifeAccountPersonalAuthActivity
import com.yidian.shenghuoquan.newscontent.ui.idcard.IDCardTestActivity
import com.yidian.xpage.XPageManager
import com.yidian.xpage.node.XPageHandler
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountBusinessLicenseAuthFragment.kt
View file @ 8fac35ef
......@@ -8,6 +8,7 @@ import com.yidian.common.base.BaseFragment
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.adapter.BottomSelectAdapter
import com.yidian.shenghuoquan.newscontent.bean.BottomSelectBean
import com.yidian.shenghuoquan.newscontent.constant.Constant
import com.yidian.shenghuoquan.newscontent.databinding.FragmentLifeAccountBusinessLicenseAuthBinding
import com.yidian.shenghuoquan.newscontent.ui.dialog.BottomSelectDialog
......@@ -19,10 +20,6 @@ import com.yidian.shenghuoquan.newscontent.ui.dialog.BottomSelectDialog
class LifeAccountBusinessLicenseAuthFragment :
BaseFragment<FragmentLifeAccountBusinessLicenseAuthBinding>(), View.OnClickListener,
BottomSelectAdapter.OnItemClickListener<BottomSelectBean> {
companion object {
private const val ITEM_TAKE_PHOTO = "拍照"
private const val ITEM_OPEN_ALBUM = "相册"
}
override fun createViewBinding(
inflater: LayoutInflater,
......@@ -56,8 +53,8 @@ class LifeAccountBusinessLicenseAuthFragment :
it,
this,
arrayListOf(
BottomSelectBean(ITEM_TAKE_PHOTO),
BottomSelectBean(ITEM_OPEN_ALBUM)
BottomSelectBean(Constant.ITEM_TAKE_PHOTO),
BottomSelectBean(Constant.ITEM_OPEN_ALBUM)
)
).show()
}
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountEnterpriseAuthActivity.kt
View file @ 8fac35ef
......@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.newscontent.ui.auth
import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import com.yidian.common.XRouterPathConstants
import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.R
......@@ -21,6 +22,13 @@ import com.yidian.xpage.XPageManager
class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterpriseAuthBinding>(),
View.OnClickListener, BottomSelectAdapter.OnItemClickListener<BottomSelectBean> {
private val fragmentList: ArrayList<Fragment> by lazy {
arrayListOf<Fragment>(
LifeAccountBusinessLicenseAuthFragment(),
LifeAccountIDCardAuthFragment()
)
}
override fun createViewBinding(): ActivityLifeAccountEnterpriseAuthBinding {
return ActivityLifeAccountEnterpriseAuthBinding.inflate(layoutInflater)
}
......@@ -33,9 +41,10 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
super.init(savedInstanceState)
initView()
initListener()
// 默认企业资质Fragment
viewBind.pvAuthProcess.setProcess(LifeAccountAuthProcessView.PROCESS_ENTERPRISE_QUALIFICATION)
supportFragmentManager.beginTransaction()
.add(R.id.fragment_container, LifeAccountBusinessLicenseAuthFragment()).commit()
.add(R.id.fragment_container, fragmentList[0]).commit()
}
private fun initView() {
......@@ -51,7 +60,20 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
override fun onClick(v: View?) {
when (v?.id) {
R.id.iv_back -> {
XPageManager.pop(null)
if (viewBind.pvAuthProcess.curProcess == 0) {
// 当前是第一个fragment 则退出当前activity
XPageManager.pop(null)
} else {
viewBind.pvAuthProcess.setProcess(--viewBind.pvAuthProcess.curProcess)
if (viewBind.pvAuthProcess.curProcess == 0) {
viewBind.svMerchantType.visibility = View.VISIBLE
}
// 回退fragment
supportFragmentManager.beginTransaction().replace(
R.id.fragment_container,
fragmentList[viewBind.pvAuthProcess.curProcess]
).commit()
}
}
R.id.sv_merchant_type -> {
// 弹出商户类型选择
......@@ -66,6 +88,13 @@ class LifeAccountEnterpriseAuthActivity : BaseActivity<ActivityLifeAccountEnterp
}
R.id.btn_next -> {
// TODO: 5/29/21 请求接口401 402
viewBind.pvAuthProcess.setProcess(++viewBind.pvAuthProcess.curProcess)
viewBind.svMerchantType.visibility = View.GONE
supportFragmentManager.beginTransaction()
.replace(
R.id.fragment_container,
fragmentList[viewBind.pvAuthProcess.curProcess]
).commit()
}
}
}
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountIDCardAuthFragment.kt
View file @ 8fac35ef
......@@ -36,7 +36,6 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
viewBinding.ivIdCardPortraitFace.setOnClickListener(this)
viewBinding.ivIdCardNationalEmblemFace.setOnClickListener(this)
viewBinding.ivFaceAuthStart.setOnClickListener(this)
viewBinding.btnNext.setOnClickListener(this)
}
override fun onClick(v: View?) {
......@@ -50,10 +49,6 @@ class LifeAccountIDCardAuthFragment : BaseFragment<FragmentLifeAccountIdCardAuth
R.id.iv_face_auth_start -> {
// TODO: 5/27/21 跳转人脸认证
}
R.id.btn_next -> {
// TODO: 5/27/21 执行认证逻辑
}
}
}
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LifeAccountPersonalAuthActivity.kt → Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/auth/LifeAccountPersonalAuthActivity.kt
View file @ 8fac35ef
package com.yidian.shenghuoquan.newscontent.ui
package com.yidian.shenghuoquan.newscontent.ui.auth
import android.os.Bundle
import android.view.View
......@@ -6,7 +6,6 @@ import com.yidian.common.XRouterPathConstants
import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountPersonalAuthBinding
import com.yidian.shenghuoquan.newscontent.ui.auth.LifeAccountIDCardAuthFragment
import com.yidian.xpage.XPageManager
/**
......@@ -40,6 +39,7 @@ class LifeAccountPersonalAuthActivity : BaseActivity<ActivityLifeAccountPersonal
private fun initListener() {
viewBind.viewCommonHeader.ivBack.setOnClickListener(this)
viewBind.ivProfessionalLabelChoose.setOnClickListener(this)
viewBind.btnNext.setOnClickListener(this)
}
override fun onClick(v: View?) {
......@@ -48,6 +48,9 @@ class LifeAccountPersonalAuthActivity : BaseActivity<ActivityLifeAccountPersonal
R.id.iv_professional_label_choose -> {
// TODO: 5/27/21 跳转职业标签选择
}
R.id.btn_next -> {
// TODO: 5/27/21 执行认证逻辑
}
}
}
}
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/LifeAccountAuthIdentityInfoEditView.kt
View file @ 8fac35ef
......@@ -8,7 +8,7 @@ import android.util.AttributeSet
import android.view.View
import com.yidian.nightmode.widget.YdConstraintLayout
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ViewLifeAccountAuthEditBinding
import com.yidian.shenghuoquan.newscontent.databinding.ViewLifeAccountAuthIdentityInfoEditBinding
/**
* author: yinjiacheng
......@@ -21,13 +21,14 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor(
defStyle: Int = 0
) : YdConstraintLayout(context, attrs, defStyle), View.OnClickListener, TextWatcher {
private val viewBinding: ViewLifeAccountAuthEditBinding = ViewLifeAccountAuthEditBinding.bind(
View.inflate(
getContext(),
R.layout.view_life_account_auth_edit,
this
private val viewBinding: ViewLifeAccountAuthIdentityInfoEditBinding =
ViewLifeAccountAuthIdentityInfoEditBinding.bind(
View.inflate(
getContext(),
R.layout.view_life_account_auth_identity_info_edit,
this
)
)
)
init {
val typedArray =
......@@ -45,13 +46,24 @@ class LifeAccountAuthIdentityInfoEditView @JvmOverloads constructor(
* 展示错误提示
*/
fun showErrorTips(tips: String) {
viewBinding.tvErrorTips.visibility = View.VISIBLE
viewBinding.tvErrorTips.text = tips
}
/**
* 清除输入的文字
*/
fun clearEditContent() {
viewBinding.etContent.setText("")
if (viewBinding.tvErrorTips.visibility == View.VISIBLE) {
viewBinding.tvErrorTips.visibility = View.GONE
}
}
override fun onClick(v: View?) {
if (v?.id == R.id.iv_clear) {
// 清除输入框中的内容
viewBinding.etContent.setText("")
clearEditContent()
}
}
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/LifeAccountAuthProcessView.kt
View file @ 8fac35ef
......@@ -2,7 +2,6 @@ package com.yidian.shenghuoquan.newscontent.widget
import android.content.Context
import android.graphics.Color
import android.os.Build
import android.util.AttributeSet
import android.view.View
import com.yidian.nightmode.widget.YdConstraintLayout
......@@ -45,10 +44,16 @@ class LifeAccountAuthProcessView @JvmOverloads constructor(
)
)
/**
* 当前进度
*/
var curProcess: Int = 0
/**
* 设置当前流程
*/
fun setProcess(process: Int) {
curProcess = process
when (process) {
PROCESS_ENTERPRISE_QUALIFICATION -> {
resetUI()
......
Components/newscontent/src/main/res/layout/activity_life_account_personal_auth.xml
View file @ 8fac35ef
......@@ -64,7 +64,65 @@
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="19dp"
app:layout_constraintBottom_toTopOf="@id/ll_protocol"
app:layout_constraintTop_toBottomOf="@id/rl_professional_label" />
<com.yidian.nightmode.widget.YdLinearLayout
android:id="@+id/ll_protocol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="19dp"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@id/btn_next"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<com.yidian.nightmode.widget.YdCheckedBox
android:id="@+id/cb_protocol"
android:layout_width="27dp"
android:layout_height="27dp"
android:layout_marginEnd="2dp"
android:background="@drawable/selector_protocol_check"
android:button="@null" />
<com.yidian.nightmode.widget.YdTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/agree"
android:textColor="#FF999999"
android:textSize="13sp" />
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_privacy_certification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/privacy_certification"
android:textColor="#FF1852F1"
android:textSize="13sp" />
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_user_agreement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/user_agreement"
android:textColor="#FF1852F1"
android:textSize="13sp" />
</com.yidian.nightmode.widget.YdLinearLayout>
<com.yidian.nightmode.widget.YdButton
android:id="@+id/btn_next"
android:layout_width="302dp"
android:layout_height="42dp"
android:layout_marginBottom="33dp"
android:background="@drawable/bg_btn_auth"
android:text="@string/auth_finish"
android:textColor="#FFFFFFFF"
android:textSize="17sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</com.yidian.nightmode.widget.YdConstraintLayout>
\ No newline at end of file
Components/newscontent/src/main/res/layout/fragment_life_account_id_card_auth.xml
View file @ 8fac35ef
......@@ -139,61 +139,4 @@
</com.yidian.nightmode.widget.YdConstraintLayout>
<com.yidian.nightmode.widget.YdLinearLayout
android:id="@+id/ll_protocol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="19dp"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@id/btn_next"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<com.yidian.nightmode.widget.YdCheckedBox
android:id="@+id/cb_protocol"
android:layout_width="27dp"
android:layout_height="27dp"
android:layout_marginEnd="2dp"
android:background="@drawable/selector_protocol_check"
android:button="@null" />
<com.yidian.nightmode.widget.YdTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/agree"
android:textColor="#FF999999"
android:textSize="13sp" />
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_privacy_certification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/privacy_certification"
android:textColor="#FF1852F1"
android:textSize="13sp" />
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_user_agreement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/user_agreement"
android:textColor="#FF1852F1"
android:textSize="13sp" />
</com.yidian.nightmode.widget.YdLinearLayout>
<com.yidian.nightmode.widget.YdButton
android:id="@+id/btn_next"
android:layout_width="302dp"
android:layout_height="42dp"
android:layout_marginBottom="33dp"
android:background="@drawable/bg_btn_auth"
android:text="@string/auth_finish"
android:textColor="#FFFFFFFF"
android:textSize="17sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</com.yidian.nightmode.widget.YdConstraintLayout>
\ No newline at end of file
Components/newscontent/src/main/res/layout/view_life_account_auth_edit.xml → Components/newscontent/src/main/res/layout/view_life_account_auth_identity_info_edit.xml
View file @ 8fac35ef
......@@ -56,6 +56,7 @@
android:includeFontPadding="false"
android:textColor="#FFFF3A3A"
android:textSize="12sp"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/view_divider" />
</com.yidian.nightmode.widget.YdConstraintLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment