Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
7538c193
Commit
7538c193
authored
Dec 20, 2021
by
刘鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat : 医疗2.0.1版本内容提交
parent
44b9412e
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
171 additions
and
59 deletions
+171
-59
GraphicConsultationFlow1Activity.kt
m-im/src/main/java/com/yidianling/medical/GraphicConsultationFlow1Activity.kt
+28
-11
GraphicConsulttionFlow2Activity.kt
m-im/src/main/java/com/yidianling/medical/GraphicConsulttionFlow2Activity.kt
+33
-7
MedicalAddNewArchivesActivity.kt
m-im/src/main/java/com/yidianling/medical/archives/MedicalAddNewArchivesActivity.kt
+1
-1
YDLP2PMessageActivity.java
m-im/src/main/java/com/yidianling/uikit/business/session/activity/YDLP2PMessageActivity.java
+1
-1
YDLMessageFragment.java
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
+21
-5
medical_add_people_bg.png
m-im/src/main/res/drawable-xhdpi/medical_add_people_bg.png
+0
-0
im_chat_is_top_bg.xml
m-im/src/main/res/drawable/im_chat_is_top_bg.xml
+2
-1
im_chat_time_item_view.xml
m-im/src/main/res/layout/im_chat_time_item_view.xml
+1
-1
im_nim_inquiry_end_layout.xml
m-im/src/main/res/layout/im_nim_inquiry_end_layout.xml
+2
-1
medical_add_new_archives_activity.xml
m-im/src/main/res/layout/medical_add_new_archives_activity.xml
+13
-2
medical_archives_list_activity.xml
m-im/src/main/res/layout/medical_archives_list_activity.xml
+1
-1
medical_edit_archives_activity.xml
m-im/src/main/res/layout/medical_edit_archives_activity.xml
+15
-2
medical_graphic_consultation_flow1.xml
m-im/src/main/res/layout/medical_graphic_consultation_flow1.xml
+10
-11
medical_graphic_consultation_flow2.xml
m-im/src/main/res/layout/medical_graphic_consultation_flow2.xml
+36
-9
medical_im_chat_item_view.xml
m-im/src/main/res/layout/medical_im_chat_item_view.xml
+1
-1
medical_item_archives_flow2_list.xml
m-im/src/main/res/layout/medical_item_archives_flow2_list.xml
+1
-1
medical_add_blue_icon.png
m-im/src/main/res/mipmap-xhdpi/medical_add_blue_icon.png
+0
-0
colors.xml
m-im/src/main/res/values/colors.xml
+1
-0
im_ydl_nim_message_fragment.xml
m-im/src/main/res_uikit/layout/im_ydl_nim_message_fragment.xml
+3
-3
medical_pay_activity.xml
ydl-medical-pay/src/main/res/layout/medical_pay_activity.xml
+1
-1
No files found.
m-im/src/main/java/com/yidianling/medical/GraphicConsultationFlow1Activity.kt
View file @
7538c193
...
@@ -6,7 +6,10 @@ import android.content.Intent
...
@@ -6,7 +6,10 @@ import android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
import
android.os.Parcelable
import
android.os.Parcelable
import
android.text.Editable
import
android.text.Editable
import
android.text.SpannableStringBuilder
import
android.text.Spanned
import
android.text.TextWatcher
import
android.text.TextWatcher
import
android.text.style.ForegroundColorSpan
import
android.view.View
import
android.view.View
import
androidx.recyclerview.widget.GridLayoutManager
import
androidx.recyclerview.widget.GridLayoutManager
import
com.luck.picture.lib.entity.LocalMedia
import
com.luck.picture.lib.entity.LocalMedia
...
@@ -136,17 +139,7 @@ class GraphicConsultationFlow1Activity : BaseActivity() {
...
@@ -136,17 +139,7 @@ class GraphicConsultationFlow1Activity : BaseActivity() {
@SuppressLint
(
"SetTextI18n"
)
@SuppressLint
(
"SetTextI18n"
)
override
fun
afterTextChanged
(
s
:
Editable
?)
{
override
fun
afterTextChanged
(
s
:
Editable
?)
{
val
inputNumber
=
edit_input
.
text
.
length
.
toString
()
setEditHint
()
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
}
}
}
override
fun
beforeTextChanged
(
s
:
CharSequence
?,
start
:
Int
,
count
:
Int
,
after
:
Int
)
{}
override
fun
beforeTextChanged
(
s
:
CharSequence
?,
start
:
Int
,
count
:
Int
,
after
:
Int
)
{}
...
@@ -161,6 +154,30 @@ class GraphicConsultationFlow1Activity : BaseActivity() {
...
@@ -161,6 +154,30 @@ class GraphicConsultationFlow1Activity : BaseActivity() {
}
}
showDialogTip
()
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
()
{
private
fun
showDialogTip
()
{
...
...
m-im/src/main/java/com/yidianling/medical/GraphicConsulttionFlow2Activity.kt
View file @
7538c193
...
@@ -98,6 +98,11 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
...
@@ -98,6 +98,11 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
baseQuickAdapter
.
notifyDataSetChanged
()
baseQuickAdapter
.
notifyDataSetChanged
()
}
}
}
}
empty
.
setOnClickListener
{
//空数据页面
isFirstLoadData
=
false
MedicalAddNewArchivesActivity
.
start
(
this
@GraphicConsulttionFlow2Activity
)
}
radio_first_mit
.
setOnCheckedChangeListener
{
group
,
checkedId
->
radio_first_mit
.
setOnCheckedChangeListener
{
group
,
checkedId
->
//婚姻状态
//婚姻状态
...
@@ -131,12 +136,13 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
...
@@ -131,12 +136,13 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
informed_consent_text
.
setOnClickListener
{
informed_consent_text
.
setOnClickListener
{
//协议内容
//协议内容
var
collectOutPop
=
InformedConsentPopupWindow
(
this
,
object
:
InformedConsentPopupWindow
.
OnChatSettingClickListener
{
var
collectOutPop
=
InformedConsentPopupWindow
(
this
,
override
fun
onDismissAction
()
{
object
:
InformedConsentPopupWindow
.
OnChatSettingClickListener
{
setWindowBg
(
1f
)
override
fun
onDismissAction
()
{
}
setWindowBg
(
1f
)
}
})
})
collectOutPop
?.
contentView
!!
.
measure
(
collectOutPop
?.
contentView
!!
.
measure
(
View
.
MeasureSpec
.
UNSPECIFIED
,
View
.
MeasureSpec
.
UNSPECIFIED
,
View
.
MeasureSpec
.
UNSPECIFIED
View
.
MeasureSpec
.
UNSPECIFIED
...
@@ -254,13 +260,33 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
...
@@ -254,13 +260,33 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
mAdapter
.
setNewData
(
mList
as
List
<
MedicalArchivesListBean
?>?)
mAdapter
.
setNewData
(
mList
as
List
<
MedicalArchivesListBean
?>?)
mAdapter
.
notifyDataSetChanged
()
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
{
}
else
{
mList
.
add
(
MedicalArchivesListBean
(
true
))
mList
.
add
(
MedicalArchivesListBean
(
true
))
mAdapter
.
notifyDataSetChanged
()
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
->
},
{
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
View file @
7538c193
...
@@ -126,7 +126,7 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
...
@@ -126,7 +126,7 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
return
return
}
}
if
(
mRelation
==
-
1
)
{
if
(
mRelation
==
-
1
)
{
ToastUtil
.
toastLong
(
this
@MedicalAddNewArchivesActivity
,
"请选择与
患者
的关系"
)
ToastUtil
.
toastLong
(
this
@MedicalAddNewArchivesActivity
,
"请选择与
就诊人
的关系"
)
return
return
}
}
...
...
m-im/src/main/java/com/yidianling/uikit/business/session/activity/YDLP2PMessageActivity.java
View file @
7538c193
...
@@ -224,7 +224,7 @@ public class YDLP2PMessageActivity extends YDLBaseMessageActivity {
...
@@ -224,7 +224,7 @@ public class YDLP2PMessageActivity extends YDLBaseMessageActivity {
try
{
try
{
Type91Bean
type91Bean
=
new
Gson
().
fromJson
(
content
,
Type91Bean
.
class
);
Type91Bean
type91Bean
=
new
Gson
().
fromJson
(
content
,
Type91Bean
.
class
);
if
(
type91Bean
.
getType
()
==
MESSAGE_TYPE
)
{
if
(
type91Bean
.
getType
()
==
MESSAGE_TYPE
)
{
messageFragment
.
upReceiceType
(
type91Bean
.
getData
().
getStatus
());
messageFragment
.
upReceiceType
(
type91Bean
.
getData
().
getStatus
()
,
type91Bean
.
getData
().
getStatusName
()
);
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
View file @
7538c193
...
@@ -12,6 +12,7 @@ import android.view.ViewGroup;
...
@@ -12,6 +12,7 @@ import android.view.ViewGroup;
import
android.view.ViewTreeObserver
;
import
android.view.ViewTreeObserver
;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.constraintlayout.widget.ConstraintLayout
;
import
androidx.constraintlayout.widget.ConstraintLayout
;
...
@@ -138,6 +139,12 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
...
@@ -138,6 +139,12 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
protected
AitManager
aitManager
;
protected
AitManager
aitManager
;
private
ConstraintLayout
top_expert_info_ll
;
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
int
expertInfoViewHeight
=
0
;
// 专家信息栏高度
private
RecyclerView
messageListView
;
private
RecyclerView
messageListView
;
...
@@ -165,6 +172,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
...
@@ -165,6 +172,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
ll_actions_yi
=
rootView
.
findViewById
(
R
.
id
.
ll_actions_yi
);
ll_actions_yi
=
rootView
.
findViewById
(
R
.
id
.
ll_actions_yi
);
//顶部问诊状态 客服icon
//顶部问诊状态 客服icon
top_expert_info_ll
=
rootView
.
findViewById
(
R
.
id
.
top_expert_info_ll
);
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
);
messageListView
=
rootView
.
findViewById
(
R
.
id
.
messageListView
);
constraint_ll
=
rootView
.
findViewById
(
R
.
id
.
constraint_ll
);
constraint_ll
=
rootView
.
findViewById
(
R
.
id
.
constraint_ll
);
...
@@ -470,7 +480,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
...
@@ -470,7 +480,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
(
response
->
{
.
subscribe
(
response
->
{
if
(
"200"
.
equals
(
response
.
code
))
{
if
(
"200"
.
equals
(
response
.
code
))
{
upReceiceType
(
response
.
data
.
getStatus
());
upReceiceType
(
response
.
data
.
getStatus
()
,
""
);
}
else
{
}
else
{
ToastUtil
.
toastShort
(
response
.
msg
);
ToastUtil
.
toastShort
(
response
.
msg
);
...
@@ -489,7 +499,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
...
@@ -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
(
ActionHandlerStorage
.
getL
(
sessionId
).
getUserType
()
==
USER_TYPE_EXPERT
)
{
if
(
type
==
30
)
{
if
(
type
==
30
)
{
// 30:待诊断(已接诊、问诊中)
// 30:待诊断(已接诊、问诊中)
...
@@ -498,6 +508,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
...
@@ -498,6 +508,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
receive_undiagnosis
.
setVisibility
(
View
.
VISIBLE
);
receive_undiagnosis
.
setVisibility
(
View
.
VISIBLE
);
receive_unstart
.
setVisibility
(
View
.
GONE
);
receive_unstart
.
setVisibility
(
View
.
GONE
);
receive_end
.
setVisibility
(
View
.
GONE
);
receive_end
.
setVisibility
(
View
.
GONE
);
if
(!
TextUtils
.
isEmpty
(
statusName
))
{
tv_receive_undiagnosis
.
setText
(
statusName
);
}
}
else
if
(
type
==
20
)
{
}
else
if
(
type
==
20
)
{
//待接诊
//待接诊
...
@@ -506,8 +519,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
...
@@ -506,8 +519,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
receive_undiagnosis
.
setVisibility
(
View
.
GONE
);
receive_undiagnosis
.
setVisibility
(
View
.
GONE
);
receive_unstart
.
setVisibility
(
View
.
VISIBLE
);
receive_unstart
.
setVisibility
(
View
.
VISIBLE
);
receive_end
.
setVisibility
(
View
.
GONE
);
receive_end
.
setVisibility
(
View
.
GONE
);
if
(!
TextUtils
.
isEmpty
(
statusName
))
{
tv_receive_unstart
.
setText
(
statusName
);
}
}
else
if
(
type
==
40
)
{
}
else
if
(
type
==
40
)
{
//已完成
//已完成
inputPanel
.
setVisible
(
false
);
inputPanel
.
setVisible
(
false
);
...
@@ -515,7 +529,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
...
@@ -515,7 +529,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
receive_undiagnosis
.
setVisibility
(
View
.
GONE
);
receive_undiagnosis
.
setVisibility
(
View
.
GONE
);
receive_unstart
.
setVisibility
(
View
.
GONE
);
receive_unstart
.
setVisibility
(
View
.
GONE
);
receive_end
.
setVisibility
(
View
.
VISIBLE
);
receive_end
.
setVisibility
(
View
.
VISIBLE
);
if
(!
TextUtils
.
isEmpty
(
statusName
))
{
tv_receive_end
.
setText
(
statusName
);
}
}
else
{
}
else
{
top_expert_info_ll
.
setVisibility
(
View
.
GONE
);
top_expert_info_ll
.
setVisibility
(
View
.
GONE
);
inputPanel
.
setVisible
(
false
);
inputPanel
.
setVisible
(
false
);
...
...
m-im/src/main/res/drawable-xhdpi/medical_add_people_bg.png
0 → 100644
View file @
7538c193
6.07 KB
m-im/src/main/res/drawable/im_chat_is_top_bg.xml
View file @
7538c193
...
@@ -3,6 +3,6 @@
...
@@ -3,6 +3,6 @@
android:shape=
"rectangle"
>
android:shape=
"rectangle"
>
<solid
<solid
android:color=
"#F
0F4F8
"
/>
android:color=
"#F
6F7F9
"
/>
</shape>
</shape>
\ No newline at end of file
m-im/src/main/res/layout/im_chat_time_item_view.xml
View file @
7538c193
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"30dp"
android:layout_height=
"30dp"
android:background=
"#F
0F4F8
"
>
android:background=
"#F
6F7F9
"
>
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
...
...
m-im/src/main/res/layout/im_nim_inquiry_end_layout.xml
View file @
7538c193
...
@@ -23,6 +23,6 @@
...
@@ -23,6 +23,6 @@
android:layout_marginBottom=
"8dp"
android:layout_marginBottom=
"8dp"
android:text=
"本次诊断结束,如有问题可联系客服或再次向医生问诊"
android:text=
"本次诊断结束,如有问题可联系客服或再次向医生问诊"
android:textColor=
"#ff8595a9"
android:textColor=
"#ff8595a9"
android:textSize=
"1
2
sp"
/>
android:textSize=
"1
3
sp"
/>
</androidx.cardview.widget.CardView>
</androidx.cardview.widget.CardView>
\ No newline at end of file
m-im/src/main/res/layout/medical_add_new_archives_activity.xml
View file @
7538c193
...
@@ -292,15 +292,26 @@
...
@@ -292,15 +292,26 @@
app:layout_constraintTop_toBottomOf=
"@id/line_relation"
/>
app:layout_constraintTop_toBottomOf=
"@id/line_relation"
/>
<TextView
<TextView
android:id=
"@+id/hint1"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"4dp"
android:layout_marginTop=
"4dp"
android:text=
"
就诊人姓名、证件信息用于平台审核,不会外传
。"
android:text=
"
1.就诊人信息仅您和医生可见,为了给您更准确的医疗服务,请您务必填写真实资料
。"
android:textColor=
"#ff495c72"
android:textColor=
"#ff495c72"
android:textSize=
"1
2
sp"
android:textSize=
"1
3
sp"
app:layout_constraintLeft_toLeftOf=
"@id/tv_name"
app:layout_constraintLeft_toLeftOf=
"@id/tv_name"
app:layout_constraintTop_toBottomOf=
"@id/tv_hint"
/>
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>
</androidx.constraintlayout.widget.ConstraintLayout>
...
...
m-im/src/main/res/layout/medical_archives_list_activity.xml
View file @
7538c193
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"
@color/medical_color_f0f4f8
"
>
android:background=
"
#F6F7F9
"
>
<androidx.appcompat.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id=
"@+id/toolbar"
android:id=
"@+id/toolbar"
...
...
m-im/src/main/res/layout/medical_edit_archives_activity.xml
View file @
7538c193
...
@@ -188,15 +188,26 @@
...
@@ -188,15 +188,26 @@
app:layout_constraintTop_toBottomOf=
"@id/line_relation"
/>
app:layout_constraintTop_toBottomOf=
"@id/line_relation"
/>
<TextView
<TextView
android:id=
"@+id/hint1"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"4dp"
android:layout_marginTop=
"4dp"
android:text=
"
就诊人姓名、证件信息用于平台审核,不会外传
。"
android:text=
"
1.就诊人信息仅您和医生可见,为了给您更准确的医疗服务,请您务必填写真实资料
。"
android:textColor=
"#ff495c72"
android:textColor=
"#ff495c72"
android:textSize=
"1
2
sp"
android:textSize=
"1
3
sp"
app:layout_constraintLeft_toLeftOf=
"@id/tv_name"
app:layout_constraintLeft_toLeftOf=
"@id/tv_name"
app:layout_constraintTop_toBottomOf=
"@id/tv_hint"
/>
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>
</androidx.constraintlayout.widget.ConstraintLayout>
...
@@ -216,6 +227,7 @@
...
@@ -216,6 +227,7 @@
android:layout_weight=
"1"
android:layout_weight=
"1"
android:background=
"@drawable/medical_bg_c0c9d4_8dp"
android:background=
"@drawable/medical_bg_c0c9d4_8dp"
android:gravity=
"center"
android:gravity=
"center"
android:layout_marginEnd=
"16dp"
android:text=
"删除"
android:text=
"删除"
android:textColor=
"@color/medical_color_8595a9"
android:textColor=
"@color/medical_color_8595a9"
android:textSize=
"16sp"
android:textSize=
"16sp"
...
@@ -224,6 +236,7 @@
...
@@ -224,6 +236,7 @@
<TextView
<TextView
android:id=
"@+id/tv_save"
android:id=
"@+id/tv_save"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:visibility=
"gone"
android:layout_height=
"48dp"
android:layout_height=
"48dp"
android:layout_marginStart=
"24dp"
android:layout_marginStart=
"24dp"
android:layout_marginEnd=
"16dp"
android:layout_marginEnd=
"16dp"
...
...
m-im/src/main/res/layout/medical_graphic_consultation_flow1.xml
View file @
7538c193
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"1.病情描述"
android:text=
"1.病情描述"
android:textColor=
"@color/medical_color_3464ec"
android:textColor=
"@color/medical_color_3464ec"
android:textSize=
"1
2
sp"
android:textSize=
"1
3
sp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toLeftOf=
"@id/iv_flow1"
app:layout_constraintRight_toLeftOf=
"@id/iv_flow1"
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"2.选择就诊人"
android:text=
"2.选择就诊人"
android:textColor=
"@color/medical_color_8595a9"
android:textColor=
"@color/medical_color_8595a9"
android:textSize=
"1
2
sp"
android:textSize=
"1
3
sp"
app:layout_constraintBottom_toBottomOf=
"@id/flow1"
app:layout_constraintBottom_toBottomOf=
"@id/flow1"
app:layout_constraintLeft_toRightOf=
"@id/iv_flow1"
app:layout_constraintLeft_toRightOf=
"@id/iv_flow1"
app:layout_constraintRight_toLeftOf=
"@id/iv_flow2"
app:layout_constraintRight_toLeftOf=
"@id/iv_flow2"
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"3.开始问诊"
android:text=
"3.开始问诊"
android:textColor=
"@color/medical_color_8595a9"
android:textColor=
"@color/medical_color_8595a9"
android:textSize=
"1
2
sp"
android:textSize=
"1
3
sp"
app:layout_constraintBottom_toBottomOf=
"@id/flow1"
app:layout_constraintBottom_toBottomOf=
"@id/flow1"
app:layout_constraintLeft_toRightOf=
"@id/iv_flow2"
app:layout_constraintLeft_toRightOf=
"@id/iv_flow2"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
...
@@ -132,7 +132,7 @@
...
@@ -132,7 +132,7 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
android:text=
"请描述您
的病情
"
android:text=
"请描述您
遇到的问题
"
android:textColor=
"@color/medical_color_0c1d31"
android:textColor=
"@color/medical_color_0c1d31"
android:textSize=
"18sp"
android:textSize=
"18sp"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
...
@@ -171,7 +171,7 @@
...
@@ -171,7 +171,7 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:lineSpacingMultiplier=
"1.1"
android:lineSpacingMultiplier=
"1.1"
android:text=
"请描述
疾病名称或症状,患病时间,做过什么检查,用药情况,目前病情是加重还是缓解,想要获得医生什么帮助?描述越详细,医生回复质量越高
"
android:text=
"请描述
您想解决的问题或遇到的问题,困扰时间,做过什么检查,用药情况,目前问题是加重还是缓解,想要获得医生什么帮助?描述越详细,医生回复质量越高。
"
android:textColor=
"#0c1d31"
android:textColor=
"#0c1d31"
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
/>
...
@@ -182,7 +182,7 @@
...
@@ -182,7 +182,7 @@
android:lineSpacingMultiplier=
"1.1"
android:lineSpacingMultiplier=
"1.1"
android:text=
"【例】本人近三周一直失眠,医院检查说我是非器质性失眠症,建议我矫正睡眠情况,使用了几天并未见好,请问医生接下来我该如何治疗?"
android:text=
"【例】本人近三周一直失眠,医院检查说我是非器质性失眠症,建议我矫正睡眠情况,使用了几天并未见好,请问医生接下来我该如何治疗?"
android:textColor=
"#ff495c72"
android:textColor=
"#ff495c72"
android:textSize=
"1
2
sp"
/>
android:textSize=
"1
3
sp"
/>
</LinearLayout>
</LinearLayout>
...
@@ -223,7 +223,7 @@
...
@@ -223,7 +223,7 @@
android:paddingBottom=
"8dp"
android:paddingBottom=
"8dp"
android:text=
"0/200"
android:text=
"0/200"
android:textColor=
"#c0c9d4"
android:textColor=
"#c0c9d4"
android:textSize=
"1
2
sp"
android:textSize=
"1
3
sp"
app:layout_constraintBottom_toBottomOf=
"@id/edit_input"
app:layout_constraintBottom_toBottomOf=
"@id/edit_input"
app:layout_constraintRight_toRightOf=
"@id/edit_input"
/>
app:layout_constraintRight_toRightOf=
"@id/edit_input"
/>
...
@@ -271,7 +271,7 @@
...
@@ -271,7 +271,7 @@
android:id=
"@+id/camera_text_top"
android:id=
"@+id/camera_text_top"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"1
2
dp"
android:layout_marginLeft=
"1
3
dp"
android:text=
"上传检查报告或患处照片(最多9张)"
android:text=
"上传检查报告或患处照片(最多9张)"
android:textColor=
"@color/medical_color_0c1d31"
android:textColor=
"@color/medical_color_0c1d31"
app:layout_constraintBottom_toTopOf=
"@id/camera_text_bottom"
app:layout_constraintBottom_toTopOf=
"@id/camera_text_bottom"
...
@@ -286,7 +286,7 @@
...
@@ -286,7 +286,7 @@
android:layout_marginTop=
"8dp"
android:layout_marginTop=
"8dp"
android:text=
"照片仅自己和医生可见"
android:text=
"照片仅自己和医生可见"
android:textColor=
"#ff495c72"
android:textColor=
"#ff495c72"
android:textSize=
"1
2
sp"
android:textSize=
"1
3
sp"
app:layout_constraintBottom_toBottomOf=
"@id/camera_bg"
app:layout_constraintBottom_toBottomOf=
"@id/camera_bg"
app:layout_constraintLeft_toLeftOf=
"@id/camera_text_top"
app:layout_constraintLeft_toLeftOf=
"@id/camera_text_top"
app:layout_constraintTop_toBottomOf=
"@id/camera_text_top"
/>
app:layout_constraintTop_toBottomOf=
"@id/camera_text_top"
/>
...
@@ -326,8 +326,7 @@
...
@@ -326,8 +326,7 @@
android:layout_height=
"48dp"
android:layout_height=
"48dp"
android:layout_marginTop=
"16dp"
android:layout_marginTop=
"16dp"
android:layout_marginBottom=
"36dp"
android:layout_marginBottom=
"36dp"
android:background=
"@drawable/medical_bg_d7dfea_8dp"
android:background=
"@drawable/bg_doctor_detail_bottom"
android:enabled=
"false"
android:gravity=
"center"
android:gravity=
"center"
android:text=
"下一步"
android:text=
"下一步"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
...
...
m-im/src/main/res/layout/medical_graphic_consultation_flow2.xml
View file @
7538c193
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"1.病情描述"
android:text=
"1.病情描述"
android:textColor=
"@color/medical_color_3464ec"
android:textColor=
"@color/medical_color_3464ec"
android:textSize=
"1
2
sp"
android:textSize=
"1
3
sp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toLeftOf=
"@id/iv_flow1"
app:layout_constraintRight_toLeftOf=
"@id/iv_flow1"
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"2.选择就诊人"
android:text=
"2.选择就诊人"
android:textColor=
"@color/medical_color_3464ec"
android:textColor=
"@color/medical_color_3464ec"
android:textSize=
"1
2
sp"
android:textSize=
"1
3
sp"
app:layout_constraintBottom_toBottomOf=
"@id/flow1"
app:layout_constraintBottom_toBottomOf=
"@id/flow1"
app:layout_constraintLeft_toRightOf=
"@id/iv_flow1"
app:layout_constraintLeft_toRightOf=
"@id/iv_flow1"
app:layout_constraintRight_toLeftOf=
"@id/iv_flow2"
app:layout_constraintRight_toLeftOf=
"@id/iv_flow2"
...
@@ -101,7 +101,7 @@
...
@@ -101,7 +101,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"3.开始问诊"
android:text=
"3.开始问诊"
android:textColor=
"@color/medical_color_8595a9"
android:textColor=
"@color/medical_color_8595a9"
android:textSize=
"1
2
sp"
android:textSize=
"1
3
sp"
app:layout_constraintBottom_toBottomOf=
"@id/flow1"
app:layout_constraintBottom_toBottomOf=
"@id/flow1"
app:layout_constraintLeft_toRightOf=
"@id/iv_flow2"
app:layout_constraintLeft_toRightOf=
"@id/iv_flow2"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
...
@@ -141,23 +141,50 @@
...
@@ -141,23 +141,50 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
android:layout_marginStart=
"16dp"
android:layout_marginTop=
"4dp"
android:layout_marginTop=
"4dp"
android:text=
"请选择
患者信息
,信息仅医生可见"
android:text=
"请选择
就诊人
,信息仅医生可见"
android:textColor=
"#ff495c72"
android:textColor=
"#ff495c72"
android:textSize=
"14sp"
android:textSize=
"14sp"
app:layout_constraintLeft_toLeftOf=
"@id/dec_title"
app:layout_constraintLeft_toLeftOf=
"@id/dec_title"
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:visibility=
"gone"
android:layout_width=
"match_parent"
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
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_
marginStart=
"16dp
"
android:layout_
height=
"wrap_content
"
android:layout_
height=
"wrap_content
"
>
android:layout_
marginStart=
"16dp
"
>
<TextView
<TextView
android:id=
"@+id/first_mit"
android:id=
"@+id/first_mit"
...
@@ -245,8 +272,8 @@
...
@@ -245,8 +272,8 @@
android:textColor=
"@color/medical_color_8595a9"
android:textColor=
"@color/medical_color_8595a9"
android:textSize=
"12sp"
android:textSize=
"12sp"
app:layout_constraintHorizontal_chainStyle=
"packed"
app:layout_constraintHorizontal_chainStyle=
"packed"
app:layout_constraintRight_toLeftOf=
"@id/informed_consent_text"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toLeftOf=
"@id/informed_consent_text"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<TextView
...
...
m-im/src/main/res/layout/medical_im_chat_item_view.xml
View file @
7538c193
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
android:gravity=
"end"
android:gravity=
"end"
android:maxLines=
"1"
android:maxLines=
"1"
android:textColor=
"#8595A9"
android:textColor=
"#8595A9"
android:textSize=
"1
2
sp"
android:textSize=
"1
3
sp"
app:layout_constraintBaseline_toBaselineOf=
"@id/chat_message_name"
app:layout_constraintBaseline_toBaselineOf=
"@id/chat_message_name"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
tools:text=
"09-04"
/>
tools:text=
"09-04"
/>
...
...
m-im/src/main/res/layout/medical_item_archives_flow2_list.xml
View file @
7538c193
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"4dp"
android:layout_marginTop=
"4dp"
android:text=
"添加
患者
"
android:text=
"添加
就诊人
"
android:textColor=
"#ff495c72"
android:textColor=
"#ff495c72"
android:textSize=
"12sp"
android:textSize=
"12sp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
...
...
m-im/src/main/res/mipmap-xhdpi/medical_add_blue_icon.png
0 → 100644
View file @
7538c193
612 Bytes
m-im/src/main/res/values/colors.xml
View file @
7538c193
...
@@ -70,4 +70,5 @@
...
@@ -70,4 +70,5 @@
<color
name=
"medical_color_f0f4f8"
>
#F0F4F8
</color>
<color
name=
"medical_color_f0f4f8"
>
#F0F4F8
</color>
<color
name=
"medical_color_c0c9d4"
>
#C0C9D4
</color>
<color
name=
"medical_color_c0c9d4"
>
#C0C9D4
</color>
<color
name=
"medical_color_e7ecf0"
>
#E7ECF0
</color>
<color
name=
"medical_color_e7ecf0"
>
#E7ECF0
</color>
<color
name=
"medical_color_ff7766"
>
#FF7766
</color>
</resources>
</resources>
m-im/src/main/res_uikit/layout/im_ydl_nim_message_fragment.xml
View file @
7538c193
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"
@color/medical_color_f0f4f8
"
android:background=
"
#F6F7F9
"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<FrameLayout
<FrameLayout
...
@@ -96,8 +96,8 @@
...
@@ -96,8 +96,8 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"8dp"
android:layout_marginStart=
"8dp"
android:text=
"
待
接诊"
android:text=
"
等待医生
接诊"
android:textColor=
"#ff
ff
7766"
android:textColor=
"#ff7766"
android:textSize=
"14sp"
android:textSize=
"14sp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toRightOf=
"@id/iv_receive_unstart"
app:layout_constraintLeft_toRightOf=
"@id/iv_receive_unstart"
...
...
ydl-medical-pay/src/main/res/layout/medical_pay_activity.xml
View file @
7538c193
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#
f0f4f8
"
android:background=
"#
F6F7F9
"
tools:context=
".MedicalPayActivity"
>
tools:context=
".MedicalPayActivity"
>
<androidx.appcompat.widget.Toolbar
<androidx.appcompat.widget.Toolbar
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment