Skip to content

Y
YDL-Component-Medical
Commit 31b740d3 by 徐健
Options

顶部布局与接口基本完成（剩余立即咨询按钮里面的两个接口）

parent 4f7e47e8
Showing with 643 additions and 124 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_AUTO_TEST;
// public static String appEnv = YDLConstants.ENV_TEST;
public static String appEnv = YDLConstants.ENV_PROD;
public static String appEnv = YDLConstants.ENV_TEST;
// public static String appEnv = YDLConstants.ENV_PROD;
@Override
public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {
......
m-im/src/main/java/com/yidianling/im/bridge/P2PCustomActionHandlerImpl.java
......@@ -131,13 +131,16 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
docInfo.doctorBriefInfoOrderNum = expert.doctorBriefInfo.orderNum;
docInfo.doctorBriefInfoSmallImage = expert.doctorBriefInfo.smallImage;
docInfo.isFollowed = expert.shareData.isFollowed;
docInfo.commentCounter = expert.commentCounter;
docInfo.commentCounterUrl = expert.commentCounterUrl;
if (docInfo.commentList == null) {
docInfo.commentList = new ArrayList();
}
docInfo.commentList.clear();
if (expert.commentList != null) {
docInfo.commentList.addAll(expert.commentList);
}
}
......
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
......@@ -4,6 +4,7 @@ import android.animation.Animator;
import android.animation.ValueAnimator;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.graphics.Color;
import android.media.AudioManager;
import android.os.Bundle;
import android.os.Handler;
......@@ -40,10 +41,12 @@ import com.ydl.webview.H5Params;
import com.ydl.webview.NewH5Activity;
import com.ydl.ydl_image.module.GlideApp;
import com.ydl.ydlcommon.modular.ModularServiceManager;
import com.ydl.ydlcommon.utils.LogUtil;
import com.ydl.ydlcommon.utils.SharedPreferencesEditor;
import com.ydl.ydlcommon.utils.YdlBuryPointUtil;
import com.ydl.ydlcommon.utils.log.LogHelper;
import com.ydl.ydlcommon.view.CircleImageView;
import com.yidianling.common.tools.RxImageTool;
import com.yidianling.common.tools.ToastUtil;
import com.yidianling.im.R;
import com.yidianling.im.router.ImIn;
......@@ -66,9 +69,11 @@ import com.yidianling.uikit.business.session.view.ChatPrivateTips;
import com.yidianling.uikit.business.session.view.CollectInfoPopupWindow;
import com.yidianling.uikit.business.session.view.CommonQuestionView;
import com.yidianling.uikit.business.session.view.ImCommentBannerView;
import com.yidianling.uikit.business.session.view.ImRedStarGradeView;
import com.yidianling.uikit.custom.bridge.ActionHandlerStorage;
import com.yidianling.uikit.custom.bridge.IP2PCustomActionHandler;
import com.yidianling.uikit.custom.http.ServiceImpl;
import com.yidianling.uikit.custom.http.request.FocusParams;
import com.yidianling.uikit.custom.http.response.CommonQuestionBean;
import com.yidianling.uikit.custom.http.response.SubmitUserInfoBean;
import com.yidianling.uikit.custom.http.response.UserQuestInfoBean;
......@@ -151,6 +156,10 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
private ImageView tv_all_comment_go;
private ImCommentBannerView comment_banner_view;
private ImRedStarGradeView good_num_icons;
private TextView im_focus_btn;
private LinearLayout top_view_container;
private LinearLayout constraint_ll;
......@@ -166,6 +175,10 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
private Boolean hasUpScroll = false;
private String help_num;// 帮助人数
private String server_num;// 服务时长
private String good_num;// 好评率
@SuppressLint("HandlerLeak")
private Handler mHandler = new Handler() {
@Override
......@@ -201,6 +214,8 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
messageListView = rootView.findViewById(R.id.messageListView); // 消息列表
top_view_container = rootView.findViewById(R.id.top_view_container); // 消息列表
constraint_ll = rootView.findViewById(R.id.constraint_ll);
im_focus_btn = rootView.findViewById(R.id.im_focus_btn);
good_num_icons = rootView.findViewById(R.id.good_num_icons);
//和助理私聊时的常用语逻辑
rl_common_question_enter = rootView.findViewById(R.id.rl_common_question);
......@@ -439,17 +454,23 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
GlideApp.with(getActivity()).load(headUrl).into(small_head_img);
}
// 帮助人数
String help_num = String.valueOf(ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoOrderNum);
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));
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 + "%");
good_num = String.format("%.1f", ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoFeedbackRate);
if (TextUtils.isEmpty(good_num)) good_num = "0.0";
good_num_tv.setText(good_num);
try {
good_num_icons.setGrade(Float.parseFloat(good_num));
}catch (Exception e) {
LogUtil.i(e.toString());
}
if (!TextUtils.isEmpty(headUrl)) {
IP2PCustomActionHandler.DocInfo info = ActionHandlerStorage.getL(sessionId).getInfo();
......@@ -462,10 +483,9 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
}
top_expert_info_cl.setOnClickListener(v -> {
//todo show dialog
if (null != getActivity()) {
if (expertInfoDialog == null) {
expertInfoDialog = new ExpertInfoDialog(getActivity());
expertInfoDialog = new ExpertInfoDialog(getActivity(), help_num, server_num, good_num);
}
expertInfoDialog.show();
}
......@@ -476,6 +496,11 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
* 初始化顶部专家信息栏下面的评论view
*/
private void initCommentBanner() {
if (ActionHandlerStorage.getL(sessionId).getInfo().commentList.size() == 0) {
comment_banner_view_ll.setVisibility(View.GONE);
return ;
}
int commentCounter = ActionHandlerStorage.getL(sessionId).getInfo().commentCounter;
tv_all_comment_desc.setText("评论(" + String.valueOf(commentCounter) + ")");
......@@ -486,6 +511,48 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
tv_all_comment_go.setOnClickListener(onClickListener);
comment_banner_view.initData(ActionHandlerStorage.getL(sessionId).getInfo().commentList);
if (ActionHandlerStorage.getL(sessionId).getInfo().isFollowed) {
im_focus_btn.setText("已关注");
im_focus_btn.setTextColor(Color.parseColor("#999999"));
im_focus_btn.setBackgroundResource(R.drawable.im_unfocus_btn_bg);
}else {
im_focus_btn.setText("关注");
im_focus_btn.setTextColor(Color.parseColor("#1DA1F2"));
im_focus_btn.setBackgroundResource(R.drawable.im_focus_btn_bg);
im_focus_btn.setOnClickListener(v -> {
focus();
});
}
}
//关注
@SuppressLint("CheckResult")
private void focus() {
if (ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getInfo() != null)
// 未关注才能进行关注
if (ActionHandlerStorage.getL(sessionId).getInfo().isFollowed == false) {
ActionHandlerStorage.getL(sessionId).getInfo().isFollowed = true;
ServiceImpl.Companion.getInstance().focus(new FocusParams(ActionHandlerStorage.getL(sessionId).getInfo().toUid, "1"))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(res -> {
if (res.code == 0) {
String status = String.valueOf(res.status);
if ("1".equals(status)) {
ToastUtil.toastShort("关注成功");
im_focus_btn.setText("已关注");
im_focus_btn.setTextColor(Color.parseColor("#999999"));
im_focus_btn.setBackgroundResource(R.drawable.im_unfocus_btn_bg);
if (ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getInfo() != null) {
ActionHandlerStorage.getL(sessionId).getInfo().isFollowed = true;
}
}
}
}, throwable -> {
ActionHandlerStorage.getL(sessionId).getInfo().isFollowed = false;
ToastUtil.toastShort(throwable.toString());});
}
}
private void showTips() {
......@@ -499,7 +566,7 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
rela_zixun.setOnClickListener(view -> {
if (ActionHandlerStorage.getL(sessionId) != null) {
if (expertConsultServiceListDialog == null) {
if (getActivity()!= null) {
if (getActivity() != null) {
expertConsultServiceListDialog = new ExpertConsultServiceListDialog(getActivity());
}
}
......
m-im/src/main/java/com/yidianling/uikit/business/session/view/ImCommentBannerView.kt
......@@ -121,8 +121,8 @@ class ImCommentBannerView : LinearLayout {
*/
fun initData(list: ArrayList<ImCommendDetailBean>?) {
mHandler.removeCallbacksAndMessages(null)
if (null == list || list.isEmpty()) {
visibility = View.GONE
if (null == list || list.isEmpty() || list.size == 0) {
visibility = View.INVISIBLE
return
}
visibility = View.VISIBLE
......
m-im/src/main/java/com/yidianling/uikit/business/session/view/ImRedStarGradeView.kt 0 → 100644
package com.yidianling.uikit.business.session.view
import android.content.Context
import android.util.AttributeSet
import android.view.Gravity
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.LinearLayout
import com.ydl.ydlcommon.utils.LogUtil
import com.yidianling.common.tools.RxImageTool
import com.yidianling.im.R
import kotlin.math.ceil
import kotlin.math.floor
class ImRedStarGradeView : LinearLayout {
constructor(context: Context) : super(context) {
mContext = context
initViews()
}
constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
mContext = context
initViews()
}
constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(
context,
attrs,
defStyle
) {
mContext = context
initViews()
}
private var mContext: Context? = null
private fun initViews() {
initView()
}
/**
* 界面初始化
*/
private fun initView() {
orientation = HORIZONTAL
var params = ViewGroup.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT,
RxImageTool.dp2px(11f)
)
layoutParams = params
}
/**
* 设置分数
*/
fun setGrade(grade: Float) {
try {
val generateGrade = floor(grade.toDouble())
val generateNumberInt = if (generateGrade.toInt() > 5) 5 else generateGrade.toInt()
val dp_11 = RxImageTool.dp2px(11f)
for (i in 0 until generateNumberInt) {
val itemView = View.inflate(mContext, R.layout.im_good_icon_layout, null)
val params = LayoutParams(
dp_11, dp_11
)
itemView.layoutParams = params
addView(itemView)
}
if (grade > generateGrade) {
val lastRate = grade - generateGrade
//外部布局
val itemView = View.inflate(mContext, R.layout.im_good_icon_layout, null)
val params = LayoutParams(dp_11, dp_11)
itemView.layoutParams = params
//左侧红色icon布局
val redStarIconView = itemView.findViewById<LinearLayout>(R.id.im_red_star)
val redStarParams =
LayoutParams(RxImageTool.dp2px((lastRate * 11f).toFloat()), dp_11)
redStarIconView.layoutParams = redStarParams
val redStarIconImg = itemView.findViewById<ImageView>(R.id.im_red_star_icon)
val redStarIconImgParams = LayoutParams(dp_11, dp_11)
redStarIconImg.layoutParams = redStarIconImgParams
// 右侧灰色icon布局
val greyStarIconView = itemView.findViewById<LinearLayout>(R.id.im_grey_star)
val greyStarParams = LayoutParams(
RxImageTool.dp2px(((1.0f - lastRate) * 11f).toFloat()), dp_11
)
greyStarIconView.layoutParams = greyStarParams
val greyStarIconImg = itemView.findViewById<ImageView>(R.id.im_grey_star_icon)
val greyStarIconImgParams = LayoutParams(dp_11, dp_11)
greyStarIconImgParams.gravity = Gravity.RIGHT
greyStarIconImg.layoutParams = greyStarIconImgParams
addView(itemView)
}
//补全剩余的灰色icon
val ceilGradeInt = (ceil(grade.toDouble())).toInt()
for (i in ceilGradeInt until 5) {
val itemView = View.inflate(mContext, R.layout.im_good_grey_icon_layout, null)
val params = LayoutParams(
dp_11, dp_11
)
itemView.layoutParams = params
addView(itemView)
}
} catch (e: Exception) {
LogUtil.i(e.toString())
}
}
}
\ No newline at end of file
m-im/src/main/java/com/yidianling/uikit/custom/bridge/IP2PCustomActionHandler.java
......@@ -145,11 +145,13 @@ public interface IP2PCustomActionHandler {
public int busyTotal = 0; //专家当前在与多少人聊天
public String tag1 = ""; //用与获取推荐专家列表接口的参数catName
public double doctorBriefInfoFeedbackRate = 0.000; //好评率 需要*100
public double doctorBriefInfoFeedbackRate = 0.000; //好评分
public int doctorBriefInfoOrderNum = 0; //帮助人数
public int doctorBriefInfoHelpLong = 0; //服务时长
public String doctorBriefInfoSmallImage = ""; //小头像
public Boolean isFollowed = false; // 是否关注
public int commentCounter = 0;
public String commentCounterUrl = "";
public ArrayList<ImCommendDetailBean> commentList;
......
m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceApi.kt
......@@ -3,10 +3,8 @@ package com.yidianling.uikit.custom.http
import com.ydl.ydlcommon.base.config.YDL_DOMAIN
import com.ydl.ydlcommon.base.config.YDL_DOMAIN_JAVA
import com.ydl.ydlcommon.data.http.BaseAPIResponse
import com.yidianling.uikit.custom.http.response.ChatStatusBean
import com.yidianling.uikit.custom.http.response.CommonQuestionBean
import com.yidianling.uikit.custom.http.response.RecommendExpertBean
import com.yidianling.uikit.custom.http.response.UserQuestInfoBean
import com.ydl.ydlcommon.data.http.BaseResponse
import com.yidianling.uikit.custom.http.response.*
import io.reactivex.Observable
import okhttp3.RequestBody
import retrofit2.http.*
......@@ -51,4 +49,9 @@ interface ServiceApi{
@POST("user/collect/submit")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun submitUserCollect(@Body body: RequestBody): Observable<BaseAPIResponse<Any>>
//关注
@FormUrlEncoded
@POST("sq-active/focus")
fun focus(@FieldMap params: Map<String, String>): Observable<BaseResponse<FocusBean>>
}
\ No newline at end of file
m-im/src/main/java/com/yidianling/uikit/custom/http/ServiceImpl.kt
package com.yidianling.uikit.custom.http
import com.ydl.ydlcommon.data.http.BaseAPIResponse
import com.ydl.ydlcommon.data.http.BaseResponse
import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlnet.YDLHttpUtils
import com.yidianling.uikit.custom.http.response.ChatStatusBean
import com.yidianling.uikit.custom.http.response.CommonQuestionBean
import com.yidianling.uikit.custom.http.response.RecommendExpertBean
import com.yidianling.uikit.custom.http.response.UserQuestInfoBean
import com.yidianling.uikit.custom.http.request.FocusParams
import com.yidianling.uikit.custom.http.response.*
import io.reactivex.Observable
import okhttp3.MediaType
import okhttp3.RequestBody
......@@ -68,4 +68,12 @@ class ServiceImpl private constructor(){
val body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), params) as RequestBody
return YDLHttpUtils.obtainApi(ServiceApi::class.java).submitUserCollect(body)
}
/**
* 关注用户
*/
fun focus(param: FocusParams): Observable<BaseResponse<FocusBean>> {
return RxUtils.mapObservable(param)
.flatMap { YDLHttpUtils.obtainApi(ServiceApi::class.java).focus(it) }
}
}
\ No newline at end of file
m-im/src/main/java/com/yidianling/uikit/custom/http/request/FocusParams.kt 0 → 100644
package com.yidianling.uikit.custom.http.request
class FocusParams(
val id: String, //话题id或用户uid
val type: String//业务类型：1关注用户，2关注话题
)
\ No newline at end of file
m-im/src/main/java/com/yidianling/uikit/custom/http/response/FocusBean.kt 0 → 100644
package com.yidianling.uikit.custom.http.response
class FocusBean (
val status: Int
)
\ No newline at end of file
m-im/src/main/java/com/yidianling/uikit/custom/widget/ConfideOrderInfoView.java
......@@ -56,6 +56,7 @@ public class ConfideOrderInfoView extends RelativeLayout {
LayoutParams params = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
params.leftMargin = RxImageTool.dp2px(8f);
params.rightMargin = RxImageTool.dp2px(8f);
params.topMargin = RxImageTool.dp2px(10f);
setLayoutParams(params);
View.inflate(mContext, R.layout.im_nim_chat_confide_order_info_view, this);
setBackground(getResources().getDrawable(R.drawable.im_bg_im_confide_action));
......
m-im/src/main/java/com/yidianling/uikit/custom/widget/ExpertInfoDialog.kt
......@@ -13,7 +13,7 @@ import kotlinx.android.synthetic.main.im_safe_help_remind_dialog_layout.*
* 专家信息弹窗
* Created by xj on 2019/8/7.
*/
class ExpertInfoDialog(val mContext: Context): Dialog(mContext, R.style.dialog_default_style) {
class ExpertInfoDialog(val mContext: Context, val help_num: String, val server_num: String, val good_num: String): Dialog(mContext, R.style.dialog_default_style) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
......@@ -26,6 +26,10 @@ class ExpertInfoDialog(val mContext: Context): Dialog(mContext, R.style.dialog_d
window.setGravity(Gravity.CENTER)
window.attributes = params
im_expert_detail_help_num.text = help_num
im_expert_detail_server_num.text = server_num
im_expert_detail_good_num.text = good_num
expert_info_close.setOnClickListener {
if (null != mContext) {
dismiss()
......
m-im/src/main/modular_api/com/yidianling/im/api/bean/IMShareDataBuild.java
......@@ -41,6 +41,7 @@ public class IMShareDataBuild {
public String order_url;
@SerializedName(value = "name", alternate = "doctorName")
public String doctorName;
public Boolean isFollowed = false; // 是否关注
/**
* 是否开启电话倾诉
* 1.开启 2.关闭
......
m-im/src/main/res_uikit/drawable/im_bg_im_confide_action.xml
......@@ -2,11 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:topLeftRadius="18dp"
android:bottomLeftRadius="18dp"/>
<corners android:radius="6dp" />
<gradient
android:angle="180"
android:startColor="#FF406C"
android:endColor="#FF7A5C"/>
<solid android:color="@color/white" />
</shape>
\ No newline at end of file
m-im/src/main/res_uikit/drawable/im_bg_im_consult_action.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:topLeftRadius="18dp"
android:bottomLeftRadius="18dp"/>
<gradient
android:angle="180"
android:startColor="#FF406C"
android:endColor="#FF7A5C"/>
</shape>
\ No newline at end of file
m-im/src/main/res_uikit/drawable/im_expert_detail_bottom_bg.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#F7F7F7"/>
<corners android:radius="4dp"/>
</shape>
\ No newline at end of file
m-im/src/main/res_uikit/drawable/im_expert_detail_dialog_top_bg.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:topLeftRadius="6dp"
android:topRightRadius="6dp" />
<gradient
android:angle="270"
android:startColor="#2E27A5F2"
android:endColor="#001DA1F2"/>
</shape>
\ No newline at end of file
m-im/src/main/res_uikit/drawable/im_unfocus_btn_bg.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFFFFF"/>
<corners android:radius="10dp"/>
<stroke android:width="1dp"
android:color="#CCCCCC"/>
</shape>
\ No newline at end of file
m-im/src/main/res_uikit/layout/im_expert_info_dialog_layout.xml
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:gravity="center_horizontal"
android:orientation="vertical">
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp">
<RelativeLayout
android:id="@+id/dialog_expert_detail_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/im_expert_info_dialog_bg"
android:paddingBottom="30dp">
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
android:layout_width="match_parent"
android:layout_height="174dp"
android:background="@drawable/im_expert_detail_dialog_top_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:background="@drawable/im_expert_info_dialog_bg"
android:layout_height="135dp"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="76dp"
android:layout_height="95dp"
android:layout_centerHorizontal="true"
android:scaleType="fitXY"
android:layout_marginTop="25dp"
android:src="@drawable/im_expert_info_dialog_top_bg" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/im_expert_info_dialog_top_bg"
android:scaleType="centerCrop"/>
android:layout_marginTop="135dp"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="雷水寿咨询师在壹点灵平台已服务2648人，累计1634小时的心理服务经验，99.9%的用户给予满意好评，具体包含："
android:textSize="@dimen/im_text_size_16"
android:textColor="@color/im_color_242424"
android:textStyle="bold"
android:layout_marginLeft="@dimen/platform_dp_20"
android:layout_marginRight="@dimen/platform_dp_20"
android:layout_marginTop="16dp"
android:layout_marginBottom="11dp"/>
android:text="数据更新于昨日24点，壹点灵通过严谨数据统计机制，对咨询师的数据进行持续的监督管理，确保提供真实有效的数据参考。"
android:textColor="@color/im_color_242424"
android:textSize="@dimen/im_text_size_16"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="15dp"
android:layout_marginRight="20dp"
android:background="@drawable/im_expert_detail_bottom_bg"
android:gravity="center_vertical"
android:orientation="horizontal"
android:gravity="center_vertical">
<View
android:layout_width="6dp"
android:layout_height="6dp"
android:background="@drawable/im_more_info_red_point"/>
android:paddingLeft="13dp"
android:paddingTop="8dp"
android:paddingRight="10dp"
android:paddingBottom="11dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:gravity="bottom"
android:orientation="horizontal">
<TextView
android:id="@+id/im_expert_detail_help_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2648"
android:textColor="#242424"
android:textSize="22dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="1dp"
android:text="人"
android:textColor="#242424"
android:textSize="10dp" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:text="心理咨询1214小时"
android:layout_marginLeft="6dp"
android:textSize="14dp"
android:textColor="#242424"/>
android:layout_marginBottom="1dp"
android:text="帮助人数"
android:textColor="#1DA1F2"
android:textSize="10dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="平台内服务过的用户总数"
android:textColor="#99242424"
android:textSize="13dp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="15dp"
android:layout_marginRight="20dp"
android:background="@drawable/im_expert_detail_bottom_bg"
android:gravity="center_vertical"
android:orientation="horizontal"
android:gravity="center_vertical">
<View
android:layout_width="6dp"
android:layout_height="6dp"
android:background="@drawable/im_more_info_red_point"/>
android:paddingLeft="13dp"
android:paddingTop="8dp"
android:paddingRight="10dp"
android:paddingBottom="11dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:gravity="bottom"
android:orientation="horizontal">
<TextView
android:id="@+id/im_expert_detail_server_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1634"
android:textColor="#242424"
android:textSize="22dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:text="即时倾诉420小时"
android:layout_marginLeft="6dp"
android:textSize="14dp"
android:textColor="#242424"/>
android:layout_marginBottom="1dp"
android:text="小时"
android:textColor="#242424"
android:textSize="10dp" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="1dp"
android:text="服务时长"
android:textColor="#1DA1F2"
android:textSize="10dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="平台内心理服务总时长"
android:textColor="#99242424"
android:textSize="13dp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="15dp"
android:layout_marginRight="20dp"
android:background="@drawable/im_expert_detail_bottom_bg"
android:gravity="center_vertical"
android:orientation="horizontal"
android:gravity="center_vertical">
<View
android:layout_width="6dp"
android:layout_height="6dp"
android:background="@drawable/im_more_info_red_point"/>
android:paddingLeft="13dp"
android:paddingTop="8dp"
android:paddingRight="10dp"
android:paddingBottom="11dp">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:gravity="bottom"
android:orientation="horizontal">
<TextView
android:id="@+id/im_expert_detail_good_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:text="用户好评共1258条，占比99.9%"
android:layout_marginLeft="6dp"
android:textSize="14dp"
android:textColor="#242424"/>
android:text="4.9"
android:textColor="#242424"
android:textSize="22dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="1dp"
android:text="分"
android:textColor="#242424"
android:textSize="10dp" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:text="* 数据统计至2019年12月24日"
android:layout_marginLeft="20dp"
android:layout_marginTop="26dp"
android:textSize="14dp"
android:textColor="#999999"/>
android:layout_marginBottom="1dp"
android:text="综合评分"
android:textColor="#1DA1F2"
android:textSize="10dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="壹点灵通过严谨数据统计机制，对咨询师的数据进行持续的监督管理，确保提供真实有效的数据参考。"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="20dp"
android:layout_marginTop="8dp"
android:textSize="14dp"
android:textColor="#999999"/>
android:text="全部用户评分的平均值"
android:textColor="#99242424"
android:textSize="13dp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<ImageView
android:id="@+id/expert_info_close"
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_below="@+id/dialog_expert_detail_bg"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@drawable/im_expert_info_dialog_close_icon"/>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
android:src="@drawable/im_expert_info_dialog_close_icon" />
</LinearLayout>
</RelativeLayout>
m-im/src/main/res_uikit/layout/im_good_grey_icon_layout.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/im_grey_star"
android:layout_width="11dp"
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:id="@+id/im_grey_star_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="right"
android:src="@drawable/im_star_grey" />
</LinearLayout>
</LinearLayout>
m-im/src/main/res_uikit/layout/im_good_icon_layout.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/im_red_star"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:id="@+id/im_red_star_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/im_star_red" />
</LinearLayout>
<LinearLayout
android:id="@+id/im_grey_star"
android:layout_width="0dp"
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:id="@+id/im_grey_star_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="right"
android:src="@drawable/im_star_grey" />
</LinearLayout>
</LinearLayout>
m-im/src/main/res_uikit/layout/im_ydl_nim_message_fragment.xml
......@@ -43,8 +43,6 @@
android:layout_height="56dp"
android:background="@color/im_white"
android:paddingLeft="@dimen/platform_dp_10"
android:paddingTop="@dimen/platform_dp_8"
android:paddingBottom="@dimen/platform_dp_10"
android:visibility="gone">
<com.ydl.ydlcommon.view.CircleImageView
......@@ -53,14 +51,36 @@
android:layout_height="@dimen/platform_dp_36"
android:background="@drawable/platform_head_place_hold_pic"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"></com.ydl.ydlcommon.view.CircleImageView>
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="8dp"
android:layout_marginBottom="10dp"></com.ydl.ydlcommon.view.CircleImageView>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="46dp"
android:layout_marginRight="10dp"
android:background="#F0F0F0"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
<View
android:layout_width="0.5dp"
android:layout_height="match_parent"
android:layout_marginLeft="46dp"
android:background="#F0F0F0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<RelativeLayout
android:id="@+id/rl_help"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="30dp"
app:layout_constraintLeft_toRightOf="@+id/small_head_img">
android:layout_marginLeft="37dp"
app:layout_constraintLeft_toRightOf="@+id/small_head_img"
android:paddingTop="8dp"
android:paddingBottom="10dp">
<TextView
android:id="@+id/help_num_tv"
......@@ -69,9 +89,16 @@
android:layout_centerHorizontal="true"
android:fontFamily="@font/platform_dincond_bold"
android:textColor="@color/im_color_242424"
android:textSize="@dimen/platform_dp_20"
android:textSize="@dimen/platform_dp_15"
tools:text="2648" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:layout_alignParentBottom="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -80,6 +107,17 @@
android:text="帮助人数"
android:textColor="@color/platform_color_999999"
android:textSize="@dimen/platform_dp_10" />
<ImageView
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_centerHorizontal="true"
android:src="@drawable/im_more_info_icon"
android:scaleType="fitXY"
android:layout_marginLeft="2dp"/>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
......@@ -87,8 +125,15 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginRight="30dp"
app:layout_constraintRight_toRightOf="parent">
app:layout_constraintRight_toRightOf="parent"
android:paddingTop="8dp"
android:paddingBottom="10dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:orientation="horizontal">
<TextView
android:id="@+id/good_num_tv"
android:layout_width="wrap_content"
......@@ -96,17 +141,41 @@
android:layout_centerHorizontal="true"
android:fontFamily="@font/platform_dincond_bold"
android:textColor="@color/im_color_242424"
android:textSize="@dimen/platform_dp_20"
tools:text="99.9%" />
android:textSize="@dimen/platform_dp_15"
tools:text="4.7" />
<TextView
android:id="@+id/good_num_tv_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="好评率"
android:textColor="@color/platform_color_999999"
android:textSize="@dimen/platform_dp_10" />
android:fontFamily="@font/platform_dincond_bold"
android:textColor="@color/im_color_242424"
android:textSize="@dimen/platform_dp_10"
android:text="分"
android:layout_gravity="bottom"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:layout_alignParentBottom="true">
<com.yidianling.uikit.business.session.view.ImRedStarGradeView
android:id="@+id/good_num_icons"
android:layout_width="wrap_content"
android:layout_height="11dp" />
<ImageView
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_centerHorizontal="true"
android:src="@drawable/im_more_info_icon"
android:scaleType="fitXY"
android:layout_marginLeft="2dp"/>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
......@@ -114,7 +183,9 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
app:layout_constraintLeft_toRightOf="@+id/rl_help"
app:layout_constraintRight_toLeftOf="@+id/rl_good">
app:layout_constraintRight_toLeftOf="@+id/rl_good"
android:paddingTop="8dp"
android:paddingBottom="10dp">
<TextView
android:id="@+id/server_num_tv"
......@@ -123,7 +194,7 @@
android:layout_centerHorizontal="true"
android:fontFamily="@font/platform_dincond_bold"
android:textColor="@color/im_color_242424"
android:textSize="@dimen/platform_dp_20"
android:textSize="@dimen/platform_dp_15"
tools:text="1634" />
<LinearLayout
......@@ -144,6 +215,7 @@
<ImageView
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_centerHorizontal="true"
android:src="@drawable/im_more_info_icon"
android:scaleType="fitXY"
android:layout_marginLeft="2dp"/>
......@@ -165,13 +237,19 @@
android:visibility="gone">
<TextView
android:id="@+id/im_focus_btn"
android:layout_width="46dp"
android:layout_height="20dp"
android:gravity="center"
android:textColor="#1DA1F2"
android:textSize="12dp"
tools:background="@drawable/im_focus_btn_bg"
android:background="@drawable/im_focus_btn_bg"
tools:text="关注" />
<View
android:layout_width="0.5dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:background="#F0F0F0"/>
<com.yidianling.uikit.business.session.view.ImCommentBannerView
android:id="@+id/comment_banner_view"
......@@ -185,6 +263,7 @@
android:layout_height="wrap_content"
android:lines="1"
android:textColor="#1DA1F2"
android:layout_gravity="center"
android:textSize="12dp"
tools:text="评价(18714)" />
......@@ -193,6 +272,7 @@
android:layout_width="4dp"
android:layout_height="37dp"
android:layout_marginLeft="8dp"
android:layout_gravity="center"
android:paddingTop="14.5dp"
android:paddingBottom="14.5dp"
android:scaleType="fitXY"
......@@ -207,7 +287,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:paddingTop="10dp"
android:paddingRight="10dp">
<LinearLayout
......@@ -215,6 +294,7 @@
android:layout_width="match_parent"
android:layout_height="53dp"
android:orientation="horizontal"
android:layout_marginTop="10dp"
android:visibility="gone">
<LinearLayout
......@@ -373,7 +453,7 @@
android:id="@+id/rela_zixun"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:background="@drawable/im_bg_im_confide_action"
android:background="@drawable/im_bg_im_consult_action"
android:gravity="center"
android:paddingLeft="17dp"
android:paddingRight="11dp">
......
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