Skip to content

Y
YDL-Component-Medical
Commit 4b3c125c by konghaorui
Options

Merge branch 'feature/v3' of… 

Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
parents 776bc4d7 c87dabe8
Showing with 88 additions and 74 deletions
config.gradle
......@@ -47,12 +47,12 @@ ext {
"m-consultant" : "0.0.50.1",
"m-fm" : "0.0.23.1",
"m-user" : "0.0.40.1",
"m-home" : "0.0.6.2",
"m-home" : "0.0.6.3",
"m-muse" : "0.0.20.1",
"m-tests" : "0.0.15.1",
"m-course" : "0.0.34.1",
"m-im" : "0.0.1.1",
"m-im" : "0.0.2",
//-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.5",
......@@ -64,7 +64,7 @@ ext {
"m-tests-api" : "0.0.1",
"m-user-api" : "0.0.7",
"m-home-api" : "0.0.3",
"m-im-api" : "0.0.1",
"m-im-api" : "0.0.2",
//-------------- 功能组件 --------------
//第一步
......@@ -107,7 +107,7 @@ ext {
"m-tests-api" : "0.0.1",
"m-user-api" : "0.0.7",
"m-home-api" : "0.0.3",
"m-im-api" : "0.0.1",
"m-im-api" : "0.0.2",
//-------------- 功能组件 --------------
//第一步
......
m-course/src/main/java/com/yidianling/course/flutterPlugin/CourseSendPlugin.kt
......@@ -35,16 +35,16 @@ object CourseSendPlugin {
fun sendMsg(isPlaying: Boolean) {
eventSink!!.success(isPlaying)
eventSink?.success(isPlaying)
}
fun sendRequestData() {
eventSink!!.success("requestData")
eventSink?.success("requestData")
}
fun sendLoginSuccess() {
eventSink!!.success("loginSuccess")
eventSink?.success("loginSuccess")
}
}
\ No newline at end of file
m-home/src/main/java/com/yidianling/home/model/bean/HomeConsultBean.kt
......@@ -58,15 +58,11 @@ class HomeConsultBean: HomeItemBaseBean {
*/
//字段名称改了
@SerializedName("uid")
var doctorUid: Int = 0
var doctorId: String = ""
@SerializedName("name")
var doctorName: String? = null
@SerializedName("head")
var doctorHead: String? = null
var profesBack: String? = null
@SerializedName("minBookingPrice")
var serviceFee: Int = 0
var zixunOrderNum: Int = 0
var feedbackRate: Float = 0f
......@@ -74,7 +70,6 @@ class HomeConsultBean: HomeItemBaseBean {
var city: String? = null
var isOnline: Int = 0
var mUrl: String? = null
@SerializedName("linkUrl")
var hUrl: String? = null
var share: ShareBean? = null
var isHiddenXcx: String? = null
......
m-im/modular.gradle
......@@ -24,7 +24,7 @@ modular {
groupId = "com.ydl"
artifactId = "m-im-api"
//开发时注释掉版本号，发布api时打开
// version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
// API 层打包时需要引入的依赖
apiDependencies {
implementation "com.google.code.gson:gson:2.8.2"
......
m-im/src/main/java/com/yidianling/uikit/business/session/activity/YDLBaseMessageActivity.java
package com.yidianling.uikit.business.session.activity;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
......@@ -115,6 +116,7 @@ public abstract class YDLBaseMessageActivity extends UI {
//==================== ChatUI Override ====================
@SuppressLint("CheckResult")
public void setToolBar(int toolBarId) {
tb = (TitleBarBottom) findViewById(toolBarId);
if (ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getInfo() != null) {
......@@ -144,31 +146,34 @@ public abstract class YDLBaseMessageActivity extends UI {
Disposable dis = ServiceImpl.Companion.getInstance().getDoctorChatStatus(Long.parseLong(ActionHandlerStorage.getL(sessionId).getInfo().toUid))
.subscribe(chatStatusBean -> {
int status = chatStatusBean.data.getStatus();
ActionHandlerStorage.getL(sessionId).setDoctorStatus(status);
ActionHandlerStorage.getL(sessionId).setDoctorBusyNum(chatStatusBean.data.getBusyTotal());
//1.在线，2.离线，3.忙碌 4咨询中， 5倾述中 6咨询前准备
if (status == 2) {
//离线
tb.setMinTitleText("离线");
tb.setMinTitleColor(getResources().getColor(R.color.platform_color_666666));
tb.setMinTitleDrawable(getResources().getDrawable(R.drawable.im_background_chat_top_status_off_line));
} else if (status == 4 || status == 5) {
//服务中
tb.setMinTitleText("服务中");
tb.setMinTitleColor(getResources().getColor(R.color.platform_color_666666));
tb.setMinTitleDrawable(getResources().getDrawable(R.drawable.im_background_chat_top_status_online_server));
} else {
//在线 1，3，6..
tb.setMinTitleText("在线");
tb.setMinTitleColor(getResources().getColor(R.color.platform_color_666666));
tb.setMinTitleDrawable(getResources().getDrawable(R.drawable.im_background_chat_top_status_online));
if (ActionHandlerStorage.getL(sessionId) != null) {
int status = chatStatusBean.data.getStatus();
ActionHandlerStorage.getL(sessionId).setDoctorStatus(status);
ActionHandlerStorage.getL(sessionId).setDoctorBusyNum(chatStatusBean.data.getBusyTotal());
//1.在线，2.离线，3.忙碌 4咨询中， 5倾述中 6咨询前准备
if (status == 2) {
//离线
tb.setMinTitleText("离线");
tb.setMinTitleColor(getResources().getColor(R.color.platform_color_666666));
tb.setMinTitleDrawable(getResources().getDrawable(R.drawable.im_background_chat_top_status_off_line));
} else if (status == 4 || status == 5) {
//服务中
tb.setMinTitleText("服务中");
tb.setMinTitleColor(getResources().getColor(R.color.platform_color_666666));
tb.setMinTitleDrawable(getResources().getDrawable(R.drawable.im_background_chat_top_status_online_server));
} else {
//在线 1，3，6..
tb.setMinTitleText("在线");
tb.setMinTitleColor(getResources().getColor(R.color.platform_color_666666));
tb.setMinTitleDrawable(getResources().getDrawable(R.drawable.im_background_chat_top_status_online));
}
initSystemMessage(chatStatusBean.data.getPromptRule(), status);
}
initSystemMessage(chatStatusBean.data.getPromptRule(), status);
}, throwable -> {
});
} else if (ActionHandlerStorage.getL(sessionId).getUserType() == 3) {
......@@ -178,16 +183,18 @@ public abstract class YDLBaseMessageActivity extends UI {
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(res -> {
if (res.data == 1) {
//在线
tb.setMinTitleText("在线");
tb.setMinTitleColor(getResources().getColor(R.color.platform_color_666666));
tb.setMinTitleDrawable(getResources().getDrawable(R.drawable.im_background_chat_top_status_online));
} else {
//离线
tb.setMinTitleText("离线");
tb.setMinTitleColor(getResources().getColor(R.color.platform_color_666666));
tb.setMinTitleDrawable(getResources().getDrawable(R.drawable.im_background_chat_top_status_off_line));
if (ActionHandlerStorage.getL(sessionId) != null) {
if (res.data == 1) {
//在线
tb.setMinTitleText("在线");
tb.setMinTitleColor(getResources().getColor(R.color.platform_color_666666));
tb.setMinTitleDrawable(getResources().getDrawable(R.drawable.im_background_chat_top_status_online));
} else {
//离线
tb.setMinTitleText("离线");
tb.setMinTitleColor(getResources().getColor(R.color.platform_color_666666));
tb.setMinTitleDrawable(getResources().getDrawable(R.drawable.im_background_chat_top_status_off_line));
}
}
}, throwable -> {
});
......@@ -221,6 +228,7 @@ public abstract class YDLBaseMessageActivity extends UI {
/**
* 发送推荐专家列表
*/
@SuppressLint("CheckResult")
public void sendRecommendExpertListMessage(int type, boolean showExpertList) {
// 调取接口获取推荐专家列表
......@@ -232,7 +240,9 @@ public abstract class YDLBaseMessageActivity extends UI {
.observeOn(AndroidSchedulers.mainThread())
.subscribe(res -> {
//发送推荐专家列表消息
ActionHandlerStorage.getL(sessionId).sendRecommendExpertListMessage(sessionId, res.data, type, showExpertList);
if (ActionHandlerStorage.getL(sessionId) != null) {
ActionHandlerStorage.getL(sessionId).sendRecommendExpertListMessage(sessionId, res.data, type, showExpertList);
}
}, throwable -> {
ToastUtil.toastShort(throwable.toString());
});
......
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
......@@ -214,30 +214,32 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
* 初始化顶部专家信息栏
*/
private void initTopCustomBar() {
// 头像
String headUrl = ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoSmallImage;
if (!TextUtils.isEmpty(headUrl)) {
GlideApp.with(getActivity()).load(headUrl).into(small_head_img);
}
// 帮助人数
String help_num = String.valueOf(ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoOrderNum);
if (TextUtils.isEmpty(help_num)) help_num = "0";
help_num_tv.setText(help_num);
// 服务时长
String server_num = String.valueOf((int) Math.ceil((double) ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoHelpLong / 60.0));
if (TextUtils.isEmpty(server_num)) server_num = "0";
server_num_tv.setText(server_num);
// 好评率
String good_num = String.format("%.2f", ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoFeedbackRate * 20);
if (TextUtils.isEmpty(good_num)) good_num = "0.00";
good_num_tv.setText(good_num + "%");
if (!TextUtils.isEmpty(headUrl)) {
IP2PCustomActionHandler.DocInfo info = ActionHandlerStorage.getL(sessionId).getInfo();
if (null != info) {
NimUserInfo user = NimUserInfoCache.getInstance().getUserInfo(info.toUid);
if (null != user && null != user.getAvatar() && headUrl.equals(user.getAvatar())) {
NimUserInfoCache.getInstance().getUserInfoFromRemote(info.toUid, null);
if (ActionHandlerStorage.getL(sessionId) != null) {
// 头像
String headUrl = ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoSmallImage;
if (!TextUtils.isEmpty(headUrl)) {
GlideApp.with(getActivity()).load(headUrl).into(small_head_img);
}
// 帮助人数
String help_num = String.valueOf(ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoOrderNum);
if (TextUtils.isEmpty(help_num)) help_num = "0";
help_num_tv.setText(help_num);
// 服务时长
String server_num = String.valueOf((int) Math.ceil((double) ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoHelpLong / 60.0));
if (TextUtils.isEmpty(server_num)) server_num = "0";
server_num_tv.setText(server_num);
// 好评率
String good_num = String.format("%.2f", ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoFeedbackRate * 20);
if (TextUtils.isEmpty(good_num)) good_num = "0.00";
good_num_tv.setText(good_num + "%");
if (!TextUtils.isEmpty(headUrl)) {
IP2PCustomActionHandler.DocInfo info = ActionHandlerStorage.getL(sessionId).getInfo();
if (null != info) {
NimUserInfo user = NimUserInfoCache.getInstance().getUserInfo(info.toUid);
if (null != user && null != user.getAvatar() && headUrl.equals(user.getAvatar())) {
NimUserInfoCache.getInstance().getUserInfoFromRemote(info.toUid, null);
}
}
}
}
......@@ -347,14 +349,18 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
@Override
public void onClick(View v) {
LogHelper.Companion.getInstance().writeLogSync("聊天界面点击常见问题");
ActionHandlerStorage.getL(sessionId).startHelp(getActivity());
if (ActionHandlerStorage.getL(sessionId) != null) {
ActionHandlerStorage.getL(sessionId).startHelp(getActivity());
}
}
});
rootView.findViewById(R.id.action_feedback).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
LogHelper.Companion.getInstance().writeLogSync("聊天界面点击投诉与反馈");
ActionHandlerStorage.getL(sessionId).startFeedback(getActivity());
if (ActionHandlerStorage.getL(sessionId) != null) {
ActionHandlerStorage.getL(sessionId).startFeedback(getActivity());
}
}
});
;
......@@ -362,7 +368,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
@Override
public void onClick(View v) {
LogHelper.Companion.getInstance().writeLogSync("聊天界面点击免费热线");
ActionHandlerStorage.getL(sessionId).popCallDialog(getActivity());
if (ActionHandlerStorage.getL(sessionId) != null) {
ActionHandlerStorage.getL(sessionId).popCallDialog(getActivity());
}
}
});
}
......
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