Skip to content

S
ShenghuoquanBusiness
Commit 38a3c612 authored by zhenghongbin's avatar zhenghongbin
Browse files
Options

add 身份选择页面

parent fc0c6f73
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 113 deletions
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/adapter/LifeAccountIdentityAdapter.kt
View file @ 38a3c612
......@@ -31,10 +31,7 @@ class LifeAccountIdentityAdapter :
)
}
override fun onBindViewHolder(
holder: LifeAccountIdentityViewHolder,
position: Int
) {
override fun onBindViewHolder(holder: LifeAccountIdentityViewHolder, position: Int) {
if (position == 0) {
// 默认选中第一个身份
mLastSelectItem = holder.itemView
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/FlashActivity.kt
View file @ 38a3c612
......@@ -43,7 +43,6 @@ class FlashActivity: BaseActivity<ActivityFlashBinding>() {
if(isAgree){
viewBind.clRoot.postDelayed({
XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
// startActivity(Intent(this@FlashActivity, TempListActivity::class.java))
}, 2000)
}
}
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LifeAccountIdentityActivity.kt
View file @ 38a3c612
......@@ -12,14 +12,14 @@ import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.adapter.LifeAccountIdentityAdapter
import com.yidian.shenghuoquan.newscontent.bean.LifeAccountIdentityBean
import com.yidian.shenghuoquan.newscontent.databinding.ActivityLifeAccountIdentityBinding
import com.yidian.xpage.XPageManager
/**
* author: yinjiacheng
* date: 5/19/21 4:47 PM
* description: 生活号身份选择
*/
class LifeAccountIdentityActivity : BaseActivity<ActivityLifeAccountIdentityBinding>(),
View.OnClickListener, OnItemClickListener<LifeAccountIdentityBean> {
class LifeAccountIdentityActivity : BaseActivity<ActivityLifeAccountIdentityBinding>(), OnItemClickListener<LifeAccountIdentityBean> {
override fun createViewBinding(): ActivityLifeAccountIdentityBinding {
return ActivityLifeAccountIdentityBinding.inflate(layoutInflater)
......@@ -32,57 +32,38 @@ class LifeAccountIdentityActivity : BaseActivity<ActivityLifeAccountIdentityBind
override fun init(savedInstanceState: Bundle?) {
super.init(savedInstanceState)
initView()
initListener()
initData()
onClickListener()
}
private fun initView() {
viewBind.rvLifeAccountIdentity.layoutManager =
LinearLayoutManager(this, RecyclerView.VERTICAL, false)
viewBind.rvLifeAccountIdentity.addItemDecoration(LifeAccountIdentityItemDecoration())
viewBind.rvLifeAccountIdentity.adapter = LifeAccountIdentityAdapter()
}
private fun initListener() {
viewBind.btnEnterLifeAccount.setOnClickListener(this)
(viewBind.rvLifeAccountIdentity.adapter as LifeAccountIdentityAdapter).setOnItemClickListener(
this
)
(viewBind.rvLifeAccountIdentity.adapter as LifeAccountIdentityAdapter).setOnItemClickListener(this)
}
private fun initData() {
val data: List<LifeAccountIdentityBean> =
listOf(
LifeAccountIdentityBean("一点资讯", "超级管理员"),
LifeAccountIdentityBean("一点网娱商业化大佬们的生活号还有更多文字可以换行", "超级管理员"),
LifeAccountIdentityBean("一点资讯", "普通管理员"),
LifeAccountIdentityBean("简网科技生活号", "普通管理员"),
LifeAccountIdentityBean("生活圈", "普通管理员")
)
(viewBind.rvLifeAccountIdentity.adapter as LifeAccountIdentityAdapter).updateData(data)
}
override fun onClick(v: View?) {
val id = v?.id;
if (id == R.id.btn_enter_life_account) {
// TODO: 5/19/21 执行进入生活号逻辑
private fun onClickListener(){
viewBind.back.setOnClickListener {
XPageManager.pop(null)
}
viewBind.tvEnterLifeAccount.setOnClickListener {
}
}
override fun onClick(view: View?, position: Int, item: LifeAccountIdentityBean?) {
// TODO: 5/19/21 选中某个身份
}
/**
* 自定义ItemDecoration
* 处理Item间隔
*/
class LifeAccountIdentityItemDecoration : RecyclerView.ItemDecoration() {
override fun getItemOffsets(
outRect: Rect,
view: View,
parent: RecyclerView,
state: RecyclerView.State
) {
outRect.top = 20
outRect.bottom = 20
}
}
}
\ No newline at end of file
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LoginLifeCircleActivity.kt
View file @ 38a3c612
......@@ -3,6 +3,7 @@ package com.yidian.shenghuoquan.newscontent.ui
import android.os.Bundle
import android.text.Editable
import android.text.TextWatcher
import com.yidian.common.XRouterPathConstants
import com.yidian.common.XRouterPathConstants.Companion.LOGIN_LIFE_CIRCLE
import com.yidian.common.base.BaseActivity
import com.yidian.common.widget.EditTextInputCallback
......@@ -10,6 +11,7 @@ import com.yidian.common.widget.PhoneNumberTextWatcher
import com.yidian.shenghuoquan.newscontent.databinding.ActivityLoginBinding
import com.yidian.shenghuoquan.newscontent.utils.CountDownTimerUtils
import com.yidian.utils.ToastUtil
import com.yidian.xpage.XPageManager
/**
* Author: zhb
......@@ -80,9 +82,7 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>() {
})
viewBind.tvLogin.setOnClickListener {
ToastUtil.showToast(this, "登录")
// startActivity(Intent(this@LoginLifeCircleActivity, IDCardTestActivity::class.java))
// startActivity(Intent(this@LoginLifeCircleActivity, AliveTestActivity::class.java))
XPageManager.push(XRouterPathConstants.LIFE_ACCOUNT_IDENTITY, null)
}
viewBind.cbProtocol.setOnCheckedChangeListener { buttonView, isChecked ->
......@@ -96,6 +96,7 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>() {
viewBind.tvPrivacy.setOnClickListener {
ToastUtil.showToast(this, "隐私政策")
XPageManager.push(XRouterPathConstants.LIFE_ACCOUNT_IDENTITY, null)
}
}
......
Components/newscontent/src/main/res/drawable/bg_item_life_account_identity.xml
View file @ 38a3c612
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="10dp" />
<stroke
android:width="1dp"
android:color="@color/homeGray" />
<corners android:radius="12dp" />
<solid android:color="@color/white" />
</shape>
\ No newline at end of file
Components/newscontent/src/main/res/drawable/bg_item_life_account_identity_selected.xml
View file @ 38a3c612
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="10dp" />
<corners android:radius="12dp" />
<stroke
android:width="1dp"
android:color="@color/red_second" />
android:width="2dp"
android:color="#1852f1" />
</shape>
\ No newline at end of file
Components/newscontent/src/main/res/drawable/bg_item_manager_selected_off.xml 0 → 100644
View file @ 38a3c612
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="12dp"/>
<stroke
android:width="1dp"
android:color="#eaaf35" />
</shape>
\ No newline at end of file
Components/newscontent/src/main/res/drawable/bg_item_manager_selected_on.xml 0 → 100644
View file @ 38a3c612
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="12dp"/>
<solid android:color="#eaaf35"/>
</shape>
\ No newline at end of file
Components/newscontent/src/main/res/drawable/selector_item_life_account_identity.xml
View file @ 38a3c612
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_item_life_account_identity" android:state_selected="false" />
<item android:drawable="@drawable/bg_item_life_account_identity_selected" android:state_selected="true" />
</selector>
\ No newline at end of file
Components/newscontent/src/main/res/drawable/selector_item_manager.xml 0 → 100644
View file @ 38a3c612
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_item_manager_selected_off" android:state_selected="false" />
<item android:drawable="@drawable/bg_item_manager_selected_on" android:state_selected="true" />
</selector>
\ No newline at end of file
Components/newscontent/src/main/res/drawable/selector_item_manager_text.xml 0 → 100644
View file @ 38a3c612
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#eaaf35" android:state_selected="false" />
<item android:color="@color/white" android:state_selected="true" />
</selector>
\ No newline at end of file
Components/newscontent/src/main/res/layout/activity_life_account_identity.xml
View file @ 38a3c612
<?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"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:includeFontPadding="false"
android:text="@string/life_account_identity_select"
android:textColor="#FF000000"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.yidian.nightmode.widget.YdRecyclerView
android:id="@+id/rv_life_account_identity"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="10dp"
android:paddingStart="30dp"
android:paddingEnd="30dp"
app:layout_constraintBottom_toTopOf="@id/btn_enter_life_account"
app:layout_constraintTop_toBottomOf="@id/tv_title" />
<com.yidian.nightmode.widget.YdButton
android:id="@+id/btn_enter_life_account"
android:layout_height="match_parent"
android:layout_marginTop="44dp"
android:layout_marginBottom="95dp"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="44dp">
<ImageButton
android:id="@+id/back"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:background="@null"
android:paddingStart="20dp"
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:textColor="#333333"
android:textSize="18sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="87dp"
android:layout_marginStart="30dp"
android:layout_marginEnd="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textSize="28sp"
android:textColor="#333333"
android:text="你的身份是？"/>
<ImageView
android:layout_width="148dp"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:background="@mipmap/icon_people"/>
</RelativeLayout>
<com.yidian.nightmode.widget.YdRecyclerView
android:id="@+id/rv_life_account_identity"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:id="@+id/tv_enterLifeAccount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="@string/enter_life_account"
android:textColor="#FF000000"
android:textSize="16sp"
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
android:layout_height="44dp"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="34dp"
android:layout_alignParentBottom="true"
android:gravity="center"
android:textSize="18sp"
android:textColor="@color/white"
android:background="@drawable/account_btn_gradient_bg"
android:text="进入生活号" />
</RelativeLayout>
\ No newline at end of file
Components/newscontent/src/main/res/layout/item_life_account_identity.xml
View file @ 38a3c612
<?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"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_height="wrap_content"
android:background="@drawable/selector_item_life_account_identity"
android:padding="20dp">
android:padding="20dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="20dp"
android:orientation="vertical">
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_life_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:includeFontPadding="false"
android:singleLine="true"
android:textColor="#FF000000"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:textColor="#333333"
android:textSize="18sp" />
<com.yidian.nightmode.widget.YdTextView
android:id="@+id/tv_life_identity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="@color/homeGray"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
android:layout_height="26dp"
android:layout_marginTop="6dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:gravity="center"
android:background="@drawable/selector_item_manager"
android:textColor="@drawable/selector_item_manager_text"
android:textSize="14sp"/>
</com.yidian.nightmode.widget.YdConstraintLayout>
\ No newline at end of file
</LinearLayout>
\ No newline at end of file
Components/newscontent/src/main/res/layout/top_bar.xml
View file @ 38a3c612
......@@ -13,8 +13,8 @@
android:layout_centerVertical="true"
android:background="@null"
android:onClick="onBackClicked"
android:paddingLeft="@dimen/back_button_padding_left"
android:paddingRight="@dimen/back_button_padding_right"
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" />
......@@ -24,7 +24,6 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginStart="5dp"
android:text="title"
android:textColor="#333333"
android:textSize="18sp" />
</RelativeLayout>
\ 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