Commit 695d689c by 刘鹏

feat : 2.0.1UI验收完毕

parent 152c449b
...@@ -10,7 +10,7 @@ ext { ...@@ -10,7 +10,7 @@ ext {
"m-fm" : "0.0.30.03", "m-fm" : "0.0.30.03",
"m-user" : "0.0.61.89", "m-user" : "0.0.61.89",
"m-home" : "0.0.22.70", "m-home" : "0.0.22.70",
"m-im" : "0.0.20.68", "m-im" : "0.0.20.71",
"m-dynamic" : "0.0.7.28", "m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.10", "m-article" : "0.0.0.10",
...@@ -94,7 +94,7 @@ ext { ...@@ -94,7 +94,7 @@ ext {
"m-fm" : "0.0.30.01", "m-fm" : "0.0.30.01",
"m-user" : "0.0.61.89", "m-user" : "0.0.61.89",
"m-home" : "0.0.22.70", "m-home" : "0.0.22.70",
"m-im" : "0.0.20.68", "m-im" : "0.0.20.71",
"m-dynamic" : "0.0.7.28", "m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.8", "m-article" : "0.0.0.8",
......
...@@ -3,7 +3,6 @@ package com.yidianling.medical.archives ...@@ -3,7 +3,6 @@ package com.yidianling.medical.archives
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.view.View
import com.ydl.ydlcommon.base.BaseActivity import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.utils.StatusBarUtils import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.view.dialog.NormalDialog import com.ydl.ydlcommon.view.dialog.NormalDialog
...@@ -107,29 +106,34 @@ class MedicalAddNewArchivesActivity : BaseActivity() { ...@@ -107,29 +106,34 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
showDialogTip() showDialogTip()
} }
private fun showDialogTip() { private fun showDialogTip() {
val builder = NormalDialog.Builder(this@MedicalAddNewArchivesActivity, "center", false) val builder = NormalDialog.Builder(this@MedicalAddNewArchivesActivity, "center", false)
builder.setTitle("") builder.setTitle("")
builder.setMessage("\n为向您添加的就诊人提供问诊服务,您需要向我们提供该就诊人的身份证号码,并确保在提供前已取得该就诊人的授权同意;若该就诊人为儿童的,您需要在提供前征得该儿童监护人的同意。\n") builder.setMessage("\n为向您添加的就诊人提供问诊服务,您需要向我们提供该就诊人的身份证号码,并确保在提供前已取得该就诊人的授权同意;若该就诊人为儿童的,您需要在提供前征得该儿童监护人的同意。\n")
builder.setMessageEndBold("\n为向您添加的就诊人提供问诊服务,您需要向我们提供该","就诊人的身份证号码,并确保在提供前已取得该就诊人的授权同意;若该就诊人为儿童的,您需要在提供前征得该儿童监护人的同意。\n") builder.setMessageEndBold(
"\n为向您添加的就诊人提供问诊服务,您需要向我们提供该",
"就诊人的身份证号码,并确保在提供前已取得该就诊人的授权同意;若该就诊人为儿童的,您需要在提供前征得该儿童监护人的同意。\n"
)
builder.setPositiveButton( builder.setPositiveButton(
"同意" "同意"
) { dialog, which -> ) { dialog, which ->
//关闭页面
finish()
dialog.dismiss() dialog.dismiss()
}.setNegativeButton( }.setNegativeButton(
"同意" "同意"
) { dialog, which -> ) { dialog, which ->
//关闭页面
finish()
dialog.dismiss() dialog.dismiss()
} }
builder.setRight_color("#3464EC") builder.setRight_color("#3464EC")
builder.setLeft_color("#3464EC") builder.setLeft_color("#8595A9")
builder.setContent_color("#10233A") builder.setContent_color("#10233A")
builder.create().show() builder.create().show()
} }
@SuppressLint("CheckResult") @SuppressLint("CheckResult")
private fun checkInfo() { private fun checkInfo() {
if (et_name.text.isNullOrEmpty()) { if (et_name.text.isNullOrEmpty()) {
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/platform_dp_12" android:layout_marginTop="@dimen/platform_dp_12"
android:background="#80d7dfea" android:background="#cce7ecf0"
app:cardBackgroundColor="#80d7dfea" app:cardBackgroundColor="#cce7ecf0"
android:elevation="0dp" android:elevation="0dp"
android:maxWidth="263dp" android:maxWidth="263dp"
android:minWidth="263dp" android:minWidth="263dp"
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1px" android:layout_height="1px"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:background="@color/medical_color_c0c9d4" android:background="@color/medical_color_e7ecf0"
app:layout_constraintHorizontal_weight="1" app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="问诊详情" android:text="问诊详情"
android:textColor="#ff8595a9" android:textColor="#ff8595a9"
android:textSize="16sp" android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="@id/tv_title" app:layout_constraintLeft_toLeftOf="@id/tv_title"
app:layout_constraintTop_toBottomOf="@id/line_center" /> app:layout_constraintTop_toBottomOf="@id/line_center" />
......
...@@ -63,12 +63,13 @@ ...@@ -63,12 +63,13 @@
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintLeft_toRightOf="@id/card_img" app:layout_constraintLeft_toRightOf="@id/card_img"
app:layout_constraintTop_toTopOf="@id/card_img" app:layout_constraintTop_toTopOf="@id/card_img"
tools:text="林小丽" /> tools:text="林小丽林小" />
<TextView <TextView
android:id="@+id/chat_message_tab" android:id="@+id/chat_message_tab"
android:layout_width="wrap_content" android:layout_width="0dp"
app:layout_constraintHorizontal_weight="1"
android:gravity="left"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="6dp" android:layout_marginLeft="6dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
...@@ -79,6 +80,7 @@ ...@@ -79,6 +80,7 @@
android:visibility="gone" android:visibility="gone"
app:layout_constraintBaseline_toBaselineOf="@id/chat_message_name" app:layout_constraintBaseline_toBaselineOf="@id/chat_message_name"
app:layout_constraintLeft_toRightOf="@id/chat_message_name" app:layout_constraintLeft_toRightOf="@id/chat_message_name"
app:layout_constraintRight_toLeftOf="@id/chat_message_time"
tools:text="高级心理咨询师" tools:text="高级心理咨询师"
tools:visibility="visible" /> tools:visibility="visible" />
......
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
<corners android:radius="8dp" /> <corners android:radius="8dp" />
<solid android:color="#F6FAFF" /> <solid android:color="#F6F7F9" />
</shape> </shape>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
android:hint="隐私保密,安心咨询" android:hint="隐私保密,安心咨询"
android:layout_weight="1" android:layout_weight="1"
android:autoLink="all" android:autoLink="all"
android:background="#F6FAFF" android:background="#F6F7F9"
android:maxHeight="72dp" android:maxHeight="72dp"
android:maxLines="4" android:maxLines="4"
android:textColorHint="#CCCCCC" android:textColorHint="#CCCCCC"
......
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