Skip to content

Y
YDL-Component-Medical
Commit e941ed86 by 刘鹏
Options

feat : 11月23日完成

parent 3713bbb6
Showing with 335 additions and 129 deletions
config.gradle
......@@ -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.32",
"m-im" : "0.0.20.37",
"m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.10",
......@@ -33,13 +33,13 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.40.52",
"ydl-platform" : "0.0.40.58",
//第二步 若干
"ydl-webview" : "0.0.38.53",
"ydl-media" : "0.0.21.10",
"ydl-pay" : "0.0.18.19",
"ydl-medical-pay" : "0.0.01.07",
"ydl-medical-pay" : "0.0.01.09",
"m-audioim" : "0.0.49.29.37",
"ydl-flutter-base": "0.0.14.26",
......@@ -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.32",
"m-im" : "0.0.20.37",
"m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.8",
......@@ -116,13 +116,13 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.40.52",
"ydl-platform" : "0.0.40.58",
//第二步 若干
"ydl-webview" : "0.0.38.53",
"ydl-media" : "0.0.21.10",
"ydl-pay" : "0.0.18.19",
"ydl-medical-pay" : "0.0.01.07",
"ydl-medical-pay" : "0.0.01.09",
"m-audioim" : "0.0.49.29.37",
"ydl-flutter-base": "0.0.14.26",
......
m-im/src/main/java/com/yidianling/medical/GraphicConsulttionFlow2Activity.kt
......@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.view.View
import android.view.WindowManager
import androidx.recyclerview.widget.GridLayoutManager
import com.medical.ydl.medical.pay.MedicalPayActivity
import com.ydl.ydlcommon.base.BaseActivity
......@@ -19,10 +20,7 @@ import com.yidianling.uikit.custom.http.ServiceImpl
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.medical_graphic_consultation_flow2.*
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import kotlinx.coroutines.*
/**
......@@ -133,13 +131,19 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
informed_consent_text.setOnClickListener {
//协议内容
var collectOutPop = InformedConsentPopupWindow(this)
var collectOutPop = InformedConsentPopupWindow(this,object :InformedConsentPopupWindow.OnChatSettingClickListener{
override fun onDismissAction() {
setWindowBg(1f)
}
})
collectOutPop?.contentView!!.measure(
View.MeasureSpec.UNSPECIFIED,
View.MeasureSpec.UNSPECIFIED
); //这句代码必须要才能获得正确的popupwindow的宽度
val popupWindowWidth = collectOutPop?.contentView!!.measuredWidth
setWindowBg(0.4f)
collectOutPop?.showAsDropDown(
toolbar,
-(popupWindowWidth - toolbar.measuredWidth + 20),
......@@ -173,15 +177,17 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
if (selectBean == null) {
ToastUtil.toastShort("请选择就诊人")
scope.cancel()
return@launch
}
if (isFirst == -1) {
ToastUtil.toastShort("请选择是否首次问诊")
scope.cancel()
return@launch
}
if (isFirst == 0 && input_first_mit.text.isEmpty()) {
ToastUtil.toastShort("请描述您的病情")
scope.cancel()
return@launch
}
......@@ -204,15 +210,17 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
response.data.inquiryOrderId,
doctorUidStrExtra
)
scope.cancel()
mFlow1Activity?.finish()
finish()
} else {
ToastUtil.toastShort("创建订单失败")
getList()
scope.cancel()
ToastUtil.toastShort(response.msg)
}
}, { e ->
ToastUtil.toastShort("创建订单失败")
scope.cancel()
getList()
e.printStackTrace()
})
}
......@@ -266,4 +274,14 @@ class GraphicConsulttionFlow2Activity : BaseActivity() {
backCheck()
}
/**
* 设置页面背景色
*/
private fun setWindowBg(alpha: Float) {
val lp = window.attributes
lp.alpha = alpha
window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
window.attributes = lp
}
}
\ No newline at end of file
m-im/src/main/java/com/yidianling/medical/popwindow/InformedConsentPopupWindow.kt
......@@ -11,8 +11,8 @@ import kotlinx.android.synthetic.main.medical_informed_dialog_layout.view.*
/**
* Created by xj on 2019/10/14.
*/
class InformedConsentPopupWindow(context: Context) :
PopupWindow(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) {
class InformedConsentPopupWindow(context: Context,chatSettingClickListener:OnChatSettingClickListener) :
PopupWindow(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) {
init {
val view =
LayoutInflater.from(context).inflate(R.layout.medical_informed_dialog_layout, null)
......@@ -21,9 +21,16 @@ class InformedConsentPopupWindow(context: Context) :
this.isOutsideTouchable = true
view.close.setOnClickListener {
chatSettingClickListener.onDismissAction()
dismiss()
}
setOnDismissListener {
chatSettingClickListener?.onDismissAction()
}
}
interface OnChatSettingClickListener {
fun onDismissAction() //取消
}
}
\ No newline at end of file
m-im/src/main/java/com/yidianling/uikit/business/session/actions/ImageAction.java
......@@ -14,7 +14,7 @@ import java.io.File;
public class ImageAction extends PickImageAction {
public ImageAction() {
super(R.drawable.im_chatbar_colormore_photo, R.string.im_input_panel_photo, true);
super(R.drawable.im_chatbar_colormore_photo, R.string.im_input_panel_photo_medical, true);
}
@Override
......
m-im/src/main/java/com/yidianling/uikit/business/session/actions/VideoAction.java
......@@ -25,7 +25,7 @@ public class VideoAction extends BaseAction {
protected transient VideoMessageHelper videoMessageHelper;
public VideoAction() {
super(R.drawable.im_chatbar_colormore_vedio, R.string.im_input_panel_video);
super(R.drawable.im_chatbar_colormore_vedio, R.string.im_input_panel_video_medical);
}
......
m-im/src/main/res/drawable/im_chat_is_top_bg.xml
......@@ -3,6 +3,6 @@
android:shape="rectangle">
<solid
android:color="#F0F0F0"/>
android:color="#F0F4F8"/>
</shape>
\ No newline at end of file
m-im/src/main/res/drawable/im_chat_setting_popupwindow_bg.xml
......@@ -5,6 +5,6 @@
<solid
android:color="#ffffff"/>
<corners android:radius="4dp"/>
<corners android:radius="8dp"/>
</shape>
\ No newline at end of file
m-im/src/main/res/drawable/im_custom_message_round_1da1f2_6dp_bg.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/platform_color_1DA1F2" />
<solid android:color="#2784FF" />
<corners
android:topLeftRadius="@dimen/platform_dp_10"
android:bottomRightRadius="@dimen/platform_dp_10"
android:bottomLeftRadius="@dimen/platform_dp_10"/>
android:topLeftRadius="8dp"
android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp"/>
</shape>
m-im/src/main/res/drawable/medical_bg_edit_f2f5f8.xml
......@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#fff2f5f8" />
<corners android:radius="8dp" />
<corners android:radius="4dp" />
</shape>
\ No newline at end of file
m-im/src/main/res/drawable/medical_list_check_bg.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="1dp"
android:width="1px"
android:color="#ff3464ec" />
<solid android:color="#f2f5f8" />
<corners android:radius="4dp" />
......
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="#F7F7F7">
android:background="#F0F4F8">
<TextView
android:layout_width="wrap_content"
......@@ -11,6 +11,6 @@
android:text="三周前的消息"
android:textSize="12dp"
android:layout_marginLeft="15dp"
android:textColor="#999999"/>
android:textColor="#8595A9"/>
</RelativeLayout>
\ No newline at end of file
m-im/src/main/res/layout/im_nim_inquiry_end_layout.xml
......@@ -7,6 +7,7 @@
android:layout_marginTop="@dimen/platform_dp_12"
android:layout_marginRight="8dp"
android:background="#80d7dfea"
app:cardBackgroundColor="#80d7dfea"
android:elevation="0dp"
android:maxWidth="263dp"
android:minWidth="263dp"
......
m-im/src/main/res/layout/im_nim_inquiry_receive_layout.xml
......@@ -8,16 +8,18 @@
android:layout_marginTop="@dimen/platform_dp_12"
android:layout_marginRight="8dp"
android:background="@color/white"
android:maxWidth="263dp"
app:cardElevation="0dp"
android:elevation="0dp"
android:maxWidth="263dp"
android:minWidth="263dp"
app:cardCornerRadius="8dp">
app:cardCornerRadius="8dp"
app:cardElevation="0dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxWidth="263dp"
android:minWidth="263dp"
android:padding="@dimen/platform_dp_12">
<TextView
......@@ -146,9 +148,9 @@
app:layout_constraintTop_toBottomOf="@id/line_center" />
<ImageView
android:src="@mipmap/medical_icon_arrow_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/medical_icon_arrow_right"
app:layout_constraintBottom_toBottomOf="@id/detail"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/detail" />
......
m-im/src/main/res/layout/medical_add_new_archives_activity.xml
......@@ -68,6 +68,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:background="@null"
android:textStyle="bold"
android:hint="请输入真实姓名"
android:textColor="@color/medical_color_0c1d31"
android:textColorHint="@color/medical_color_c0c9d4"
......@@ -77,7 +78,7 @@
<View
android:id="@+id/line_name"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_height="0.5dp"
android:layout_marginTop="12dp"
android:background="@color/medical_color_e7ecf0"
app:layout_constraintTop_toBottomOf="@id/et_name" />
......@@ -102,6 +103,7 @@
android:digits="0123456789xX"
android:inputType="number"
android:background="@null"
android:textStyle="bold"
android:hint="请输入真实身份证号码"
android:textColor="@color/medical_color_0c1d31"
android:textColorHint="@color/medical_color_c0c9d4"
......@@ -111,7 +113,7 @@
<View
android:id="@+id/line_idcard"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_height="0.5dp"
android:layout_marginTop="12dp"
android:background="@color/medical_color_e7ecf0"
app:layout_constraintTop_toBottomOf="@id/et_idcard" />
......@@ -184,7 +186,7 @@
<View
android:id="@+id/line_merried"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_height="0.5dp"
android:layout_marginTop="12dp"
android:background="@color/medical_color_e7ecf0"
app:layout_constraintTop_toBottomOf="@id/group_merried" />
......@@ -211,7 +213,8 @@
<RadioButton
android:id="@+id/me"
android:layout_width="56dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="32dp"
android:background="@drawable/medical_radiobutton_f2f5f8_1a3464ec_bg"
android:button="@null"
......@@ -221,7 +224,8 @@
<RadioButton
android:id="@+id/parent"
android:layout_width="56dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="32dp"
android:layout_marginStart="16dp"
android:background="@drawable/medical_radiobutton_f2f5f8_1a3464ec_bg"
......@@ -232,7 +236,8 @@
<RadioButton
android:id="@+id/spouse"
android:layout_width="56dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="32dp"
android:layout_marginStart="16dp"
android:background="@drawable/medical_radiobutton_f2f5f8_1a3464ec_bg"
......@@ -243,7 +248,8 @@
<RadioButton
android:id="@+id/children"
android:layout_width="56dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="32dp"
android:layout_marginStart="16dp"
android:background="@drawable/medical_radiobutton_f2f5f8_1a3464ec_bg"
......@@ -254,7 +260,8 @@
<RadioButton
android:id="@+id/other"
android:layout_width="56dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="32dp"
android:layout_marginStart="16dp"
android:background="@drawable/medical_radiobutton_f2f5f8_1a3464ec_bg"
......@@ -268,7 +275,7 @@
<View
android:id="@+id/line_relation"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_height="0.5dp"
android:layout_marginTop="12dp"
android:background="@color/medical_color_e7ecf0"
app:layout_constraintTop_toBottomOf="@id/group_relation" />
......
m-im/src/main/res/layout/medical_graphic_consultation_flow1.xml
......@@ -133,9 +133,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="请描述您的病情"
android:textColor="#10233a"
android:textColor="@color/medical_color_0c1d31"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -154,13 +153,13 @@
android:id="@+id/dec"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="4dp"
android:background="@mipmap/meidical_graphic_text_dec_bg"
android:orientation="vertical"
android:paddingLeft="12dp"
android:paddingTop="24dp"
android:paddingTop="22dp"
android:paddingRight="12dp"
android:paddingBottom="12dp"
android:paddingBottom="8dp"
android:visibility="gone"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
......@@ -196,21 +195,25 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="left|top"
android:hint="为了更好获得医生帮助，请尽可能详细描述病情，\n最少需要描述10个字"
android:hint="为了更好获得医生帮助，请尽可能详细描述病情，最少需要描述10个字"
android:includeFontPadding="false"
android:lineSpacingMultiplier="1.1"
android:maxHeight="200dp"
android:maxEms="200"
android:maxLength="200"
android:minHeight="200dp"
android:padding="12dp"
android:paddingBottom="25dp"
android:paddingLeft="12dp"
android:paddingTop="12dp"
android:paddingRight="12dp"
android:paddingBottom="28dp"
android:textColor="#0C1D31"
android:textColorHint="#C0C9D4"
android:textSize="15sp"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/dec" />
app:layout_constraintTop_toBottomOf="@id/dec"
tools:text="更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助更好获得医生帮助" />
<TextView
android:id="@+id/input_num"
......
m-im/src/main/res/layout/medical_graphic_consultation_flow2.xml
......@@ -155,13 +155,14 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_marginStart="16dp"
android:layout_height="wrap_content">
<TextView
android:id="@+id/first_mit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginTop="16dp"
android:text="是否首次问诊"
android:textColor="#ff0c1d31"
android:textSize="14sp"
......
m-im/src/main/res/layout/medical_im_chat_item_view.xml
......@@ -6,8 +6,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingTop="12dp"
android:paddingLeft="16dp"
android:paddingTop="15dp"
android:paddingRight="15dp">
......@@ -19,9 +19,9 @@
<androidx.cardview.widget.CardView
android:id="@+id/card_img"
android:layout_width="52dp"
android:layout_height="52dp"
app:cardCornerRadius="24dp"
android:layout_marginTop="5dp"
app:cardCornerRadius="26dp"
app:cardElevation="0dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
......@@ -37,8 +37,7 @@
android:id="@+id/chat_message_unread_num"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_marginTop="-15dp"
android:background="@drawable/im_chat_message_unread_num_bg"
android:gravity="center"
android:minWidth="18dp"
......@@ -48,7 +47,7 @@
android:textSize="10sp"
android:visibility="gone"
app:layout_constraintRight_toRightOf="@id/card_img"
app:layout_constraintTop_toTopOf="@id/card_img"
app:layout_constraintTop_toTopOf="parent"
tools:text="3"
tools:visibility="visible" />
......@@ -56,7 +55,7 @@
android:id="@+id/chat_message_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/medical_color_0c1d31"
......@@ -119,7 +118,7 @@
android:layout_marginTop="20dp"
android:background="#E7ECF0"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="@id/card_img"
app:layout_constraintLeft_toLeftOf="@id/chat_message_name"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/chat_message_content" />
......
m-im/src/main/res/layout/medical_im_chat_popup_window.xml
......@@ -7,15 +7,15 @@
<LinearLayout
android:id="@+id/ll_all_read"
android:layout_width="150dp"
android:layout_height="51dp"
android:layout_width="136dp"
android:layout_height="54dp"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginRight="9dp"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginRight="8dp"
android:scaleType="fitXY"
android:src="@mipmap/medical_yidu_icon" />
......@@ -23,26 +23,21 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="全部已读"
android:textColor="#242424"
android:textSize="16dp" />
android:textColor="#10233A"
android:textSize="16sp" />
</LinearLayout>
<View
android:layout_width="150dp"
android:layout_height="0.5dp"
android:background="#EBEBEB" />
<LinearLayout
android:id="@+id/ll_chat_setting"
android:layout_width="150dp"
android:layout_height="51dp"
android:layout_width="136dp"
android:layout_height="54dp"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginRight="9dp"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginRight="8dp"
android:scaleType="fitXY"
android:src="@mipmap/medical_xiaoxi_icon" />
......@@ -50,10 +45,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="消息设置"
android:textColor="#242424"
android:textSize="16dp" />
android:textColor="#10233A"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
m-im/src/main/res/layout/medical_informed_dialog_layout.xml
......@@ -5,6 +5,7 @@
android:layout_marginTop="96dp"
android:background="@color/white"
android:gravity="center"
android:maxHeight="724dp"
android:orientation="vertical">
<RelativeLayout
......@@ -25,12 +26,11 @@
<ImageView
android:id="@+id/close"
android:layout_width="55dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:paddingLeft="20dp"
android:paddingTop="24dp"
android:paddingRight="20dp"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginRight="24dp"
android:src="@mipmap/medical_close_black_icon" />
</RelativeLayout>
......
m-im/src/main/res/layout/medical_item_archives_flow2_list.xml
......@@ -5,11 +5,9 @@
android:id="@+id/bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:background="@drawable/medical_bg_edit_f2f5f8"
android:paddingStart="12dp"
android:paddingTop="8dp"
tools:background="@drawable/medical_list_check_bg">
<androidx.constraintlayout.widget.Group
......@@ -17,12 +15,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="age,name,sex"
tools:visibility="gone" />
tools:visibility="visible" />
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginTop="8dp"
android:textColor="@color/medical_color_0c1d31"
android:textSize="16sp"
app:layout_constraintLeft_toLeftOf="parent"
......@@ -44,21 +44,22 @@
<TextView
android:id="@+id/age"
android:layout_width="31dp"
android:layout_height="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:text="20岁"
android:textColor="#ff495c72"
android:textSize="14sp"
app:layout_constraintBaseline_toBaselineOf="@id/sex"
app:layout_constraintLeft_toRightOf="@id/sex" />
<ImageView
android:visibility="gone"
android:id="@+id/iv_bottom_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/medical_check_bottom_right"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
......@@ -68,15 +69,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="gone"
app:constraint_referenced_ids="add,tv_add" />
<ImageView
android:id="@+id/add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:src="@mipmap/medical_add_icon"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/tv_add"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -85,8 +88,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginEnd="16dp"
android:paddingBottom="10dp"
android:text="添加患者"
android:textColor="#ff495c72"
android:textSize="12sp"
......
m-im/src/main/res/layout/medical_item_archives_list.xml
......@@ -16,7 +16,6 @@
android:layout_height="wrap_content"
android:textColor="@color/medical_color_10233a"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="萨芬" />
......@@ -38,7 +37,6 @@
android:layout_marginStart="8dp"
android:textColor="@color/medical_color_10233a"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBaseline_toBaselineOf="@id/name"
app:layout_constraintStart_toEndOf="@id/name_right"
tools:text="男" />
......@@ -60,25 +58,10 @@
android:layout_marginStart="8dp"
android:textColor="@color/medical_color_10233a"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBaseline_toBaselineOf="@id/name"
app:layout_constraintStart_toEndOf="@id/sex_right"
tools:text="20岁" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:background="@drawable/medical_bg_e7ecf0_2dp"
android:paddingLeft="4dp"
android:paddingTop="2dp"
android:paddingRight="4dp"
android:paddingBottom="1dp"
android:text="已认证"
android:textColor="@color/medical_color_8595a9"
android:textSize="12sp"
app:layout_constraintBaseline_toBaselineOf="@id/name"
app:layout_constraintStart_toEndOf="@id/age" />
<TextView
android:id="@+id/id_card"
......
m-im/src/main/res/values/strings.xml
......@@ -112,7 +112,9 @@
<string name="im_now_allow_space">不能含有空格</string>
<string name="im_readed">已读</string>
<string name="im_input_panel_photo">图 片</string>
<string name="im_input_panel_photo_medical">相 册</string>
<string name="im_input_panel_video">视 频</string>
<string name="im_input_panel_video_medical">拍 摄</string>
<string name="im_repeat_download_message">重新下载?</string>
<string name="im_repeat_send_has_blank">重 发</string>
<string name="im_repeat_send_message">重发消息?</string>
......
m-im/src/main/res_uikit/drawable/im_nim_chat_input_edit_background.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingDefaultResource">
android:shape="rectangle">
<corners android:radius="6dp" />
<solid android:color="@color/im_white" />
<corners android:radius="8dp" />
<solid android:color="#F6FAFF" />
</shape>
m-im/src/main/res_uikit/layout/im_nim_message_activity_actions_layout.xml
......@@ -3,7 +3,7 @@
android:id="@+id/actionsLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/platform_color_F7F7F7"
android:background="@color/white"
android:orientation="vertical"
android:visibility="gone" >
......
m-im/src/main/res_uikit/layout/im_nim_message_activity_text_layout.xml
......@@ -3,7 +3,7 @@
android:id="@+id/textMessageLayout"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="@color/platform_color_F7F7F7"
android:background="@color/white"
android:gravity="center_vertical">
<!--android:paddingTop="@dimen/bottom_component_margin_vertical"-->
<!--android:paddingBottom="@dimen/bottom_component_margin_vertical"-->
......@@ -78,7 +78,7 @@
android:hint="隐私保密，安心咨询"
android:layout_weight="1"
android:autoLink="all"
android:background="#ffffff"
android:background="#F6FAFF"
android:maxHeight="72dp"
android:maxLines="4"
android:textColorHint="#CCCCCC"
......
m-im/src/main/res_uikit/layout/im_nim_simple_load_more.xml
......@@ -2,6 +2,7 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_marginTop="20dp"
android:layout_height="@dimen/platform_dp_40">
<LinearLayout
......@@ -40,6 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@color/medical_color_c0c9d4"
android:text="@string/im_load_failed"/>
</FrameLayout>
......@@ -55,6 +57,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/im_load_end"
android:textColor="@android:color/darker_gray"/>
android:textColor="@color/medical_color_c0c9d4"/>
</FrameLayout>
</FrameLayout>
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/color_f8f8f8"
android:background="@color/medical_color_f0f4f8"
android:orientation="vertical">
<FrameLayout
......
ydl-medical-pay/src/main/java/com/medical/ydl/medical/dialog/TimeBackDialog.java
......@@ -243,7 +243,7 @@ public class TimeBackDialog extends Dialog {
// instantiate the dialog with the custom Theme
dialog = new NormalDialog(context, R.style.platform_normaldialog_style);
View layout;
layout = inflater.inflate(R.layout.dialog_normal_layout, null);
layout = inflater.inflate(R.layout.platform_dialog_normal_layout, null);
dialog.addContentView(layout, new LayoutParams(
LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
......
ydl-medical-pay/src/main/res/layout/medical_pay_activity.xml
......@@ -76,7 +76,7 @@
android:id="@+id/hold_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
android:layout_marginTop="4dp"
android:text="等待付款"
android:textColor="#ff0c1d31"
android:textSize="16sp"
......
ydl-platform/src/main/java/com/ydl/ydlcommon/view/dialog/NormalDialog.java
......@@ -226,13 +226,13 @@ public class NormalDialog extends Dialog {
dialog = new NormalDialog(context, R.style.platform_normaldialog_style);
View layout;
if("left".equals(dialog_type)){
layout = inflater.inflate(R.layout.dialog_common_left_layout, null);
layout = inflater.inflate(R.layout.platform_dialog_common_left_layout, null);
}else {
layout = inflater.inflate(R.layout.dialog_normal_layout, null);
layout = inflater.inflate(R.layout.platform_dialog_normal_layout, null);
}
dialog.addContentView(layout, new LayoutParams(
LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
// set the dialog title
TextView title_tv=((TextView) layout.findViewById(R.id.title));
TextView message_tv=((TextView) layout.findViewById(R.id.message));
......
ydl-platform/src/main/res/layout/platform_dialog_common_left_layout.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:minWidth="200dp"
android:background="@drawable/normaldialog_layout_bg"
android:orientation="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_marginTop="10dp"
android:layout_marginBottom="10dp"
android:orientation="vertical" >
<TextView
android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="left"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:textSize="18sp"
android:text="正文"
android:autoLink="all"/>
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="#D1D1D1" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="40dp"
android:orientation="horizontal" >
<Button
android:id="@+id/cancel_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:textSize="18sp"
android:background="@drawable/normaldialog_left_btn_select"
android:text="取消"/>
<View
android:layout_width="0.5dp"
android:layout_height="36dp"
android:background="@color/title_bottom_line_bg"
/>
<Button
android:id="@+id/confirm_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:textSize="18sp"
android:textColor="@color/text_user"
android:background="@drawable/normaldialog_right_btn_select"
android:text="确定"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
\ No newline at end of file
ydl-platform/src/main/res/layout/platform_dialog_normal_layout.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:minWidth="300dp"
android:maxWidth="300dp"
android:layout_height="wrap_content"
android:layout_gravity="center" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:minWidth="300dp"
android:maxWidth="300dp"
android:background="@drawable/normaldialog_layout_bg"
android:orientation="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
android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:textSize="18sp"
android:textColor="#10233A"
android:text="正文"
android:autoLink="all"/>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#E7ECF0" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="53dp"
android:orientation="horizontal" >
<Button
android:id="@+id/cancel_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:textColor="#8595A9"
android:textSize="18sp"
android:background="@drawable/normaldialog_left_btn_select"
android:text="取消"/>
<View
android:layout_width="0.5dp"
android:layout_height="36dp"
android:background="#E7ECF0"
/>
<Button
android:id="@+id/confirm_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:textSize="18sp"
android:textColor="#3464EC"
android:background="@drawable/normaldialog_right_btn_select"
android:text="确定"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
\ No newline at end of file
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