Skip to content

Y
YDL-Component-Medical
Commit 152c449b by 刘鹏
Options

feat : 问题修复

parent b1b23b76
Showing with 33 additions and 26 deletions
config.gradle
......@@ -8,9 +8,9 @@ ext {
"m-confide" : "0.0.49.10",
"m-consultant" : "0.0.59.91",
"m-fm" : "0.0.30.03",
"m-user" : "0.0.61.88",
"m-user" : "0.0.61.89",
"m-home" : "0.0.22.70",
"m-im" : "0.0.20.67",
"m-im" : "0.0.20.68",
"m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.10",
......@@ -92,9 +92,9 @@ ext {
"m-confide" : "0.0.49.10",
"m-consultant" : "0.0.59.91",
"m-fm" : "0.0.30.01",
"m-user" : "0.0.61.88",
"m-user" : "0.0.61.89",
"m-home" : "0.0.22.70",
"m-im" : "0.0.20.67",
"m-im" : "0.0.20.68",
"m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.8",
......
m-im/src/main/java/com/yidianling/medical/GraphicConsultationFlow1Activity.kt
......@@ -162,7 +162,7 @@ class GraphicConsultationFlow1Activity : BaseActivity() {
val inputNumber = edit_input.text.length
if (inputNumber < 10) {
var mustInput = (10 - inputNumber).toString()
var strStart = "最少还需描写"
var strStart = "最少还需描述"
var strEnd = "个字"
val spannable =
SpannableStringBuilder(strStart + mustInput + strEnd)
......
m-im/src/main/java/com/yidianling/medical/GraphicConsulttionFlow2Activity.kt
......@@ -39,7 +39,7 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
private var mFlow1Activity: BaseActivity? = null
//是否是首次问诊
private var isFirst = -1
private var isFirst = 1
/**
......
m-im/src/main/java/com/yidianling/medical/archives/MedicalAddNewArchivesActivity.kt
......@@ -133,24 +133,24 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
@SuppressLint("CheckResult")
private fun checkInfo() {
if (et_name.text.isNullOrEmpty()) {
ToastUtil.toastLong(this@MedicalAddNewArchivesActivity, "请填写姓名")
ToastUtil.toastShort("请填写姓名")
return
}
if (et_idcard.text.isNullOrEmpty()) {
ToastUtil.toastLong(this@MedicalAddNewArchivesActivity, "请填写身份证号")
ToastUtil.toastShort("请填写身份证号")
return
}
if (et_idcard.text.length < 15 || et_idcard.text.length > 18) {
ToastUtil.toastLong(this@MedicalAddNewArchivesActivity, "请填写有效身份证号")
ToastUtil.toastShort("请填写有效身份证号")
return
}
if (mMarried == -1) {
ToastUtil.toastLong(this@MedicalAddNewArchivesActivity, "请选择婚姻状况")
ToastUtil.toastShort("请选择婚姻状况")
return
}
if (mRelation == -1) {
ToastUtil.toastLong(this@MedicalAddNewArchivesActivity, "请选择与就诊人的关系")
ToastUtil.toastShort("请选择与就诊人的关系")
return
}
......
m-im/src/main/res/drawable/medical_bg_edit_f2f5f8.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#fff2f5f8" />
<solid android:color="#fff6f7f9" />
<corners android:radius="4dp" />
</shape>
\ No newline at end of file
m-im/src/main/res/drawable/medical_list_check_bg.xml
......@@ -4,6 +4,6 @@
<stroke
android:width="1px"
android:color="#ff3464ec" />
<solid android:color="#f2f5f8" />
<solid android:color="#f6f7f9" />
<corners android:radius="4dp" />
</shape>
\ No newline at end of file
m-im/src/main/res/drawable/radiobutton_background_checked.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/medical_color_3464ec"/>
<corners android:radius="4dp"/>
<stroke android:width="1dp" android:color="@color/medical_color_3464ec" />
<corners android:radius="4dp" />
</shape>
\ No newline at end of file
m-im/src/main/res/drawable/radiobutton_textcolor.xml
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/white" android:state_checked="true" />
<item android:color="@color/medical_color_3464ec" android:state_checked="true" />
<item android:color="#495C72" android:state_checked="false" />
</selector>
\ No newline at end of file
m-im/src/main/res/layout/medical_add_new_archives_activity.xml
......@@ -306,7 +306,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="2.根据相关政策，现就诊人及监护人需进行实名认证，请您及时认证，以便使用平台的服务功能"
android:text="2.根据相关政策，现就诊人及监护人需进行实名认证，请您及时认证，以便使用平台的服务功能。"
android:textColor="#ff495c72"
android:textSize="13sp"
app:layout_constraintLeft_toLeftOf="@id/tv_name"
......
m-im/src/main/res/layout/medical_edit_archives_activity.xml
......@@ -202,7 +202,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="2.根据相关政策，现就诊人及监护人需进行实名认证，请您及时认证，以便使用平台的服务功能"
android:text="2.根据相关政策，现就诊人及监护人需进行实名认证，请您及时认证，以便使用平台的服务功能。"
android:textColor="#ff495c72"
android:textSize="13sp"
app:layout_constraintLeft_toLeftOf="@id/tv_name"
......
m-im/src/main/res/layout/medical_graphic_consultation_flow2.xml
......@@ -213,6 +213,7 @@
android:background="@drawable/radiobutton_bg"
android:button="@null"
android:gravity="center"
android:checked="true"
android:text="是"
android:textColor="@drawable/radiobutton_textcolor" />
......
m-user/src/main/java/com/yidianling/user/ui/login/InputPassWordActivity.kt
......@@ -237,14 +237,14 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
}
tv_forget.setOnClickListener {
//忘记密码
VerificationCodeActivity.start(
this,
userPhoneNumber!!,
countryCode!!,
VerificationCodeActivity.STATUS_FORGET_PWD
)
overridePendingTransition(0, 0)
//忘记密码 隐藏
// VerificationCodeActivity.start(
// this,
// userPhoneNumber!!,
// countryCode!!,
// VerificationCodeActivity.STATUS_FORGET_PWD
// )
// overridePendingTransition(0, 0)
}
}
......
m-user/src/main/res/layout/user_activity_input_password_new.xml
......@@ -92,6 +92,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="忘记密码?"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/tv_msm_login"
app:layout_constraintEnd_toEndOf="@id/view_lin"
app:layout_constraintTop_toTopOf="@id/tv_msm_login"/>
......
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