Skip to content

Y
YDL-Component-Medical
Commit 7538c193 by 刘鹏
Options

feat : 医疗2.0.1版本内容提交

parent 44b9412e
Showing with 171 additions and 59 deletions
m-im/src/main/java/com/yidianling/medical/GraphicConsultationFlow1Activity.kt
......@@ -6,7 +6,10 @@ import android.content.Intent
import android.os.Bundle
import android.os.Parcelable
import android.text.Editable
import android.text.SpannableStringBuilder
import android.text.Spanned
import android.text.TextWatcher
import android.text.style.ForegroundColorSpan
import android.view.View
import androidx.recyclerview.widget.GridLayoutManager
import com.luck.picture.lib.entity.LocalMedia
......@@ -136,17 +139,7 @@ class GraphicConsultationFlow1Activity : BaseActivity() {
@SuppressLint("SetTextI18n")
override fun afterTextChanged(s: Editable?) {
val inputNumber = edit_input.text.length.toString()
input_num.text = "$inputNumber/200"
if (edit_input.text.isNotEmpty()) {
text_service.setBackgroundResource(R.drawable.bg_doctor_detail_bottom)
text_service.isEnabled = true
} else {
text_service.setBackgroundResource(R.drawable.medical_bg_d7dfea_8dp)
text_service.isEnabled = false
}
setEditHint()
}
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
......@@ -161,6 +154,30 @@ class GraphicConsultationFlow1Activity : BaseActivity() {
}
showDialogTip()
setEditHint()
}
/**
* 设置输入框提示文字
* */
private fun setEditHint() {
val inputNumber = edit_input.text.length
if (inputNumber < 10) {
var mustInput = (10 - inputNumber).toString()
var strStart = "最少还需描写"
var strEnd = "个字"
val spannable =
SpannableStringBuilder(strStart + mustInput + strEnd)
spannable.setSpan(
ForegroundColorSpan(resources.getColor(R.color.medical_color_ff7766)),
strStart.length,
strStart.length + mustInput.length,
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
)
input_num.text = spannable
} else {
input_num.text = "${inputNumber}/200"
}
}
private fun showDialogTip() {
......
m-im/src/main/java/com/yidianling/medical/GraphicConsulttionFlow2Activity.kt
......@@ -98,6 +98,11 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
baseQuickAdapter.notifyDataSetChanged()
}
}
empty.setOnClickListener {
//空数据页面
isFirstLoadData = false
MedicalAddNewArchivesActivity.start(this@GraphicConsulttionFlow2Activity)
}
radio_first_mit.setOnCheckedChangeListener { group, checkedId ->
//婚姻状态
......@@ -131,12 +136,13 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
informed_consent_text.setOnClickListener {
//协议内容
var collectOutPop = InformedConsentPopupWindow(this,object :InformedConsentPopupWindow.OnChatSettingClickListener{
override fun onDismissAction() {
setWindowBg(1f)
}
var collectOutPop = InformedConsentPopupWindow(this,
object : InformedConsentPopupWindow.OnChatSettingClickListener {
override fun onDismissAction() {
setWindowBg(1f)
}
})
})
collectOutPop?.contentView!!.measure(
View.MeasureSpec.UNSPECIFIED,
View.MeasureSpec.UNSPECIFIED
......@@ -254,13 +260,33 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
mAdapter.setNewData(mList as List<MedicalArchivesListBean?>?)
mAdapter.notifyDataSetChanged()
if (mAdapter.data.size > 1) {
mAdapter.data[0]?.isCheck = true
rv_people_list.visibility = View.VISIBLE
empty.visibility = View.GONE
} else {
rv_people_list.visibility = View.GONE
empty.visibility = View.VISIBLE
}
} else {
mList.add(MedicalArchivesListBean(true))
mAdapter.notifyDataSetChanged()
if (mAdapter.data.size > 1) {
rv_people_list.visibility = View.VISIBLE
empty.visibility = View.GONE
} else {
rv_people_list.visibility = View.GONE
empty.visibility = View.VISIBLE
}
}
}, { e ->
if (mAdapter.data.size > 1) {
rv_people_list.visibility = View.VISIBLE
empty.visibility = View.GONE
} else {
rv_people_list.visibility = View.GONE
empty.visibility = View.VISIBLE
}
})
}
......
m-im/src/main/java/com/yidianling/medical/archives/MedicalAddNewArchivesActivity.kt
......@@ -126,7 +126,7 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
return
}
if (mRelation == -1) {
ToastUtil.toastLong(this@MedicalAddNewArchivesActivity, "请选择与患者的关系")
ToastUtil.toastLong(this@MedicalAddNewArchivesActivity, "请选择与就诊人的关系")
return
}
......
m-im/src/main/java/com/yidianling/uikit/business/session/activity/YDLP2PMessageActivity.java
......@@ -224,7 +224,7 @@ public class YDLP2PMessageActivity extends YDLBaseMessageActivity {
try {
Type91Bean type91Bean = new Gson().fromJson(content, Type91Bean.class);
if (type91Bean.getType() == MESSAGE_TYPE) {
messageFragment.upReceiceType(type91Bean.getData().getStatus());
messageFragment.upReceiceType(type91Bean.getData().getStatus(),type91Bean.getData().getStatusName());
}
} catch (Exception e) {
......
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
......@@ -12,6 +12,7 @@ import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
import androidx.constraintlayout.widget.ConstraintLayout;
......@@ -138,6 +139,12 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
protected AitManager aitManager;
private ConstraintLayout top_expert_info_ll;
//待接诊文案
private TextView tv_receive_unstart;
//待诊断
private TextView tv_receive_undiagnosis;
//诊断结束
private TextView tv_receive_end;
private int expertInfoViewHeight = 0; // 专家信息栏高度
private RecyclerView messageListView;
......@@ -165,6 +172,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
ll_actions_yi = rootView.findViewById(R.id.ll_actions_yi);
//顶部问诊状态 客服icon
top_expert_info_ll = rootView.findViewById(R.id.top_expert_info_ll);
tv_receive_unstart = rootView.findViewById(R.id.tv_receive_unstart);
tv_receive_undiagnosis = rootView.findViewById(R.id.tv_receive_undiagnosis);
tv_receive_end = rootView.findViewById(R.id.tv_receive_end);
// 消息列表
messageListView = rootView.findViewById(R.id.messageListView);
constraint_ll = rootView.findViewById(R.id.constraint_ll);
......@@ -470,7 +480,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
.observeOn(AndroidSchedulers.mainThread())
.subscribe(response -> {
if ("200".equals(response.code)) {
upReceiceType(response.data.getStatus());
upReceiceType(response.data.getStatus(), "");
} else {
ToastUtil.toastShort(response.msg);
......@@ -489,7 +499,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
}
public void upReceiceType(int type) {
public void upReceiceType(int type, String statusName) {
if (ActionHandlerStorage.getL(sessionId).getUserType() == USER_TYPE_EXPERT) {
if (type == 30) {
// 30:待诊断(已接诊、问诊中)
......@@ -498,6 +508,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
receive_undiagnosis.setVisibility(View.VISIBLE);
receive_unstart.setVisibility(View.GONE);
receive_end.setVisibility(View.GONE);
if (!TextUtils.isEmpty(statusName)) {
tv_receive_undiagnosis.setText(statusName);
}
} else if (type == 20) {
//待接诊
......@@ -506,8 +519,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
receive_undiagnosis.setVisibility(View.GONE);
receive_unstart.setVisibility(View.VISIBLE);
receive_end.setVisibility(View.GONE);
if (!TextUtils.isEmpty(statusName)) {
tv_receive_unstart.setText(statusName);
}
} else if (type == 40) {
//已完成
inputPanel.setVisible(false);
......@@ -515,7 +529,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
receive_undiagnosis.setVisibility(View.GONE);
receive_unstart.setVisibility(View.GONE);
receive_end.setVisibility(View.VISIBLE);
if (!TextUtils.isEmpty(statusName)) {
tv_receive_end.setText(statusName);
}
} else {
top_expert_info_ll.setVisibility(View.GONE);
inputPanel.setVisible(false);
......
m-im/src/main/res/drawable/im_chat_is_top_bg.xml
......@@ -3,6 +3,6 @@
android:shape="rectangle">
<solid
android:color="#F0F4F8"/>
android:color="#F6F7F9"/>
</shape>
\ No newline at end of file
m-im/src/main/res/layout/im_chat_time_item_view.xml
......@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="30dp"
android:background="#F0F4F8">
android:background="#F6F7F9">
<TextView
android:layout_width="wrap_content"
......
m-im/src/main/res/layout/im_nim_inquiry_end_layout.xml
......@@ -23,6 +23,6 @@
android:layout_marginBottom="8dp"
android:text="本次诊断结束，如有问题可联系客服或再次向医生问诊"
android:textColor="#ff8595a9"
android:textSize="12sp" />
android:textSize="13sp" />
</androidx.cardview.widget.CardView>
\ No newline at end of file
m-im/src/main/res/layout/medical_add_new_archives_activity.xml
......@@ -292,15 +292,26 @@
app:layout_constraintTop_toBottomOf="@id/line_relation" />
<TextView
android:id="@+id/hint1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="就诊人姓名、证件信息用于平台审核，不会外传。"
android:text="1.就诊人信息仅您和医生可见，为了给您更准确的医疗服务，请您务必填写真实资料。"
android:textColor="#ff495c72"
android:textSize="12sp"
android:textSize="13sp"
app:layout_constraintLeft_toLeftOf="@id/tv_name"
app:layout_constraintTop_toBottomOf="@id/tv_hint" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="2.根据相关政策，现就诊人及监护人需进行实名认证，请您及时认证，以便使用平台的服务功能"
android:textColor="#ff495c72"
android:textSize="13sp"
app:layout_constraintLeft_toLeftOf="@id/tv_name"
app:layout_constraintTop_toBottomOf="@id/hint1" />
</androidx.constraintlayout.widget.ConstraintLayout>
......
m-im/src/main/res/layout/medical_archives_list_activity.xml
......@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/medical_color_f0f4f8">
android:background="#F6F7F9">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
......
m-im/src/main/res/layout/medical_edit_archives_activity.xml
......@@ -188,15 +188,26 @@
app:layout_constraintTop_toBottomOf="@id/line_relation" />
<TextView
android:id="@+id/hint1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="就诊人姓名、证件信息用于平台审核，不会外传。"
android:text="1.就诊人信息仅您和医生可见，为了给您更准确的医疗服务，请您务必填写真实资料。"
android:textColor="#ff495c72"
android:textSize="12sp"
android:textSize="13sp"
app:layout_constraintLeft_toLeftOf="@id/tv_name"
app:layout_constraintTop_toBottomOf="@id/tv_hint" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="2.根据相关政策，现就诊人及监护人需进行实名认证，请您及时认证，以便使用平台的服务功能"
android:textColor="#ff495c72"
android:textSize="13sp"
app:layout_constraintLeft_toLeftOf="@id/tv_name"
app:layout_constraintTop_toBottomOf="@id/hint1" />
</androidx.constraintlayout.widget.ConstraintLayout>
......@@ -216,6 +227,7 @@
android:layout_weight="1"
android:background="@drawable/medical_bg_c0c9d4_8dp"
android:gravity="center"
android:layout_marginEnd="16dp"
android:text="删除"
android:textColor="@color/medical_color_8595a9"
android:textSize="16sp"
......@@ -224,6 +236,7 @@
<TextView
android:id="@+id/tv_save"
android:layout_width="0dp"
android:visibility="gone"
android:layout_height="48dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="16dp"
......
m-im/src/main/res/layout/medical_graphic_consultation_flow1.xml
......@@ -58,7 +58,7 @@
android:layout_height="wrap_content"
android:text="1.病情描述"
android:textColor="@color/medical_color_3464ec"
android:textSize="12sp"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/iv_flow1"
......@@ -80,7 +80,7 @@
android:layout_height="wrap_content"
android:text="2.选择就诊人"
android:textColor="@color/medical_color_8595a9"
android:textSize="12sp"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@id/flow1"
app:layout_constraintLeft_toRightOf="@id/iv_flow1"
app:layout_constraintRight_toLeftOf="@id/iv_flow2"
......@@ -102,7 +102,7 @@
android:layout_height="wrap_content"
android:text="3.开始问诊"
android:textColor="@color/medical_color_8595a9"
android:textSize="12sp"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@id/flow1"
app:layout_constraintLeft_toRightOf="@id/iv_flow2"
app:layout_constraintRight_toRightOf="parent"
......@@ -132,7 +132,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="请描述您的病情"
android:text="请描述您遇到的问题"
android:textColor="@color/medical_color_0c1d31"
android:textSize="18sp"
app:layout_constraintLeft_toLeftOf="parent"
......@@ -171,7 +171,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingMultiplier="1.1"
android:text="请描述疾病名称或症状，患病时间，做过什么检查，用药情况，目前病情是加重还是缓解，想要获得医生什么帮助？描述越详细，医生回复质量越高"
android:text="请描述您想解决的问题或遇到的问题，困扰时间，做过什么检查，用药情况，目前问题是加重还是缓解，想要获得医生什么帮助？描述越详细，医生回复质量越高。"
android:textColor="#0c1d31"
android:textSize="14sp" />
......@@ -182,7 +182,7 @@
android:lineSpacingMultiplier="1.1"
android:text="【例】本人近三周一直失眠，医院检查说我是非器质性失眠症，建议我矫正睡眠情况，使用了几天并未见好，请问医生接下来我该如何治疗？"
android:textColor="#ff495c72"
android:textSize="12sp" />
android:textSize="13sp" />
</LinearLayout>
......@@ -223,7 +223,7 @@
android:paddingBottom="8dp"
android:text="0/200"
android:textColor="#c0c9d4"
android:textSize="12sp"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@id/edit_input"
app:layout_constraintRight_toRightOf="@id/edit_input" />
......@@ -271,7 +271,7 @@
android:id="@+id/camera_text_top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginLeft="13dp"
android:text="上传检查报告或患处照片（最多9张）"
android:textColor="@color/medical_color_0c1d31"
app:layout_constraintBottom_toTopOf="@id/camera_text_bottom"
......@@ -286,7 +286,7 @@
android:layout_marginTop="8dp"
android:text="照片仅自己和医生可见"
android:textColor="#ff495c72"
android:textSize="12sp"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@id/camera_bg"
app:layout_constraintLeft_toLeftOf="@id/camera_text_top"
app:layout_constraintTop_toBottomOf="@id/camera_text_top" />
......@@ -326,8 +326,7 @@
android:layout_height="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="36dp"
android:background="@drawable/medical_bg_d7dfea_8dp"
android:enabled="false"
android:background="@drawable/bg_doctor_detail_bottom"
android:gravity="center"
android:text="下一步"
android:textColor="@color/white"
......
m-im/src/main/res/layout/medical_graphic_consultation_flow2.xml
......@@ -57,7 +57,7 @@
android:layout_height="wrap_content"
android:text="1.病情描述"
android:textColor="@color/medical_color_3464ec"
android:textSize="12sp"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/iv_flow1"
......@@ -79,7 +79,7 @@
android:layout_height="wrap_content"
android:text="2.选择就诊人"
android:textColor="@color/medical_color_3464ec"
android:textSize="12sp"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@id/flow1"
app:layout_constraintLeft_toRightOf="@id/iv_flow1"
app:layout_constraintRight_toLeftOf="@id/iv_flow2"
......@@ -101,7 +101,7 @@
android:layout_height="wrap_content"
android:text="3.开始问诊"
android:textColor="@color/medical_color_8595a9"
android:textSize="12sp"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@id/flow1"
app:layout_constraintLeft_toRightOf="@id/iv_flow2"
app:layout_constraintRight_toRightOf="parent"
......@@ -141,23 +141,50 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:text="请选择患者信息，信息仅医生可见"
android:text="请选择就诊人，信息仅医生可见"
android:textColor="#ff495c72"
android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="@id/dec_title"
app:layout_constraintTop_toBottomOf="@id/dec_title" />
<androidx.recyclerview.widget.RecyclerView
android:layout_marginTop="8dp"
android:id="@+id/rv_people_list"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_marginTop="8dp" />
<LinearLayout
android:id="@+id/empty"
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="16dp"
android:background="@drawable/medical_add_people_bg"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:scaleType="centerCrop"
android:src="@mipmap/medical_add_blue_icon" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="添加就诊人"
android:textColor="@color/medical_color_3464ec"
android:textSize="14sp" />
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_marginStart="16dp"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginStart="16dp">
<TextView
android:id="@+id/first_mit"
......@@ -245,8 +272,8 @@
android:textColor="@color/medical_color_8595a9"
android:textSize="12sp"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintRight_toLeftOf="@id/informed_consent_text"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/informed_consent_text"
app:layout_constraintTop_toTopOf="parent" />
<TextView
......
m-im/src/main/res/layout/medical_im_chat_item_view.xml
......@@ -89,7 +89,7 @@
android:gravity="end"
android:maxLines="1"
android:textColor="#8595A9"
android:textSize="12sp"
android:textSize="13sp"
app:layout_constraintBaseline_toBaselineOf="@id/chat_message_name"
app:layout_constraintRight_toRightOf="parent"
tools:text="09-04" />
......
m-im/src/main/res/layout/medical_item_archives_flow2_list.xml
......@@ -89,7 +89,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="添加患者"
android:text="添加就诊人"
android:textColor="#ff495c72"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
......
m-im/src/main/res/values/colors.xml
......@@ -70,4 +70,5 @@
<color name="medical_color_f0f4f8">#F0F4F8</color>
<color name="medical_color_c0c9d4">#C0C9D4</color>
<color name="medical_color_e7ecf0">#E7ECF0</color>
<color name="medical_color_ff7766">#FF7766</color>
</resources>
m-im/src/main/res_uikit/layout/im_ydl_nim_message_fragment.xml
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/medical_color_f0f4f8"
android:background="#F6F7F9"
android:orientation="vertical">
<FrameLayout
......@@ -96,8 +96,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="待接诊"
android:textColor="#ffff7766"
android:text="等待医生接诊"
android:textColor="#ff7766"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/iv_receive_unstart"
......
ydl-medical-pay/src/main/res/layout/medical_pay_activity.xml
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#f0f4f8"
android:background="#F6F7F9"
tools:context=".MedicalPayActivity">
<androidx.appcompat.widget.Toolbar
......
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