From 7e4a923b472a1ffb9d6deeb80302551ba4178ca3 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 20 六月 2023 17:40:28 +0800
Subject: [PATCH] 注册增加字段,收益明细增加类型
---
app/src/main/res/layout/activity_fast_register.xml | 452 ++++++++++++++++++++++++++++++++------------
app/src/main/java/com/fanghua/driver/ui/main/TripActivity.kt | 2
app/src/main/java/com/fanghua/driver/bean/BalanceDetailBean.kt | 2
app/src/main/java/com/fanghua/driver/ui/pub/FastRegisterActivity.kt | 90 +++++++++
app/src/main/res/layout/dialog_sex_show.xml | 18
5 files changed, 427 insertions(+), 137 deletions(-)
diff --git a/app/src/main/java/com/fanghua/driver/bean/BalanceDetailBean.kt b/app/src/main/java/com/fanghua/driver/bean/BalanceDetailBean.kt
index c98d63e..6e7e5e6 100644
--- a/app/src/main/java/com/fanghua/driver/bean/BalanceDetailBean.kt
+++ b/app/src/main/java/com/fanghua/driver/bean/BalanceDetailBean.kt
@@ -29,6 +29,8 @@
4->"提现"
7->"优惠券"
8->"保险"
+ 9->"信息费"
+ 10->"平台充值"
else -> ""
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/fanghua/driver/ui/main/TripActivity.kt b/app/src/main/java/com/fanghua/driver/ui/main/TripActivity.kt
index 9656572..646665f 100644
--- a/app/src/main/java/com/fanghua/driver/ui/main/TripActivity.kt
+++ b/app/src/main/java/com/fanghua/driver/ui/main/TripActivity.kt
@@ -328,7 +328,7 @@
iv_call.visible()
tv_more.visible()
}
- if (orderBean?.state?:0 > 140&&orderBean?.state?:0!=201)
+ if (orderBean?.state?:0 > 104&&orderBean?.state?:0!=201)
MyApplication.startRecord()
when (orderBean?.state) { //订单状态（101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待支付，108=待评价，109=已完成，201=转单中，301=已取消，401=等待中）
101,201 -> {
diff --git a/app/src/main/java/com/fanghua/driver/ui/pub/FastRegisterActivity.kt b/app/src/main/java/com/fanghua/driver/ui/pub/FastRegisterActivity.kt
index 61292cf..427fa39 100644
--- a/app/src/main/java/com/fanghua/driver/ui/pub/FastRegisterActivity.kt
+++ b/app/src/main/java/com/fanghua/driver/ui/pub/FastRegisterActivity.kt
@@ -1,5 +1,8 @@
package com.fanghua.driver.ui.pub
+import android.graphics.Color
+import androidx.core.content.ContextCompat
+import cn.sinata.xldutils.utils.TimeUtils
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.getString
import com.fanghua.driver.R
@@ -8,14 +11,20 @@
import com.fanghua.driver.netUtls.Api
import com.fanghua.driver.netUtls.callNet
import com.fanghua.driver.netUtls.getMapByAny
+import com.fanghua.driver.ui.DialogUtil
import com.fanghua.driver.utils.PhoneCheckUtil
+import com.fanghua.driver.utils.citypickerview.picker.widget.builder.TimePickerBuilder
+import com.fanghua.driver.utils.citypickerview.picker.widget.configure.TimePickerType
+import com.fanghua.driver.utils.citypickerview.picker.widget.listener.OnTimeSelectListener
import kotlinx.android.synthetic.main.activity_fast_register.*
import kotlinx.android.synthetic.main.activity_fast_register.tv_action
import kotlinx.android.synthetic.main.activity_fast_register.tv_region
import kotlinx.android.synthetic.main.activity_register.*
+import kotlinx.android.synthetic.main.dialog_sex_show.view.*
import kotlinx.android.synthetic.main.include_login_phone.*
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.toast
+import java.util.*
class FastRegisterActivity: BasePhotoActivity() {
override fun setContentView() {
@@ -53,9 +62,49 @@
selectPhone = 4
showSelectPhone()
}
+ tv_sex.clickDelay {
+ val dialog = DialogUtil.getDialog(this, R.layout.dialog_sex_show)
+ dialog.window?.decorView?.apply {
+ tv_cancel.setOnClickListener {
+ dialog.dismiss()
+ }
+ tv_ok_sex.setOnClickListener {
+ if (tv_select_boy.alpha == 1f)
+ tv_sex.text = "男"
+ else
+ tv_sex.text = "女"
+ dialog.dismiss()
+ }
+ tv_select_boy.setOnClickListener {
+ tv_select_boy.alpha = 1f
+ tv_select_boy.setTextColor(Color.parseColor("#333333"))
+ tv_select_girl.alpha = 0.6f
+ tv_select_girl.setTextColor(Color.parseColor("#666666"))
+ }
+ tv_select_girl.setOnClickListener {
+ tv_select_boy.alpha = 0.6f
+ tv_select_boy.setTextColor(Color.parseColor("#666666"))
+ tv_select_girl.alpha = 1f
+ tv_select_girl.setTextColor(Color.parseColor("#333333"))
+ }
+ }
+ }
+ tv_date.clickDelay {
+ showTimePicker()
+ }
tv_action.clickDelay {
if (avatar.isEmpty()){
toast("请上传本人头像")
+ return@clickDelay
+ }
+ val name = et_name.getString()
+ if (name.isEmpty()) {
+ toast("请输入姓名")
+ return@clickDelay
+ }
+ val sex = tv_sex.text.toString()
+ if (sex.isEmpty()) {
+ toast("请选择性别")
return@clickDelay
}
val phone = et_phone.getString()
@@ -80,6 +129,15 @@
toast("紧急联系人手机号不能和注册手机号相同")
return@clickDelay
}
+ val idCard = et_id_card.getString()
+ if (idCard.isEmpty()) {
+ toast("请输入身份证号码")
+ return@clickDelay
+ }
+ if (!PhoneCheckUtil.isLegalId(idCard)) {
+ toast("身份证号码格式错误")
+ return@clickDelay
+ }
if (front.isEmpty()){
toast("请上传身份证正面照")
return@clickDelay
@@ -92,6 +150,11 @@
toast("请上传机动车驾驶证")
return@clickDelay
}
+ val date = tv_date.text.toString()
+ if (date.isEmpty()){
+ toast("请选择初次领证日期")
+ return@clickDelay
+ }
var map = getMapByAny()
map["avatar"] = avatar
map["code"] = regionCode
@@ -101,6 +164,10 @@
map["idcardFront"] = front
map["source"] = 1
map["phone"] = phone
+ map["name"] = name
+ map["sex"] = if (sex == "男") 1 else 2
+ map["idcard"] = idCard
+ map["firstCertificateTime"] = date
callNet(Api.driverRegister,map){
var bean = gson.fromJson<BaseBean>(it, BaseBean::class.java)
if (bean.code == 200){
@@ -117,6 +184,29 @@
}
}
+ fun showTimePicker() {
+ var startCalendar = Calendar.getInstance()
+ var endCalendar = Calendar.getInstance()
+ var nowCalendar = Calendar.getInstance()
+ startCalendar.set(1930, 1, 1)
+
+ var timePic = TimePickerBuilder(this,
+ OnTimeSelectListener { date, v ->
+ tv_date.text = TimeUtils.getTimeYMD(date.time)
+ })
+ .setTitleText("")
+ .setBgColor(ContextCompat.getColor(this, R.color.white))
+ .setCancelColor(ContextCompat.getColor(this, R.color.black_333333))
+ .setSubmitColor(ContextCompat.getColor(this, R.color.main_yellow_shen))
+ .setRangDate(startCalendar, endCalendar)
+ .setDate(nowCalendar)
+ .setType(TimePickerType.DEFAULT)
+ .setSubmitText("确认")
+ .setLineSpacingMultiplier(2f)
+ .build()
+ timePic.show()
+ }
+
override fun getPhoneUrl(url: String, type: Int, path: String) {
when (selectPhone) {
diff --git a/app/src/main/res/layout/activity_fast_register.xml b/app/src/main/res/layout/activity_fast_register.xml
index 0f5d738..9983fb5 100644
--- a/app/src/main/res/layout/activity_fast_register.xml
+++ b/app/src/main/res/layout/activity_fast_register.xml
@@ -1,282 +1,480 @@
<?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"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ android:layout_height="match_parent">
+
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
- app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/tv_action"
- >
+ app:layout_constraintTop_toTopOf="parent">
+
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
+
<TextView
+ android:id="@+id/tv_region"
+ style="@style/formTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/formTextView"
- app:layout_constraintTop_toTopOf="parent"
- android:hint="请选择"
- android:gravity="end"
- android:textStyle="bold"
android:layout_marginEnd="14dp"
- android:id="@+id/tv_region"
- android:drawableEnd="@mipmap/more_gray"/>
+ android:drawableEnd="@mipmap/more_gray"
+ android:gravity="end"
+ android:hint="请选择"
+ android:textStyle="bold"
+ app:layout_constraintTop_toTopOf="parent" />
+
<TextView
android:id="@+id/tv_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintBaseline_toBaselineOf="@id/tv_region"
- android:text="服务区域"
- android:textStyle="bold"
- android:textSize="14sp"
- android:textColor="@color/textColor"
android:layout_marginStart="26dp"
- app:layout_constraintStart_toStartOf="parent"/>
+ android:text="服务区域"
+ android:textColor="@color/textColor"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_region"
+ app:layout_constraintStart_toStartOf="parent" />
+
<TextView
android:id="@+id/tv_dot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintBaseline_toBaselineOf="@id/tv_region"
- android:text="*"
android:layout_marginEnd="3dp"
- android:textStyle="bold"
- android:textSize="14sp"
+ android:text="*"
android:textColor="@color/red_main"
- app:layout_constraintEnd_toStartOf="@id/tv_1"/>
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_region"
+ app:layout_constraintEnd_toStartOf="@id/tv_1" />
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@color/dividing_line_color"
android:layout_marginHorizontal="14dp"
- app:layout_constraintTop_toBottomOf="@id/tv_region"/>
+ android:background="@color/dividing_line_color"
+ app:layout_constraintTop_toBottomOf="@id/tv_region" />
+
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/more_gray"
- app:layout_constraintTop_toTopOf="@id/iv_avatar"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
- app:layout_constraintEnd_toEndOf="@id/tv_region"/>
+ app:layout_constraintEnd_toEndOf="@id/tv_region"
+ app:layout_constraintTop_toTopOf="@id/iv_avatar" />
+
<com.facebook.drawee.view.SimpleDraweeView
+ android:id="@+id/iv_avatar"
android:layout_width="32dp"
android:layout_height="32dp"
- app:roundAsCircle="true"
- app:actualImageScaleType="centerCrop"
- android:id="@+id/iv_avatar"
- app:placeholderImage="@color/gray_ad"
- app:layout_constraintTop_toBottomOf="@id/tv_region"
- app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginTop="9dp"
android:layout_marginEnd="30dp"
- android:layout_marginTop="9dp"/>
+ app:actualImageScaleType="centerCrop"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_region"
+ app:placeholderImage="@color/gray_ad"
+ app:roundAsCircle="true" />
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="本人头像"
- android:textStyle="bold"
- android:textSize="14sp"
android:textColor="@color/textColor"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
app:layout_constraintStart_toStartOf="@id/tv_1"
- app:layout_constraintTop_toTopOf="@id/iv_avatar"
- app:layout_constraintBottom_toBottomOf="@id/iv_avatar"/>
+ app:layout_constraintTop_toTopOf="@id/iv_avatar" />
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintTop_toTopOf="@id/iv_avatar"
+ android:layout_marginEnd="3dp"
+ android:text="*"
+ android:textColor="@color/red_main"
+ android:textSize="14sp"
+ android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
app:layout_constraintStart_toStartOf="@id/tv_dot"
- android:text="*"
- android:layout_marginEnd="3dp"
- android:textStyle="bold"
- android:textSize="14sp"
- android:textColor="@color/red_main"/>
+ app:layout_constraintTop_toTopOf="@id/iv_avatar" />
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@color/dividing_line_color"
android:layout_marginHorizontal="14dp"
android:layout_marginTop="9dp"
- app:layout_constraintTop_toBottomOf="@id/iv_avatar"/>
+ android:background="@color/dividing_line_color"
+ app:layout_constraintTop_toBottomOf="@id/iv_avatar" />
+
<EditText
- android:id="@+id/et_phone"
+ android:id="@+id/et_name"
+ style="@style/formTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/formTextView"
- app:layout_constraintTop_toBottomOf="@id/iv_avatar"
- android:hint="联系人手机号"
- android:textStyle="bold"
+ android:layout_marginStart="120dp"
+ android:layout_marginTop="10dp"
+ android:layout_marginEnd="14dp"
android:background="@null"
+ android:hint="真实姓名"
+ android:maxLength="10"
+ android:singleLine="true"
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@id/iv_avatar" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="姓名"
+ android:textColor="@color/textColor"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/et_name"
+ app:layout_constraintStart_toStartOf="@id/tv_1" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="3dp"
+ android:text="*"
+ android:textColor="@color/red_main"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/et_name"
+ app:layout_constraintStart_toStartOf="@id/tv_dot" />
+
+
+ <TextView
+ android:id="@+id/tv_sex"
+ style="@style/formTextView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="14dp"
+ android:drawableEnd="@mipmap/more_gray"
+ android:gravity="end"
+ android:hint="请选择"
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@id/et_name" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="26dp"
+ android:text="性别"
+ android:textColor="@color/textColor"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_sex"
+ app:layout_constraintStart_toStartOf="parent" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="*"
+ android:textColor="@color/red_main"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_sex"
+ app:layout_constraintStart_toStartOf="@id/tv_dot" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginHorizontal="14dp"
+ android:background="@color/dividing_line_color"
+ app:layout_constraintTop_toBottomOf="@id/tv_sex" />
+
+ <EditText
+ android:id="@+id/et_phone"
+ style="@style/formTextView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="120dp"
+ android:layout_marginEnd="14dp"
+ android:background="@null"
+ android:hint="联系人手机号"
android:inputType="number"
android:maxLength="11"
android:singleLine="true"
- android:layout_marginTop="10dp"
- android:layout_marginStart="120dp"
- android:layout_marginEnd="14dp"/>
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@id/tv_sex" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginHorizontal="14dp"
+ android:background="@color/dividing_line_color"
+ app:layout_constraintTop_toBottomOf="@id/et_name" />
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="联系电话"
- android:textStyle="bold"
- android:textSize="14sp"
android:textColor="@color/textColor"
- app:layout_constraintStart_toStartOf="@id/tv_1"
- app:layout_constraintBaseline_toBaselineOf="@id/et_phone"/>
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/et_phone"
+ app:layout_constraintStart_toStartOf="@id/tv_1" />
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintBaseline_toBaselineOf="@id/et_phone"
- app:layout_constraintStart_toStartOf="@id/tv_dot"
- android:text="*"
android:layout_marginEnd="3dp"
- android:textStyle="bold"
+ android:text="*"
+ android:textColor="@color/red_main"
android:textSize="14sp"
- android:textColor="@color/red_main"/>
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/et_phone"
+ app:layout_constraintStart_toStartOf="@id/tv_dot" />
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@color/dividing_line_color"
android:layout_marginHorizontal="14dp"
- app:layout_constraintTop_toBottomOf="@id/et_phone"/>
+ android:background="@color/dividing_line_color"
+ app:layout_constraintTop_toBottomOf="@id/et_phone" />
+
<EditText
android:id="@+id/et_phone_emergency"
+ style="@style/formTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/formTextView"
- app:layout_constraintTop_toBottomOf="@id/et_phone"
- android:hint="紧急联系人手机号"
- android:textStyle="bold"
+ android:layout_marginStart="120dp"
+ android:layout_marginTop="1dp"
+ android:layout_marginEnd="14dp"
android:background="@null"
+ android:hint="紧急联系人手机号"
android:inputType="number"
android:maxLength="11"
android:singleLine="true"
- android:layout_marginTop="1dp"
- android:layout_marginStart="120dp"
- android:layout_marginEnd="14dp"/>
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@id/et_phone" />
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="紧急联系人"
- android:textStyle="bold"
- android:textSize="14sp"
android:textColor="@color/textColor"
- app:layout_constraintStart_toStartOf="@id/tv_1"
- app:layout_constraintBaseline_toBaselineOf="@id/et_phone_emergency"/>
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/et_phone_emergency"
+ app:layout_constraintStart_toStartOf="@id/tv_1" />
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintBaseline_toBaselineOf="@id/et_phone_emergency"
- app:layout_constraintStart_toStartOf="@id/tv_dot"
- android:text="*"
android:layout_marginEnd="3dp"
- android:textStyle="bold"
+ android:text="*"
+ android:textColor="@color/red_main"
android:textSize="14sp"
- android:textColor="@color/red_main"/>
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/et_phone_emergency"
+ app:layout_constraintStart_toStartOf="@id/tv_dot" />
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@color/dividing_line_color"
android:layout_marginHorizontal="14dp"
- app:layout_constraintTop_toBottomOf="@id/et_phone_emergency"/>
+ android:background="@color/dividing_line_color"
+ app:layout_constraintTop_toBottomOf="@id/et_phone_emergency" />
+
+ <EditText
+ android:id="@+id/et_id_card"
+ style="@style/formTextView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="120dp"
+ android:layout_marginTop="1dp"
+ android:layout_marginEnd="14dp"
+ android:background="@null"
+ android:digits="@string/idCardDigits"
+ android:hint="身份证号码"
+ android:maxLength="18"
+ android:singleLine="true"
+ android:textStyle="bold"
+ app:layout_constraintTop_toBottomOf="@id/et_phone_emergency" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="身份证号"
+ android:textColor="@color/textColor"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/et_id_card"
+ app:layout_constraintStart_toStartOf="@id/tv_1" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="3dp"
+ android:text="*"
+ android:textColor="@color/red_main"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/et_id_card"
+ app:layout_constraintStart_toStartOf="@id/tv_dot" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginHorizontal="14dp"
+ android:background="@color/dividing_line_color"
+ app:layout_constraintTop_toBottomOf="@id/et_id_card" />
+
<TextView
android:id="@+id/tv_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="13dp"
android:text="身份证"
- android:textStyle="bold"
- android:textSize="14sp"
android:textColor="@color/textColor"
+ android:textSize="14sp"
+ android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/tv_1"
- app:layout_constraintTop_toBottomOf="@id/et_phone_emergency"
- android:layout_marginTop="13dp"/>
+ app:layout_constraintTop_toBottomOf="@id/et_id_card" />
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintBaseline_toBaselineOf="@id/tv_2"
- app:layout_constraintStart_toStartOf="@id/tv_dot"
- android:text="*"
android:layout_marginEnd="3dp"
- android:textStyle="bold"
+ android:text="*"
+ android:textColor="@color/red_main"
android:textSize="14sp"
- android:textColor="@color/red_main"/>
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_2"
+ app:layout_constraintStart_toStartOf="@id/tv_dot" />
+
<com.facebook.drawee.view.SimpleDraweeView
- android:layout_width="157dp"
- android:layout_height="137dp"
android:id="@+id/iv_front"
- app:layout_constraintTop_toBottomOf="@id/tv_2"
- app:layout_constraintStart_toStartOf="parent"
- android:layout_marginStart="17dp"
- app:placeholderImage="@mipmap/ic_front"
- app:placeholderImageScaleType="fitXY"
- android:layout_marginTop="14dp"/>
- <com.facebook.drawee.view.SimpleDraweeView
android:layout_width="157dp"
android:layout_height="137dp"
- android:id="@+id/iv_back"
+ android:layout_marginStart="17dp"
+ android:layout_marginTop="14dp"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_2"
- app:layout_constraintStart_toEndOf="@id/iv_front"
+ app:placeholderImage="@mipmap/ic_front"
+ app:placeholderImageScaleType="fitXY" />
+
+ <com.facebook.drawee.view.SimpleDraweeView
+ android:id="@+id/iv_back"
+ android:layout_width="157dp"
+ android:layout_height="137dp"
+ android:layout_marginTop="14dp"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/iv_front"
+ app:layout_constraintTop_toBottomOf="@id/tv_2"
app:placeholderImage="@mipmap/ic_back"
- app:placeholderImageScaleType="fitXY"
- android:layout_marginTop="14dp"/>
+ app:placeholderImageScaleType="fitXY" />
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@color/dividing_line_color"
android:layout_marginHorizontal="14dp"
android:layout_marginTop="14dp"
- app:layout_constraintTop_toBottomOf="@id/iv_front"/>
+ android:background="@color/dividing_line_color"
+ app:layout_constraintTop_toBottomOf="@id/iv_front" />
+
<TextView
android:id="@+id/tv_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="28dp"
android:text="驾驶证"
- android:textStyle="bold"
- android:textSize="14sp"
android:textColor="@color/textColor"
+ android:textSize="14sp"
+ android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/tv_1"
- app:layout_constraintTop_toBottomOf="@id/iv_front"
- android:layout_marginTop="28dp"/>
+ app:layout_constraintTop_toBottomOf="@id/iv_front" />
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintBaseline_toBaselineOf="@id/tv_3"
- app:layout_constraintStart_toStartOf="@id/tv_dot"
- android:text="*"
android:layout_marginEnd="3dp"
- android:textStyle="bold"
+ android:text="*"
+ android:textColor="@color/red_main"
android:textSize="14sp"
- android:textColor="@color/red_main"/>
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_3"
+ app:layout_constraintStart_toStartOf="@id/tv_dot" />
+
<com.facebook.drawee.view.SimpleDraweeView
+ android:id="@+id/iv_license"
android:layout_width="157dp"
android:layout_height="137dp"
- android:id="@+id/iv_license"
- app:layout_constraintTop_toBottomOf="@id/tv_3"
- app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="17dp"
+ android:layout_marginTop="14dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tv_3"
app:placeholderImage="@mipmap/ic_license"
- app:placeholderImageScaleType="fitXY"
- android:layout_marginTop="14dp"/>
+ app:placeholderImageScaleType="fitXY" />
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@color/dividing_line_color"
android:layout_marginHorizontal="14dp"
android:layout_marginTop="14dp"
- app:layout_constraintTop_toBottomOf="@id/iv_license"/>
+ android:background="@color/dividing_line_color"
+ app:layout_constraintTop_toBottomOf="@id/iv_license" />
+
+ <TextView
+ android:id="@+id/tv_date"
+ style="@style/formTextView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="14dp"
+ android:layout_marginEnd="14dp"
+ android:drawableEnd="@mipmap/more_gray"
+ android:gravity="end"
+ android:hint="请选择"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginBottom="20dp"
+ app:layout_constraintTop_toBottomOf="@id/iv_license" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="26dp"
+ android:text="初次领证日期"
+ android:textColor="@color/textColor"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_date"
+ app:layout_constraintStart_toStartOf="parent" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="3dp"
+ android:text="*"
+ android:textColor="@color/red_main"
+ android:textSize="14sp"
+ android:textStyle="bold"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_date"
+ app:layout_constraintStart_toStartOf="@id/tv_dot" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginHorizontal="14dp"
+ android:background="@color/dividing_line_color"
+ app:layout_constraintTop_toBottomOf="@id/tv_date" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<TextView
android:id="@+id/tv_action"
android:layout_width="match_parent"
- android:text="提交审核"
- android:textColor="#ffffffff"
- android:gravity="center"
+ android:layout_height="48dp"
android:layout_marginStart="14dp"
android:layout_marginEnd="14dp"
android:layout_marginBottom="14dp"
- app:layout_constraintBottom_toBottomOf="parent"
android:background="@drawable/bg_login"
+ android:gravity="center"
+ android:text="提交审核"
+ android:textColor="#ffffffff"
android:textSize="14sp"
- android:layout_height="48dp"/>
+ app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_sex_show.xml b/app/src/main/res/layout/dialog_sex_show.xml
index 2302eaa..e9f7cee 100644
--- a/app/src/main/res/layout/dialog_sex_show.xml
+++ b/app/src/main/res/layout/dialog_sex_show.xml
@@ -35,30 +35,30 @@
android:paddingStart="20dp"
android:paddingBottom="10dp"
android:paddingEnd="17dp"
- android:textColor="#87B062"
+ android:textColor="@color/main_yellow_qia"
android:textSize="14sp"
/>
<TextView
- android:id="@+id/tv_select_girl"
+ android:id="@+id/tv_select_boy"
android:layout_width="match_parent"
android:layout_height="36dp"
android:layout_below="@+id/tv_ok_sex"
- android:text="女"
- android:alpha="0.6"
+ android:text="男"
android:gravity="center"
- android:textColor="#ff000000"
+ android:textColor="@color/textColor"
android:textSize="16sp"
/>
<TextView
- android:id="@+id/tv_select_boy"
- android:layout_below="@+id/tv_select_girl"
+ android:id="@+id/tv_select_girl"
+ android:layout_below="@+id/tv_select_boy"
android:layout_width="match_parent"
android:layout_height="36dp"
- android:text="男"
+ android:text="女"
+ android:alpha="0.6"
android:gravity="center"
- android:textColor="@color/main_yellow"
+ android:textColor="@color/textColor66"
android:textSize="16sp"
/>
--
Gitblit v1.7.1