Skip to content

Y
YDL-Component-Medical
Commit 94d4d3d6 by 王佳洋
Options

UI调整

parent 09d2b114
Showing with 55 additions and 48 deletions
m-user/src/main/java/com/yidianling/user/mine/ModifyInfoActivity.kt
......@@ -91,7 +91,7 @@ class ModifyInfoActivity : BaseActivity() {
.observeOn(AndroidSchedulers.mainThread())
.subscribe { response: BaseAPIResponse<UserModifyAuditRespDto> ->
if (response.code != "200") return@subscribe
val (_, auditStatus, _, _, _, _, _, last7Day, modifyAfter) = response.data
val (auditReason, auditStatus, _, _, _, _, _, last7Day, modifyAfter) = response.data
if (NICKNAME == from) {
when (auditStatus) {
1 -> { // 审核中
......@@ -108,7 +108,7 @@ class ModifyInfoActivity : BaseActivity() {
checkNickSaveButton(userInfo)
det_set_info.setText(userInfo.nick_name)
iv_warn.visible()
customerService("审核失败 ，昵称中含有违规文字。如有疑问联系客服小壹")
customerService("审核失败 ，$auditReason。如有疑问联系客服小壹")
}
3 -> { // 审核成功 || 提交审核
modifyAfter?.let { nick ->
......@@ -140,7 +140,7 @@ class ModifyInfoActivity : BaseActivity() {
setCanSave()
det_set_info.setText(userInfo.description)
iv_warn.visible()
customerService("审核失败，简介中含违规文字如有疑问联系客服小壹")
customerService("审核失败，$auditReason。如有疑问联系客服小壹")
}
3 -> { // 审核成功 || 提交审核
modifyAfter?.let {
......@@ -162,7 +162,7 @@ class ModifyInfoActivity : BaseActivity() {
tv_tip2.text = SpannableString(tip).also {
it.setSpan(
ForegroundColorSpan(resources.getColor(R.color.color_1DA1F2)),
it.indexOf("客服"),
it.lastIndexOf("客服"),
it.length,
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
)
......
m-user/src/main/res/layout/activity_modify_avatar.xml
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="#E6000000"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:background="#E6000000">
<com.ydl.ydlcommon.view.TitleBar
android:id="@+id/tip_bar"
app:layout_constraintTop_toTopOf="parent"
android:layout_width="match_parent"
android:layout_height="44dp"
app:layout_constraintTop_toTopOf="parent"
app:pa_divide_visibility="false"
app:pa_left_start_icon="@drawable/platform_common_back_un"
app:pa_title_text="头像"
app:pa_title_bar_text_color="@android:color/white"
app:pa_divide_visibility="false"/>
app:pa_title_text="头像" />
<TextView
android:id="@id/tv_tip1"
app:layout_constraintBottom_toTopOf="@id/iv_avatar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/color_62636F"
android:layout_marginBottom="12dp"
android:gravity="center"
android:textColor="@color/color_62636F"
android:textSize="12sp"
tools:text="抱歉，七天内只能修改一次头像"/>
app:layout_constraintBottom_toTopOf="@id/iv_avatar"
tools:text="抱歉，七天内只能修改一次头像" />
<ImageView
android:id="@+id/iv_avatar"
android:layout_marginBottom="20dp"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginBottom="50dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"/>
<ImageView
android:id="@+id/iv_warn"
android:layout_width="12dp"
android:layout_height="12dp"
app:layout_constraintEnd_toStartOf="@id/tv_tip2"
app:layout_constraintTop_toTopOf="@id/tv_tip2"
android:layout_marginEnd="3dp"
android:layout_marginTop="3.5dp"
android:visibility="gone"
tools:visibility="visible"
android:src="@drawable/modify_warn"/>
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_tip2"
android:layout_marginTop="12dp"
android:layout_marginStart="6dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_avatar"
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="12sp"
android:gravity="center"
android:textColor="@color/color_C3C4CA"
tools:text="审核失败，该头像提交不规范，请修改后重新提交审核。\n如有疑问联系客服小壹"/>
android:layout_marginTop="12dp"
android:gravity="center_horizontal"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
app:layout_constraintTop_toBottomOf="@id/iv_avatar">
<ImageView
android:id="@+id/iv_warn"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginTop="3.5dp"
android:layout_marginEnd="3dp"
android:src="@drawable/modify_warn"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_tip2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/iv_warn"
android:gravity="center_horizontal"
android:textColor="@color/color_C3C4CA"
android:textSize="12sp"
tools:text="审核失败，XXX。如有疑问联系客服小壹" />
</RelativeLayout>
<TextView
android:id="@+id/tv_modify"
android:layout_width="333dp"
android:layout_height="54dp"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginBottom="50dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:gravity="center"
android:textSize="18sp"
android:background="@drawable/bg_1da1f2_corner_8"
android:gravity="center"
android:text="修改头像"
android:textColor="@android:color/white"
android:text="修改头像"/>
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
m-user/src/main/res/layout/activity_modify_info.xml
......@@ -47,7 +47,6 @@
<LinearLayout
android:layout_marginTop="12dp"
android:layout_marginStart="26dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
......@@ -56,14 +55,16 @@
android:id="@+id/iv_warn"
android:visibility="gone"
tools:visibility="visible"
android:layout_marginStart="26dp"
android:layout_width="12dp"
android:layout_marginTop="3dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:src="@drawable/modify_warn"/>
<TextView
android:id="@+id/tv_tip2"
android:layout_marginEnd="26dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/color_9d9ea7"
......
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