Skip to content

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

Merge remote-tracking branch 'origin/4.2.90_medical' into 4.2.90_medical 

# Conflicts:
#	m-im/src/main/java/com/yidianling/medical/GraphicConsultationFlow1Activity.kt
parents 7538c193 60d6c567
Showing with 93 additions and 80 deletions
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
......@@ -20,8 +20,8 @@ import java.util.List;
public final class DemoGlobalConfig implements IConfigModule {
String APP_DOMAIN = "https://api.github.com/";
// public static String appEnv = YDLConstants.ENV_TEST;
public static String appEnv = YDLConstants.ENV_NEW_TEST;
// public static String appEnv = YDLConstants.ENV_PROD;
// public static String appEnv = YDLConstants.ENV_NEW_TEST;
public static String appEnv = YDLConstants.ENV_PROD;
@Override
public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {
......
config.gradle
......@@ -8,9 +8,9 @@ ext {
"m-confide" : "0.0.49.10",
"m-consultant" : "0.0.59.91",
"m-fm" : "0.0.30.03",
"m-user" : "0.0.61.84",
"m-user" : "0.0.61.88",
"m-home" : "0.0.22.70",
"m-im" : "0.0.20.55",
"m-im" : "0.0.20.64",
"m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.10",
......@@ -33,13 +33,13 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.40.59",
"ydl-platform" : "0.0.40.62",
//第二步 若干
"ydl-webview" : "0.0.38.53",
"ydl-webview" : "0.0.38.56",
"ydl-media" : "0.0.21.10",
"ydl-pay" : "0.0.18.19",
"ydl-medical-pay" : "0.0.01.19",
"ydl-medical-pay" : "0.0.01.20",
"m-audioim" : "0.0.49.29.37",
"ydl-flutter-base": "0.0.14.26",
......@@ -92,9 +92,9 @@ ext {
"m-confide" : "0.0.49.10",
"m-consultant" : "0.0.59.91",
"m-fm" : "0.0.30.01",
"m-user" : "0.0.61.84",
"m-user" : "0.0.61.88",
"m-home" : "0.0.22.70",
"m-im" : "0.0.20.55",
"m-im" : "0.0.20.64",
"m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.8",
......@@ -116,10 +116,10 @@ ext {
//-------------- 功能组件 --------------
//第一步
"ydl-platform" : "0.0.40.59",
"ydl-platform" : "0.0.40.61",
//第二步 若干
"ydl-webview" : "0.0.38.53",
"ydl-webview" : "0.0.38.56",
"ydl-media" : "0.0.21.10",
"ydl-pay" : "0.0.18.19",
"ydl-medical-pay" : "0.0.01.19",
......
m-im/src/main/java/com/yidianling/im/bridge/P2PCustomActionHandlerImpl.java
......@@ -608,7 +608,7 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
}
List<String> list = new ArrayList<>();
if (ImConstants.KEFUXIAOYI.equals(toChatUsername) || "4108805".equals(toChatUsername)) {
list.add("历史聊天记录");
// list.add("历史聊天记录");
list.add("客服热线");
} else {
list.add("投诉反馈");
......@@ -623,7 +623,7 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
// if (userType == 2) {
// list.add("访问专家主页");
// }
list.add("历史聊天记录");
// list.add("历史聊天记录");
list.add("删除聊天记录");
}
ListDialog.Builder dialog = new ListDialog.Builder(mActivity, list, 0);
......
m-im/src/main/java/com/yidianling/im/http/ImRetrofitApi.kt
......@@ -165,7 +165,7 @@ interface ImRetrofitApi {
//获取医生问诊状态
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL, "Content-Type:application/json")
@GET("ydl-yiliao-api/api/client/inquiry/v1/getInquIryIngInfo")
@GET("api/client/inquiry/v1/getInquIryIngInfo")
fun getInquIryIngInfo(
@Query("doctorUid") doctorId: String,
@Query("userUid") userUid: String
......
m-im/src/main/java/com/yidianling/medical/GraphicConsultationFlow1Activity.kt
......@@ -152,8 +152,6 @@ class GraphicConsultationFlow1Activity : BaseActivity() {
iv_back.setOnClickListener {
backCheck()
}
showDialogTip()
setEditHint()
}
......@@ -180,28 +178,6 @@ class GraphicConsultationFlow1Activity : BaseActivity() {
}
}
private fun showDialogTip() {
val builder = NormalDialog.Builder(this@GraphicConsultationFlow1Activity, "center", true)
builder.setTitle("")
builder.setMessage("\n为向您添加的就诊人提供问诊服务，您需要向我们提供该就诊人的身份证号码，并确保在提供前已取得该就诊人的授权同意；若该就诊人为儿童的，您需要在提供前征得该儿童监控人的同意。\n")
builder.setPositiveButton(
"不同意"
) { dialog, which ->
//关闭页面
finish()
dialog.dismiss()
}.setNegativeButton(
"同意"
) { dialog, which ->
dialog.dismiss()
}
builder.setRight_color("#3464EC")
builder.setLeft_color("#3464EC")
builder.setContent_color("#10233A")
builder.create().show()
}
@SuppressLint("CheckResult")
private fun upFile(publishTrendImgs: MutableList<ParcelableImage>) {
......
m-im/src/main/java/com/yidianling/medical/archives/MedicalAddNewArchivesActivity.kt
......@@ -3,8 +3,10 @@ package com.yidianling.medical.archives
import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.view.View
import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.view.dialog.NormalDialog
import com.yidianling.common.tools.ToastUtil
import com.yidianling.im.R
import com.yidianling.uikit.custom.http.ServiceImpl
......@@ -103,9 +105,30 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
iv_back.setOnClickListener { finish() }
showDialogTip()
}
private fun showDialogTip() {
val builder = NormalDialog.Builder(this@MedicalAddNewArchivesActivity, "center", false)
builder.setTitle("")
builder.setMessage("\n为向您添加的就诊人提供问诊服务，您需要向我们提供该就诊人的身份证号码，并确保在提供前已取得该就诊人的授权同意；若该就诊人为儿童的，您需要在提供前征得该儿童监护人的同意。\n")
builder.setPositiveButton(
"不同意"
) { dialog, which ->
//关闭页面
finish()
dialog.dismiss()
}.setNegativeButton(
"同意"
) { dialog, which ->
dialog.dismiss()
}
builder.setRight_color("#3464EC")
builder.setLeft_color("#3464EC")
builder.setContent_color("#10233A")
builder.create().show()
}
@SuppressLint("CheckResult")
private fun checkInfo() {
if (et_name.text.isNullOrEmpty()) {
......
m-im/src/main/java/com/yidianling/medical/archives/MedicalArchivesListActivity.kt
......@@ -124,10 +124,10 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh
}
} else {
mAdapter.loadMoreEnd(false)
mAdapter.setNewData(list)
var net_error= mEmptyView.findViewById<TextView>(R.id.net_error)
net_error.text="暂无数据"
net_error.text="暂无就诊人信息，请添加～"
mAdapter.emptyView = mEmptyView
}
} else {
//非第一页数据
......@@ -159,7 +159,9 @@ class MedicalArchivesListActivity : BaseActivity(), SwipeRefreshLayout.OnRefresh
doctor_swipe_refresh_layout.isRefreshing = false
mAdapter.loadMoreFail()
var net_error= mEmptyView.findViewById<TextView>(R.id.net_error)
var reLoad= mEmptyView.findViewById<TextView>(R.id.reLoad)
net_error.text="网络异常，请稍后再试"
reLoad.visibility=View.VISIBLE
mAdapter.emptyView = mEmptyView
})
......
m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceApi.kt
......@@ -122,7 +122,7 @@ interface ServiceApi {
): Observable<BaseAPIResponse<String>>
//医疗获取患者管理列表，支持分页
@GET("ydl-yiliao-api/api/client/user/patient/v1/getPageList")
@GET("api/client/user/patient/v1/getPageList")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
fun getPageList(
@Query("pageNum") pageNum: Int,
......@@ -130,37 +130,37 @@ interface ServiceApi {
): Observable<BaseAPIResponse<MedicalUserArchivesBean>>
//医疗 获取问诊人列表
@GET("ydl-yiliao-api/api/client/user/patient/v1/getList")
@GET("api/client/user/patient/v1/getList")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
fun getList(): Observable<BaseAPIResponse<List<MedicalArchivesListBean>>>
//医疗 创建问诊人
@POST("ydl-yiliao-api/api/client/user/patient/v1/create")
@POST("api/client/user/patient/v1/create")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
fun createArchives(@Body body: RequestBody): Observable<BaseAPIResponse<Any>>
//医疗 创建问诊订单
@POST("ydl-yiliao-api/api/client/inquiry/v1/create")
@POST("api/client/inquiry/v1/create")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
fun createArchivesOrder(@Body body: RequestBody): Observable<BaseAPIResponse<CreateArchivesRespose>>
//医疗 删除问诊人
@POST("ydl-yiliao-api/api/client/user/patient/v1/delete")
@POST("api/client/user/patient/v1/delete")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
fun deleteArchives(@Body body: RequestBody): Observable<BaseAPIResponse<Any>>
//上传文件，多文件批量上传
@POST("ydl-yiliao-api/api/client/common/v1/uploadBatch")
@POST("api/client/common/v1/uploadBatch")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
@Multipart
fun uploadBatch(@PartMap params: TreeMap<String, RequestBody>): Observable<BaseAPIResponse<List<MedicalFileBeanRespose>>>
//上传文件，单文件上传
@POST("ydl-yiliao-api/api/client/common/v1/upload")
@POST("api/client/common/v1/upload")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
fun upload(@PartMap params: TreeMap<String, RequestBody>): Observable<BaseAPIResponse<MedicalFileBeanRespose>>
......
m-im/src/main/res/layout/medical_add_new_archives_activity.xml
......@@ -26,7 +26,7 @@
android:gravity="center"
android:maxEms="10"
android:maxLines="1"
android:text="新增问诊人"
android:text="新增就诊人"
android:textColor="@color/medical_color_10233a"
android:textSize="18sp"
android:textStyle="bold" />
......@@ -197,7 +197,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="与问诊人的关系"
android:text="与就诊人的关系"
android:textColor="#ff0c1d31"
android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="@id/tv_name"
......
m-im/src/main/res/layout/medical_graphic_consultation_flow2.xml
......@@ -294,7 +294,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="、家庭签约"
android:text=""
android:textColor="@color/medical_color_8595a9"
android:textSize="12sp"
app:layout_constraintBaseline_toBaselineOf="@id/text_left"
......
m-im/src/main/res/layout/medical_list_empty_view.xml
......@@ -4,20 +4,30 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/net_error"
app:layout_constraintVertical_chainStyle="packed"
android:background="@drawable/patient_empty"
android:id="@+id/errorImg"
>
</ImageView>
<TextView
android:id="@+id/net_error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="网络异常，请稍后再试"
android:textColor="@color/medical_color_8595a9"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@id/reLoad"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@id/errorImg"
/>
<TextView
......@@ -30,9 +40,10 @@
android:background="@drawable/medical_bg_3464ec_8dp"
android:textColor="@color/white"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/net_error" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
m-im/src/main/res_uikit/layout/im_ydl_nim_message_fragment.xml
......@@ -118,7 +118,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="待诊断"
android:text="问诊中"
android:textColor="#ff3464ec"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
......
m-user/src/main/java/com/yidianling/user/http/UserApi.kt
package com.yidianling.user.http
import com.google.gson.internal.LinkedTreeMap
import com.ydl.ydlcommon.base.config.YDLConstants
import com.ydl.ydlcommon.base.config.YDL_DOMAIN
import com.ydl.ydlcommon.base.config.YDL_DOMAIN_JAVA
import com.ydl.ydlcommon.base.config.YDL_DOMAIN_LOGIN_BASE_URL
import com.ydl.ydlcommon.base.config.*
import com.ydl.ydlcommon.data.http.BaseAPIResponse
import com.ydl.ydlcommon.data.http.BaseResponse
import com.yidianling.user.api.bean.UserResponseBean
......@@ -29,7 +26,7 @@ interface UserApi {
fun login(@FieldMap params: Map<String, String>): Observable<BaseResponse<UserResponseBean>>
//国家列表
@GET("ydl-yiliao-api/api/client/login/v1/get_country_code_list")
@GET("api/client/login/v1/get_country_code_list")
@Headers(YDL_DOMAIN + YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
fun countryList(@Query("gatewayUrl") gatewayUrl: String): Observable<BaseResponse<List<CountryResponse>>>
......@@ -96,7 +93,7 @@ interface UserApi {
//登出
@FormUrlEncoded
@POST("ydl-yiliao-api/api/client/login/v1/logout")
@POST("api/client/login/v1/logout")
fun logout(@FieldMap params: Map<String, String>): Observable<BaseResponse<Any>>
//更换手机时密码验证
......@@ -154,7 +151,7 @@ interface UserApi {
* 绑定手机号
*/
@POST("login/v2/bind_phone")
@Headers(YDL_DOMAIN + YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL, LOGIN_USER_PORT)
fun bindPhone(@Body body: RequestBody): Observable<BaseResponse<Any>>
/**
......@@ -168,15 +165,15 @@ interface UserApi {
/**
* 密码登录
*/
@POST("ydl-yiliao-api/api/client/login/v1/login_pwd")
@Headers(YDL_DOMAIN + YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
@POST("api/client/login/v1/login_pwd")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL, LOGIN_USER_PORT)
fun loginByPassword(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
/**
* 验证码登录
*/
@POST("ydl-yiliao-api/api/client/login/v1/login_sms")
@Headers(YDL_DOMAIN + YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
@POST("api/client/login/v1/login_sms")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL, LOGIN_USER_PORT)
fun loginByMsgCode(@Body body: RequestBody): Observable<BaseResponse<UserResponseBean>>
/**
......@@ -189,8 +186,8 @@ interface UserApi {
/**
* 检查手机号来源
*/
@GET("ydl-yiliao-api/api/client/login/v1/phone_detection")
@Headers(YDL_DOMAIN + YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
@GET("api/client/login/v1/phone_detection")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL, LOGIN_USER_PORT)
fun checkPhoneStatus(
@Query("phone") phone: String,
@Query("countryCode") countryCode: String,
......@@ -218,8 +215,8 @@ interface UserApi {
/**
* 发送登录验证码
*/
@GET("ydl-yiliao-api/api/client/login/v1/send_login_sms")
@Headers(YDL_DOMAIN + YDL_DOMAIN_LOGIN_BASE_URL, LOGIN_USER_PORT)
@GET("api/client/login/v1/send_login_sms")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL, LOGIN_USER_PORT)
fun sendLoginMsgCode(
@Query("phone") phone: String,
@Query("countryCode") countryCode: String,
......@@ -248,7 +245,7 @@ interface UserApi {
*/
@FormUrlEncoded
@POST("user/forbid_login")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
fun userForbidLogin(@FieldMap params: Map<String, String>): Observable<BaseAPIResponse<Boolean>>
/**
......
ydl-medical-pay/src/main/java/com/medical/ydl/medical/http/MedicalPayServices.kt
......@@ -13,7 +13,7 @@ interface MedicalPayServices {
/**
* 问诊订单创建支付
*/
@POST("ydl-yiliao-api/api/pay/createPay")
@POST("api/pay/createPay")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
fun getOrderInfo(@Body body: RequestBody): Observable<BaseResponse<CreatePayRespose>>
......@@ -21,7 +21,7 @@ interface MedicalPayServices {
/**
* 获取订单结束时间
*/
@GET("ydl-yiliao-api/api/client/inquiry/v1/getSurplusPayTime")
@GET("api/client/inquiry/v1/getSurplusPayTime")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
fun getSurplusPayTime(@Query("inquiryOrderId") inquiryOrderId: String): Observable<BaseResponse<PayTimeRespose>>
......
ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/HttpConfig.kt
......@@ -534,8 +534,8 @@ class HttpConfig {
.subscribe({
if (it.baseUrlGatewayDTOList.isNotEmpty()) {
isEncryption = it.baseUrlGatewayDTOList[0].goGateway
GET_GATEWAY_BASE_URL = it.baseUrlGatewayDTOList[0].baseUrl
if (isEncryption) {
GET_GATEWAY_BASE_URL = it.baseUrlGatewayDTOList[0].baseUrl
JAVA_LOGIN_BASE_URL = it.baseUrlGatewayDTOList[0].baseUrl + "/"
urlMap[YDL_DOMAIN_LOGIN_BASE_URL] = JAVA_LOGIN_BASE_URL
ApiFactory.getInstance().setMultipleUrlMap(urlMap)
......
ydl-platform/src/main/java/com/ydl/ydlcommon/data/http/api/NetApiStore.java
......@@ -52,6 +52,6 @@ interface NetApiStore {
Observable<BaseAPIResponse<JavaGlobalInfo>> getJavaGlobalInfo();
@Headers({YDL_DOMAIN+ YDL_DOMAIN_JAVA_URL,"userPort:1","Content-type:application/json;charset=UTF-8"})
@POST("ydl-yiliao-api/api/client/login/v1/get_gateway_base_url")
@POST("api/client/login/v1/get_gateway_base_url")
Observable<BaseAPIResponse<BaseUrlBean>> getBaseUrl(@Body Map<String, Object> map);
}
ydl-platform/src/main/res/raw/api.properties
......@@ -46,10 +46,10 @@ medicalh5url.auto_test = https://auto_testnewm.yidianling.cn/
medicalh5url.prod = https://m.yidianling.cn/
#java服务器域名
javaurl.new_test = https://ydltestapi.ydl.com/
javaurl.test = https://testapi.ydl.com/
javaurl.auto_test = https://auto_testapi.ydl.com/
javaurl.prod = https://api.ydl.com/
javaurl.new_test = https://ydltestapi.ydl.com/ydl-yiliao-api/
javaurl.test = https://testapi.ydl.com/ydl-yiliao-api/
javaurl.auto_test = https://auto_testapi.ydl.com/ydl-yiliao-api/
javaurl.prod = https://api.yidianling.cn/
#java服务器api统一域名
javaapi.new_test = https://ydltestapi.ydl.com/api/
......
ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java
......@@ -696,8 +696,11 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
@Override
public void onReceivedTitle(WebView view, String title) {
super.onReceivedTitle(view, title);
LogUtil.e("H5页面title:"+title);
if (TextUtils.isEmpty(h5Params.getTitle())){
tb_title.setTitle(title);
}else{
tb_title.setTitle(h5Params.getTitle());
}
wv_content.setTitle(title);
if ("我的订单".equals(title)) {
......
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