Skip to content

S
ShenghuoquanBusiness
Commit 4d744424 authored by zhenghongbin's avatar zhenghongbin
Browse files
Options

add Merge branch 'dev' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into dev 

* 'dev' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness:
  update：创建生活号页面UI设计优化
  add 生活号认证流程首页UI
  update：个人认证成功页面UI设计优化

# Conflicts:
#	Components/newscontent/src/main/res/layout/top_bar.xml
parents 38a3c612 d683f1c9
Hide whitespace changes
Inline Side-by-side
Showing with 511 additions and 12 deletions
Components/newscontent/src/main/AndroidManifest.xml
View file @ 4d744424
......@@ -88,7 +88,9 @@
<activity
android:name=".ui.PersonalAuthenticationActivity"
android:theme="@style/Transparent" />
<activity
android:name=".ui.LifeNumberActivity"
android:theme="@style/Transparent" />
<activity
android:name=".ui.idcard.IDCardResultActivity"
android:theme="@style/Transparent" />
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/EnterpriseCertificationActivity.kt
View file @ 4d744424
......@@ -26,7 +26,9 @@ class EnterpriseCertificationActivity : BaseActivity<ActivityEnterpriseCertifica
viewBind.root.title.text = resources.getString(R.string.enterprise_certification)
viewBind.createLifeNumber.setOnClickListener {
startActivity(Intent(this@EnterpriseCertificationActivity, PersonalAuthenticationActivity::class.java))
}
viewBind.root.back.setOnClickListener{
finish()
}
}
}
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LifeAccountAuthActivity.kt
View file @ 4d744424
......@@ -4,6 +4,7 @@ import android.os.Bundle
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.databinding.ActivityLifeAccountAuthBinding
/**
......@@ -23,14 +24,50 @@ class LifeAccountAuthActivity : BaseActivity<ActivityLifeAccountAuthBinding>(),
override fun init(savedInstanceState: Bundle?) {
super.init(savedInstanceState)
initView()
initListener()
}
private fun initListener() {
private fun initView() {
viewBind.layoutCommonHeader.tvTitle.text = resources.getString(R.string.join_life_circle)
viewBind.viewPersonalAuth.setData(
resources.getString(R.string.personal_auth),
resources.getString(R.string.personal_auth_condition),
resources.getString(R.string.personal_auth_description), false
)
viewBind.viewEnterpriseAuth.setData(
resources.getString(R.string.enterprise_auth),
resources.getString(R.string.enterprise_auth_condition),
resources.getString(R.string.enterprise_auth_description),
false
)
}
private fun initListener() {
viewBind.layoutCommonHeader.ivBack.setOnClickListener(this)
viewBind.tvJoinStrategy.setOnClickListener(this)
viewBind.viewPersonalAuth.setOnClickListener(this)
viewBind.viewEnterpriseAuth.setOnClickListener(this)
}
override fun onClick(v: View?) {
val id = v?.id
when (v?.id) {
R.id.iv_back -> {
finish()
}
R.id.tv_join_strategy -> {
// TODO: 5/26/21 入驻攻略
}
R.id.view_personal_auth -> {
viewBind.viewPersonalAuth.isSelected = true
viewBind.viewEnterpriseAuth.isSelected = false
// TODO: 5/26/21 跳转个人认证页
}
R.id.view_enterprise_auth -> {
viewBind.viewPersonalAuth.isSelected = false
viewBind.viewEnterpriseAuth.isSelected = true
// TODO: 5/26/21 跳转企业认证页
}
}
}
}
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LifeNumberActivity.kt 0 → 100644
View file @ 4d744424
package com.yidian.shenghuoquan.newscontent.ui
import android.os.Bundle
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.ActivityPersonalAuthenticationBinding
import kotlinx.android.synthetic.main.top_bar.view.*
/**
* Author: houzhenpu
* Date: 2021/5/26 15:44 PM
* Describe: activity_enterprise_certification 创建生活号
*/
class LifeNumberActivity : BaseActivity<ActivityLifeNumberBinding>() {
override fun createViewBinding(): ActivityLifeNumberBinding {
return ActivityLifeNumberBinding.inflate(layoutInflater)
}
override fun getXPageName(): String {
return ""
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
viewBind.root.title.text = resources.getString(R.string.create_a_life_number)
viewBind.root.back.setOnClickListener{
finish()
}
}
}
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/PersonalAuthenticationActivity.kt
View file @ 4d744424
package com.yidian.shenghuoquan.newscontent.ui
import android.content.Intent
import android.os.Bundle
import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.R
......@@ -23,5 +24,16 @@ class PersonalAuthenticationActivity : BaseActivity<ActivityPersonalAuthenticati
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
viewBind.root.title.text = resources.getString(R.string.personal_authentication)
viewBind.root.back.setOnClickListener {
finish()
}
viewBind.turnOnEnterpriseCertification.setOnClickListener {
startActivity(
Intent(
this@PersonalAuthenticationActivity,
LifeNumberActivity::class.java
)
)
}
}
}
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/widget/LifeAccountAuthCardView.kt 0 → 100644
View file @ 4d744424
package com.yidian.shenghuoquan.newscontent.widget
import android.content.Context
import android.util.AttributeSet
import android.view.View
import androidx.cardview.widget.CardView
import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ViewLifeAccountAuthCardBinding
/**
* author: yinjiacheng
* date: 5/26/21 2:53 PM
* description: 生活号认证卡片
*/
class LifeAccountAuthCardView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyle: Int = 0
) : CardView(context, attrs, defStyle) {
private val viewBinding: ViewLifeAccountAuthCardBinding = ViewLifeAccountAuthCardBinding.bind(
View.inflate(
getContext(),
R.layout.view_life_account_auth_card,
this
)
)
/**
* 数据填充
* @param name 认证类型
* @param condition 条件
* @param description 描述
* @param isAuthenticated 是否已认证
*/
fun setData(
name: String,
condition: String,
description: String,
isAuthenticated: Boolean
) {
viewBinding.tvName.text = name
viewBinding.tvCondition.text = condition
viewBinding.tvDescription.text = description
viewBinding.ivAuthenticated.visibility = if (isAuthenticated) View.VISIBLE else View.GONE
}
}
\ No newline at end of file
Components/newscontent/src/main/res/drawable/bg_life_account_auth_card_select.xml 0 → 100644
View file @ 4d744424
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFFFFFFF" />
<corners android:radius="12dp" />
<stroke
android:width="2dp"
android:color="#FF1751F1" />
</shape>
Components/newscontent/src/main/res/drawable/bg_life_account_auth_card_unselect.xml 0 → 100644
View file @ 4d744424
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFFFFFFF" />
<corners android:radius="12dp" />
</shape>
Components/newscontent/src/main/res/drawable/selector_life_account_auth_card.xml 0 → 100644
View file @ 4d744424
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_life_account_auth_card_unselect" android:state_selected="false" />
<item android:drawable="@drawable/bg_life_account_auth_card_select" android:state_selected="true" />
</selector>
\ No newline at end of file
Components/newscontent/src/main/res/layout/activity_life_account_auth.xml
View file @ 4d744424
......@@ -4,4 +4,73 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
android:id="@+id/layout_common_header"
layout="@layout/layout_common_header"
android:layout_width="match_parent"
android:layout_height="42dp"
android:layout_marginTop="10dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_upgrade_life_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="29dp"
android:layout_marginTop="29dp"
android:includeFontPadding="false"
android:text="@string/join_life_circle_and_upgrade_to_life_account"
android:textColor="#DE000000"
android:textSize="15sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_common_header" />
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_provide_services"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:includeFontPadding="false"
android:text="@string/provide_more_and_better_services"
android:textColor="#FF333333"
android:textSize="27sp"
app:layout_constraintStart_toStartOf="@id/tv_upgrade_life_account"
app:layout_constraintTop_toBottomOf="@id/tv_upgrade_life_account" />
<com.yidian.shenghuoquan.newscontent.widget.LifeAccountAuthCardView
android:id="@+id/view_personal_auth"
android:layout_width="322dp"
android:layout_height="144dp"
android:layout_marginTop="24dp"
app:cardCornerRadius="12dp"
app:cardElevation="6dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_provide_services" />
<com.yidian.shenghuoquan.newscontent.widget.LifeAccountAuthCardView
android:id="@+id/view_enterprise_auth"
android:layout_width="322dp"
android:layout_height="144dp"
android:layout_marginTop="19dp"
app:cardCornerRadius="12dp"
app:cardElevation="6dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_personal_auth" />
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_join_strategy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="19dp"
android:layout_marginEnd="27dp"
android:includeFontPadding="false"
android:text="@string/join_strategy"
android:textColor="#FF1852F1"
android:textSize="13sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_enterprise_auth" />
</com.yidian.nightmode.widget.YdConstraintLayout>
\ No newline at end of file
Components/newscontent/src/main/res/layout/activity_life_number.xml 0 → 100644
View file @ 4d744424
<?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: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/activity_personal_authentication.xml
View file @ 4d744424
......@@ -192,6 +192,7 @@
android:textSize="16sp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingTop="4dp"
android:paddingBottom="7dp"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true"
......@@ -201,20 +202,20 @@
<TextView
android:id="@+id/turn_on_enterprise_certification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="44dp"
android:text="@string/turn_on_enterprise_certification"
android:layout_alignParentBottom="true"
android:textSize="16sp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:textSize="18sp"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:paddingTop="7dp"
android:paddingBottom="7dp"
android:layout_marginTop="30dp"
android:layout_centerHorizontal="true"
android:textColor="#1852F1"
android:textColor="#FFFFFF"
android:layout_marginBottom="34dp"
android:background="@drawable/shape_stroke2_radius18_skin_primary_1852f1"
android:background="@drawable/account_btn_gradient_bg"
android:gravity="center" />
<TextView
......
Components/newscontent/src/main/res/layout/layout_common_header.xml 0 → 100644
View file @ 4d744424
<?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="42dp">
<com.yidian.nightmode.widget.YdImageView
android:id="@+id/iv_back"
android:layout_width="27dp"
android:layout_height="27dp"
android:layout_marginStart="19dp"
android:src="@mipmap/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
View file @ 4d744424
......@@ -12,7 +12,6 @@
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:background="@null"
android:onClick="onBackClicked"
android:paddingStart="@dimen/back_button_padding_left"
android:paddingEnd="@dimen/back_button_padding_right"
android:scaleType="fitCenter"
......
Components/newscontent/src/main/res/layout/view_life_account_auth_card.xml 0 → 100644
View file @ 4d744424
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="322dp"
android:layout_height="144dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/selector_life_account_auth_card">
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="23dp"
android:includeFontPadding="false"
android:paddingStart="23dp"
android:paddingEnd="23dp"
android:textColor="#FF333333"
android:textSize="23sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_condition"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:includeFontPadding="false"
android:paddingStart="23dp"
android:paddingEnd="23dp"
android:textColor="#FF333333"
android:textSize="15sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_name" />
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:includeFontPadding="false"
android:paddingStart="23dp"
android:paddingEnd="23dp"
android:textColor="#FF999999"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_condition" />
<com.yidian.nightmode.widget.YdImageView
android:id="@+id/iv_authenticated"
android:layout_width="49dp"
android:layout_height="58dp"
android:layout_marginTop="13dp"
android:src="@mipmap/icon_life_account_authenticated"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
\ No newline at end of file
Components/newscontent/src/main/res/values/strings.xml
View file @ 4d744424
......@@ -75,6 +75,19 @@
<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="recruitment_life_number">一点招聘生活号</string>
<string name="join_life_circle_and_upgrade_to_life_account">加入生活圈升级成为生活号</string>
<string name="provide_more_and_better_services">为你提供更多更优的服务</string>
<string name="join_life_circle">加入生活圈</string>
<string name="join_strategy">入驻攻略</string>
<string name="personal_auth">个人认证</string>
<string name="personal_auth_condition">开店条件：经营者身份证</string>
<string name="personal_auth_description">小店更适合未申请营业执照的普通圈友，个人小店也可升级为企业店</string>
<string name="enterprise_auth">企业认证</string>
<string name="enterprise_auth_condition">开店条件：营业执照、经营者身份证或法人身份证</string>
<string name="enterprise_auth_description">企业店开通适合拥有个体工商户或企业营业执照商户申请，入住成功将享有更优质企业级服务于管理</string>
</resources>
\ 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