Commit 36f4abc2 by 霍志良

feat:修改

parent 44b9412e
......@@ -10,7 +10,7 @@ ext {
"m-fm" : "0.0.30.03",
"m-user" : "0.0.61.84",
"m-home" : "0.0.22.70",
"m-im" : "0.0.20.55",
"m-im" : "0.0.20.58",
"m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.10",
......@@ -94,7 +94,7 @@ ext {
"m-fm" : "0.0.30.01",
"m-user" : "0.0.61.84",
"m-home" : "0.0.22.70",
"m-im" : "0.0.20.55",
"m-im" : "0.0.20.58",
"m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.8",
......
......@@ -159,31 +159,6 @@ class GraphicConsultationFlow1Activity : BaseActivity() {
iv_back.setOnClickListener {
backCheck()
}
showDialogTip()
}
private fun showDialogTip() {
val builder = NormalDialog.Builder(this@GraphicConsultationFlow1Activity, "center", true)
builder.setTitle("")
builder.setMessage("\n为向您添加的就诊人提供问诊服务,您需要向我们提供该就诊人的身份证号码,并确保在提供前已取得该就诊人的授权同意;若该就诊人为儿童的,您需要在提供前征得该儿童监控人的同意。\n")
builder.setPositiveButton(
"不同意"
) { dialog, which ->
//关闭页面
finish()
dialog.dismiss()
}.setNegativeButton(
"同意"
) { dialog, which ->
dialog.dismiss()
}
builder.setRight_color("#3464EC")
builder.setLeft_color("#3464EC")
builder.setContent_color("#10233A")
builder.create().show()
}
@SuppressLint("CheckResult")
......
......@@ -3,8 +3,10 @@ package com.yidianling.medical.archives
import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.view.View
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.view.dialog.NormalDialog
import com.yidianling.common.tools.ToastUtil
import com.yidianling.im.R
import com.yidianling.uikit.custom.http.ServiceImpl
......@@ -103,9 +105,30 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
iv_back.setOnClickListener { finish() }
showDialogTip()
}
private fun showDialogTip() {
val builder = NormalDialog.Builder(this@MedicalAddNewArchivesActivity, "center", false)
builder.setTitle("")
builder.setMessage("\n为向您添加的就诊人提供问诊服务,您需要向我们提供该就诊人的身份证号码,并确保在提供前已取得该就诊人的授权同意;若该就诊人为儿童的,您需要在提供前征得该儿童监护人的同意。\n")
builder.setPositiveButton(
"不同意"
) { dialog, which ->
//关闭页面
finish()
dialog.dismiss()
}.setNegativeButton(
"同意"
) { dialog, which ->
dialog.dismiss()
}
builder.setRight_color("#3464EC")
builder.setLeft_color("#3464EC")
builder.setContent_color("#10233A")
builder.create().show()
}
@SuppressLint("CheckResult")
private fun checkInfo() {
if (et_name.text.isNullOrEmpty()) {
......
......@@ -104,7 +104,7 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ response ->
if ("200" == response.code) {
if ("200" == response.code) {
doctor_swipe_refresh_layout.isRefreshing = false
var list = response.data.rows
......@@ -124,10 +124,10 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh
}
} else {
mAdapter.loadMoreEnd(false)
mAdapter.setNewData(list)
var net_error= mEmptyView.findViewById<TextView>(R.id.net_error)
net_error.text="暂无数据"
net_error.text="暂无就诊人信息,请添加~"
mAdapter.emptyView = mEmptyView
}
} else {
//非第一页数据
......
......@@ -26,7 +26,7 @@
android:gravity="center"
android:maxEms="10"
android:maxLines="1"
android:text="新增诊人"
android:text="新增诊人"
android:textColor="@color/medical_color_10233a"
android:textSize="18sp"
android:textStyle="bold" />
......@@ -197,7 +197,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="与诊人的关系"
android:text="与诊人的关系"
android:textColor="#ff0c1d31"
android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="@id/tv_name"
......
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