Skip to content

Y
YDL-Component-Medical
Commit 6944f63c by 刘鹏
Options

feat : 问诊人适配，消息空列表提示修改

parent ca1d57b5
Showing with 88 additions and 73 deletions
config.gradle
...@@ -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.84", "m-user" : "0.0.61.84",
"m-home" : "0.0.22.70", "m-home" : "0.0.22.70",
"m-im" : "0.0.20.41", "m-im" : "0.0.20.48",
"m-dynamic" : "0.0.7.28", "m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.10", "m-article" : "0.0.0.10",
...@@ -33,7 +33,7 @@ ext { ...@@ -33,7 +33,7 @@ ext {
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//第一步 //第一步
"ydl-platform" : "0.0.40.58", "ydl-platform" : "0.0.40.59",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.53", "ydl-webview" : "0.0.38.53",
...@@ -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.84", "m-user" : "0.0.61.84",
"m-home" : "0.0.22.70", "m-home" : "0.0.22.70",
"m-im" : "0.0.20.41", "m-im" : "0.0.20.48",
"m-dynamic" : "0.0.7.28", "m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.8", "m-article" : "0.0.0.8",
...@@ -116,7 +116,7 @@ ext { ...@@ -116,7 +116,7 @@ ext {
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//第一步 //第一步
"ydl-platform" : "0.0.40.58", "ydl-platform" : "0.0.40.59",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.53", "ydl-webview" : "0.0.38.53",
......
m-im/src/main/java/com/yidianling/im/ui/page/widget/ChatUnusualView.kt
...@@ -59,7 +59,7 @@ class ChatUnusualView constructor(private val mContext: Context, attrs: Attribut ...@@ -59,7 +59,7 @@ class ChatUnusualView constructor(private val mContext: Context, attrs: Attribut
// 没有私聊数据(服务中) // 没有私聊数据(服务中)
TYPE_CHAT_SERVICING_NO_DATA -> { TYPE_CHAT_SERVICING_NO_DATA -> {
unusual_txt.text = "当前没有正在为您服务的咨询师" unusual_txt.text = "当前没有正在为您服务的咨询师"
unusual_btn.text = "去咨询" unusual_btn.text = "找医生"
unusual_btn.visibility = View.VISIBLE unusual_btn.visibility = View.VISIBLE
unusual_img.setImageResource(R.mipmap.im_default_siliao_none) unusual_img.setImageResource(R.mipmap.im_default_siliao_none)
} }
......
m-im/src/main/java/com/yidianling/medical/GraphicConsulttionFlow2Activity.kt
...@@ -192,7 +192,7 @@ class GraphicConsulttionFlow2Activity : BaseActivity() { ...@@ -192,7 +192,7 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
} }
ServiceImpl.instance.createArchivesOrder( ServiceImpl.instance.createArchivesOrder(
"", fileStrExtra,
isFirst, isFirst,
stringExtra, stringExtra,
input_first_mit.text.toString(), input_first_mit.text.toString(),
......
m-im/src/main/java/com/yidianling/medical/archives/MedicalArchivesListActivity.kt
...@@ -5,6 +5,7 @@ import android.content.Context ...@@ -5,6 +5,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.widget.TextView
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
...@@ -78,6 +79,7 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh ...@@ -78,6 +79,7 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh
} }
add_archives.setOnClickListener { add_archives.setOnClickListener {
isFirstLoadData = false
//添加用户档案 //添加用户档案
MedicalAddNewArchivesActivity.start(this@MedicalArchivesListActivity) MedicalAddNewArchivesActivity.start(this@MedicalArchivesListActivity)
} }
...@@ -122,6 +124,8 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh ...@@ -122,6 +124,8 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh
} }
} else { } else {
mAdapter.loadMoreEnd(false) mAdapter.loadMoreEnd(false)
var net_error= mEmptyView.findViewById<TextView>(R.id.net_error)
net_error.text="暂无数据"
mAdapter.emptyView = mEmptyView mAdapter.emptyView = mEmptyView
} }
...@@ -148,11 +152,14 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh ...@@ -148,11 +152,14 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh
} else { } else {
doctor_swipe_refresh_layout.isRefreshing = false doctor_swipe_refresh_layout.isRefreshing = false
mAdapter.loadMoreFail() mAdapter.loadMoreFail()
mAdapter.emptyView = mEmptyView mAdapter.emptyView = mEmptyView
} }
}, { e -> }, { e ->
doctor_swipe_refresh_layout.isRefreshing = false doctor_swipe_refresh_layout.isRefreshing = false
mAdapter.loadMoreFail() mAdapter.loadMoreFail()
var net_error= mEmptyView.findViewById<TextView>(R.id.net_error)
net_error.text="网络异常，请稍后再试"
mAdapter.emptyView = mEmptyView mAdapter.emptyView = mEmptyView
}) })
......
m-im/src/main/res/drawable/im_chat_unusual_view_btn_bg.xml
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
android:shape="rectangle"> android:shape="rectangle">
<gradient <gradient
android:endColor="@color/platform_main_theme" android:endColor="#3464EC"
android:startColor="@color/platform_main_theme_light"/> android:startColor="#3464EC"/>
<corners android:radius="14dp" /> <corners android:radius="8dp" />
</shape> </shape>
\ No newline at end of file
m-im/src/main/res/layout/im_chat_unusual_view.xml
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
android:gravity="center" android:gravity="center"
android:paddingLeft="22dp" android:paddingLeft="22dp"
android:paddingRight="22dp" android:paddingRight="22dp"
android:text="去咨询" android:text="找医生"
android:textSize="12dp" android:textSize="14sp"
android:textColor="@color/platform_but_text_color" android:textColor="@color/platform_but_text_color"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:background="@drawable/im_chat_unusual_view_btn_bg" android:background="@drawable/im_chat_unusual_view_btn_bg"
......
m-im/src/main/res/layout/medical_graphic_consultation_flow2.xml
...@@ -148,6 +148,7 @@ ...@@ -148,6 +148,7 @@
app:layout_constraintTop_toBottomOf="@id/dec_title" /> app:layout_constraintTop_toBottomOf="@id/dec_title" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:layout_marginTop="8dp"
android:id="@+id/rv_people_list" android:id="@+id/rv_people_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
...@@ -162,7 +163,7 @@ ...@@ -162,7 +163,7 @@
android:id="@+id/first_mit" android:id="@+id/first_mit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="24dp"
android:text="是否首次问诊" android:text="是否首次问诊"
android:textColor="#ff0c1d31" android:textColor="#ff0c1d31"
android:textSize="14sp" android:textSize="14sp"
......
m-im/src/main/res/layout/medical_item_archives_flow2_list.xml
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:minHeight="62dp"
android:background="@drawable/medical_bg_edit_f2f5f8" android:background="@drawable/medical_bg_edit_f2f5f8"
tools:background="@drawable/medical_list_check_bg"> tools:background="@drawable/medical_list_check_bg">
......
ydl-platform/src/main/res/layout/platform_dialog_normal_layout.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:minWidth="300dp"
android:maxWidth="300dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" > android:layout_gravity="center"
android:maxWidth="300dp"
android:minWidth="300dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_gravity="center"
android:layout_gravity="center"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:minWidth="300dp"
android:maxWidth="300dp"
android:background="@drawable/normaldialog_layout_bg" android:background="@drawable/normaldialog_layout_bg"
android:maxWidth="300dp"
android:minWidth="300dp"
android:orientation="vertical" android:orientation="vertical"
android:scrollbars="vertical"> android:scrollbars="vertical">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="10dp"
android:text="提示"
android:textSize="18sp" />
<RelativeLayout
android:id="@+id/message_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:orientation="vertical" >
<TextView <TextView
android:id="@+id/message" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center" android:gravity="center"
android:textSize="18sp" android:text="提示"
android:textColor="#10233A" android:textSize="18sp" />
android:text="正文"
android:autoLink="all"/> <RelativeLayout
</RelativeLayout> android:id="@+id/message_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:autoLink="all"
android:gravity="center"
android:text="正文"
android:textColor="#10233A"
android:textSize="18sp" />
</RelativeLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="0.5dp"
android:background="#E7ECF0" /> android:background="#E7ECF0" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="53dp" android:minHeight="53dp"
android:orientation="horizontal" > android:orientation="horizontal">
<Button
android:id="@+id/cancel_btn" <Button
android:layout_width="0dp" android:elevation="0dp"
android:layout_height="match_parent" android:id="@+id/cancel_btn"
android:layout_weight="1" android:layout_width="0dp"
android:textColor="#8595A9" android:layout_height="match_parent"
android:textSize="18sp" android:layout_weight="1"
android:background="@drawable/normaldialog_left_btn_select" android:background="@drawable/normaldialog_left_btn_select"
android:text="取消"/> android:text="取消"
<View android:textColor="#8595A9"
android:layout_width="0.5dp" android:textSize="18sp" />
android:layout_height="36dp"
android:background="#E7ECF0" <View
/> android:layout_width="0.5dp"
<Button android:layout_height="36dp"
android:id="@+id/confirm_btn" android:background="#E7ECF0" />
android:layout_width="0dp"
android:layout_height="match_parent" <Button
android:layout_weight="1" android:elevation="0dp"
android:textSize="18sp" android:id="@+id/confirm_btn"
android:textColor="#3464EC" android:layout_width="0dp"
android:background="@drawable/normaldialog_right_btn_select" android:layout_height="match_parent"
android:text="确定"/> android:layout_weight="1"
</LinearLayout> android:background="@drawable/normaldialog_right_btn_select"
android:text="确定"
android:textColor="#3464EC"
android:textSize="18sp" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
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