Skip to content

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

Merge remote-tracking branch 'origin/4.2.40(复联迁移)' into 4.2.40(复联迁移)

parents 7b03f3b9 a8fcd685
Showing with 298 additions and 278 deletions
app/build.gradle
...@@ -211,6 +211,7 @@ dependencies { ...@@ -211,6 +211,7 @@ dependencies {
implementation project(':m-muse') implementation project(':m-muse')
implementation project(':m-im') implementation project(':m-im')
implementation modularPublication('com.ydl:m-im-api')
implementation project(':m-dynamic') implementation project(':m-dynamic')
implementation project(':m-course') implementation project(':m-course')
//文章模块 //文章模块
......
app/src/main/java/com/ydl/component/service/web/WVClickAbstractListener.java
...@@ -8,7 +8,9 @@ import com.ydl.confide.api.IConfideService; ...@@ -8,7 +8,9 @@ import com.ydl.confide.api.IConfideService;
import com.ydl.webview.H5JsBean; import com.ydl.webview.H5JsBean;
import com.ydl.webview.H5Params; import com.ydl.webview.H5Params;
import com.ydl.webview.NewH5Activity; import com.ydl.webview.NewH5Activity;
import com.ydl.ydlcommon.modular.ModularServiceManager;
import com.yidianling.common.tools.LogUtil; import com.yidianling.common.tools.LogUtil;
import com.yidianling.im.api.service.IImService;
/** /**
* webview 点击事件监听 抽象类 * webview 点击事件监听 抽象类
...@@ -303,7 +305,8 @@ public class WVClickAbstractListener implements WebViewClientClickListener { ...@@ -303,7 +305,8 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
@Override @Override
public void chatSchedule(H5JsBean.H5JsCmd.Params params) { public void chatSchedule(H5JsBean.H5JsCmd.Params params) {
ModularServiceManager.INSTANCE.provide(IImService.class)
.chatScheule(mContext, params.getUser_url(), params.getDoc_url(), params.getDsmId(), params.getTitle(), params.getToUid());
} }
@Override @Override
......
config.gradle
...@@ -6,11 +6,11 @@ ext { ...@@ -6,11 +6,11 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.09", "m-confide" : "0.0.49.09",
"m-consultant" : "0.0.59.78", "m-consultant" : "0.0.59.79",
"m-fm" : "0.0.30.03", "m-fm" : "0.0.30.03",
"m-user" : "0.0.61.34", "m-user" : "0.0.61.34",
"m-home" : "0.0.22.62", "m-home" : "0.0.22.62",
"m-im" : "0.0.19.14", "m-im" : "0.0.19.20",
"m-dynamic" : "0.0.7.22", "m-dynamic" : "0.0.7.22",
"m-article" : "0.0.0.8", "m-article" : "0.0.0.8",
...@@ -89,11 +89,11 @@ ext { ...@@ -89,11 +89,11 @@ ext {
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.09", "m-confide" : "0.0.49.09",
"m-consultant" : "0.0.59.78", "m-consultant" : "0.0.59.79",
"m-fm" : "0.0.30.01", "m-fm" : "0.0.30.01",
"m-user" : "0.0.61.34", "m-user" : "0.0.61.34",
"m-home" : "0.0.22.62", "m-home" : "0.0.22.62",
"m-im" : "0.0.19.14", "m-im" : "0.0.19.20",
"m-dynamic" : "0.0.7.22", "m-dynamic" : "0.0.7.22",
"m-article" : "0.0.0.6", "m-article" : "0.0.0.6",
......
m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
...@@ -36,6 +36,7 @@ import kotlinx.android.synthetic.main.consultant_expert_search_products_item.vie ...@@ -36,6 +36,7 @@ import kotlinx.android.synthetic.main.consultant_expert_search_products_item.vie
import kotlinx.android.synthetic.main.consultant_item_empty.view.* import kotlinx.android.synthetic.main.consultant_item_empty.view.*
import kotlinx.android.synthetic.main.consultant_item_footer.view.* import kotlinx.android.synthetic.main.consultant_item_footer.view.*
import kotlinx.android.synthetic.main.consultant_item_tag.view.* import kotlinx.android.synthetic.main.consultant_item_tag.view.*
import java.math.BigDecimal
/** /**
* 专家服务列表适配器 * 专家服务列表适配器
...@@ -266,8 +267,9 @@ class ExpertSearchAdapter( ...@@ -266,8 +267,9 @@ class ExpertSearchAdapter(
holder.tvSaleDurationForMonth.text = holder.tvSaleDurationForMonth.text =
durationStringBuffer.append(itemBean.allSaleDuration.toInt()).append("").toString() durationStringBuffer.append(itemBean.allSaleDuration.toInt()).append("").toString()
//价格 //价格
val sb = StringBuffer() val price = BigDecimal(itemBean.minBookingPrice)
holder.tvPrice.text = sb.append("").append(itemBean.minBookingPrice).toString() // 去掉末尾无用的.00
holder.tvPrice.text = price.stripTrailingZeros().toPlainString()
//套餐 //套餐
holder.ll_products.removeAllViews() holder.ll_products.removeAllViews()
if (null != itemBean.products && !itemBean.products.isEmpty()) { if (null != itemBean.products && !itemBean.products.isEmpty()) {
......
m-im/src/main/java/com/yidianling/im/modular/service/IMServiceImpl.kt
...@@ -4,8 +4,8 @@ import android.annotation.SuppressLint ...@@ -4,8 +4,8 @@ import android.annotation.SuppressLint
import android.app.Activity import android.app.Activity
import android.app.Application import android.app.Application
import android.content.Context import android.content.Context
import androidx.fragment.app.Fragment
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import com.alibaba.android.arouter.facade.annotation.Route import com.alibaba.android.arouter.facade.annotation.Route
import com.netease.nimlib.sdk.NIMClient import com.netease.nimlib.sdk.NIMClient
import com.netease.nimlib.sdk.RequestCallback import com.netease.nimlib.sdk.RequestCallback
...@@ -22,19 +22,15 @@ import com.ydl.ydlcommon.utils.remind.HttpErrorUtils ...@@ -22,19 +22,15 @@ import com.ydl.ydlcommon.utils.remind.HttpErrorUtils
import com.yidianling.avchatkit.common.util.NetworkUtil import com.yidianling.avchatkit.common.util.NetworkUtil
import com.yidianling.common.tools.ToastUtil import com.yidianling.common.tools.ToastUtil
import com.yidianling.im.R import com.yidianling.im.R
import com.yidianling.im.api.bean.IMInitConfigBean import com.yidianling.im.api.bean.*
import com.yidianling.im.api.bean.IMLoginInfo
import com.yidianling.im.api.bean.IMRegisterObserverCustomNotificationCallBack
import com.yidianling.im.api.bean.IMRequestCallback
import com.yidianling.im.api.listener.ApiStringResponseCallback import com.yidianling.im.api.listener.ApiStringResponseCallback
import com.yidianling.im.api.bean.IMSendCustomNotificationResultCallBack
import com.yidianling.im.api.service.IImService import com.yidianling.im.api.service.IImService
import com.yidianling.im.bridge.P2PCustomActionHandlerImpl import com.yidianling.im.bridge.P2PCustomActionHandlerImpl
import com.yidianling.im.config.NimApplication import com.yidianling.im.config.NimApplication
import com.yidianling.im.config.constants.ImConstants import com.yidianling.im.config.constants.ImConstants
import com.yidianling.im.helper.IMChatUtil import com.yidianling.im.helper.IMChatUtil
import com.yidianling.im.helper.LogoutHelper
import com.yidianling.im.helper.ImObserversHelper import com.yidianling.im.helper.ImObserversHelper
import com.yidianling.im.helper.LogoutHelper
import com.yidianling.im.helper.MsgReceiveHelper import com.yidianling.im.helper.MsgReceiveHelper
import com.yidianling.im.http.ImRetrofitApi import com.yidianling.im.http.ImRetrofitApi
import com.yidianling.im.preference.IMCache import com.yidianling.im.preference.IMCache
...@@ -375,8 +371,9 @@ class IMServiceImpl : IImService { ...@@ -375,8 +371,9 @@ class IMServiceImpl : IImService {
) )
NIMClient.getService(MsgService::class.java).sendMessage(message, false) NIMClient.getService(MsgService::class.java).sendMessage(message, false)
.setCallback(object : RequestCallback<Void> { .setCallback(object : RequestCallback<Void?> {
override fun onSuccess(param: Void) { override fun onSuccess(param: Void?) {
MessageListPanelHelper.getInstance().notifyAddMessage(message)
startChat(context, toUid.toString(), 0x001, 0) startChat(context, toUid.toString(), 0x001, 0)
} }
...@@ -388,6 +385,7 @@ class IMServiceImpl : IImService { ...@@ -388,6 +385,7 @@ class IMServiceImpl : IImService {
ToastUtil.toastShort("加载失败") ToastUtil.toastShort("加载失败")
} }
}) })
} }
override fun initIm(app: Application, activity: Class<out Activity>) { override fun initIm(app: Application, activity: Class<out Activity>) {
......
m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderConfirmOrder.java
package com.yidianling.im.session.viewholder; package com.yidianling.im.session.viewholder;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.os.Handler;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
...@@ -136,9 +137,10 @@ public class MsgViewHolderConfirmOrder extends MsgViewHolderBase { ...@@ -136,9 +137,10 @@ public class MsgViewHolderConfirmOrder extends MsgViewHolderBase {
//确认完成，按钮置灰，更新本地消息 //确认完成，按钮置灰，更新本地消息
updateLocalMsg(); updateLocalMsg();
// 跳转服务单评价页 // 跳转服务单评价页
H5Params orderParams = new H5Params(ImConstants.Companion.getPLAY_SCORE_URL() + IMChatUtil.doctorId + "/" + serviceId, null); new Handler().postDelayed(() -> {
NewH5Activity.start(context, orderParams); H5Params orderParams = new H5Params(ImConstants.Companion.getPLAY_SCORE_URL() + IMChatUtil.doctorId + "/" + serviceId, null);
NewH5Activity.start(context, orderParams);
}, 1000);
}, throwable -> }, throwable ->
ToastUtil.toastShort(throwable.getMessage()) ToastUtil.toastShort(throwable.getMessage())
); );
......
m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderOrderAlreadyDone.java
...@@ -129,9 +129,6 @@ public class MsgViewHolderOrderAlreadyDone extends MsgViewHolderBase { ...@@ -129,9 +129,6 @@ public class MsgViewHolderOrderAlreadyDone extends MsgViewHolderBase {
.subscribe(it -> { .subscribe(it -> {
//确认完成，按钮置灰，更新本地消息 //确认完成，按钮置灰，更新本地消息
updateLocalMsg(); updateLocalMsg();
// 跳转订单评价页
H5Params orderParams = new H5Params(ImConstants.Companion.getPLAY_SCORE_URL() + IMChatUtil.doctorId + "/" + orderId, null);
NewH5Activity.start(context, orderParams);
}, throwable -> }, throwable ->
ToastUtil.toastShort(throwable.getMessage()) ToastUtil.toastShort(throwable.getMessage())
); );
......
m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceItemView.kt
...@@ -83,17 +83,26 @@ class ExpertConsultServiceItemView : LinearLayout { ...@@ -83,17 +83,26 @@ class ExpertConsultServiceItemView : LinearLayout {
) )
//时间，取productSpecDtos数组最后一个的时间 //时间，取productSpecDtos数组最后一个的时间
service_item_time.text = "/${bean.productDto.minOrderTime}分钟" // service_item_time.text = "/${bean.productDto.minOrderTime}分钟"
} }
//好评率，*20后 保留1位小数 //好评率，*20后 保留1位小数
service_item_feddbackrate.visibility = VISIBLE service_item_feddbackrate.visibility = VISIBLE
tv_feedbackRate.visibility = VISIBLE tv_feedbackRate.visibility = VISIBLE
service_item_feddbackrate.text = String.format( if (bean.productDto.feedbackRate > 0) { // 好评率大于0才展示出来，否则隐藏
"%.1f", //好评率，*20后 保留1位小数
(bean.productDto.feedbackRate) * 100f service_item_feddbackrate.visibility = VISIBLE
) + "%" tv_feedbackRate.visibility = VISIBLE
service_item_feddbackrate.text = String.format(
"%.1f",
(bean.productDto.feedbackRate) * 100f
) + "%"
} else {
service_item_feddbackrate.visibility = GONE
tv_feedbackRate.visibility = GONE
}
//销量 //销量
......
m-im/src/main/res/layout/im_expert_consult_service_item_view.xml
...@@ -58,9 +58,11 @@ ...@@ -58,9 +58,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="￥" android:text="￥"
android:textColor="#FF5040" android:textColor="#FF5040"
android:textSize="9dp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold"
android:layout_marginTop="4dp"/> android:gravity="bottom"
android:paddingBottom="4dp"
/>
<TextView <TextView
android:id="@+id/service_item_price" android:id="@+id/service_item_price"
...@@ -68,9 +70,17 @@ ...@@ -68,9 +70,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="0" android:text="0"
android:textColor="#FF5040" android:textColor="#FF5040"
android:textSize="16dp" android:textSize="18sp"
android:textStyle="bold" android:textStyle="bold"
android:layout_marginBottom="1dp"/> android:layout_marginBottom="1dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="bottom"
android:textColor="#999999"
android:textSize="12sp"
android:paddingBottom="4dp"
android:text="起"/>
</LinearLayout> </LinearLayout>
<TextView <TextView
...@@ -79,6 +89,7 @@ ...@@ -79,6 +89,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="/0分钟" android:text="/0分钟"
android:textColor="#999999" android:textColor="#999999"
android:visibility="gone"
android:textSize="12dp" /> android:textSize="12dp" />
<TextView <TextView
android:id="@+id/service_item_low_buy_time" android:id="@+id/service_item_low_buy_time"
......
m-im/src/main/res/layout/im_ui_message_modify_time.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right"> android:gravity="right">
<LinearLayout <LinearLayout
android:id="@+id/modify_time_main" android:id="@+id/modify_time_main"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:background="@drawable/im_bg_raduis_up_green"> android:background="@drawable/im_bg_raduis_up_green">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp" android:padding="10dp"
android:src="@drawable/im_ico_chat_time" /> android:src="@drawable/im_ico_chat_time" />
<TextView <TextView
android:id="@+id/tv_title" android:id="@+id/tv_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="修改预约时间" android:text="修改预约时间"
android:textColor="#ffffff" android:textColor="#ffffff"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="11sp" android:textSize="11sp"
android:layout_alignLeft="@id/modify_time_main" android:layout_alignLeft="@id/modify_time_main"
android:layout_alignRight="@id/modify_time_main" android:layout_alignRight="@id/modify_time_main"
android:textColor="#999999" android:textColor="#999999"
android:layout_below="@id/modify_time_main" android:layout_below="@id/modify_time_main"
android:background="@drawable/im_bg_raduis_down_white" android:background="@drawable/im_bg_raduis_down_white"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:text="修改预约时间" /> android:text="修改预约时间" />
<ImageView <!-- <ImageView-->
android:id="@+id/trangle_orange" <!-- android:id="@+id/trangle_orange"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:layout_marginTop="15dp" <!-- android:layout_marginTop="15dp"-->
android:layout_toRightOf="@id/modify_time_main" <!-- android:layout_toRightOf="@id/modify_time_main"-->
android:src="@mipmap/im_right_22"/> <!-- android:src="@mipmap/im_right_22"/>-->
</RelativeLayout> </RelativeLayout>
m-im/src/main/res/layout/im_ui_message_modify_time_rec.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:id="@+id/modify_time_main" android:id="@+id/modify_time_main"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_toRightOf="@id/trangle_orange" android:background="@drawable/im_bg_raduis_up_green">
android:background="@drawable/im_bg_raduis_up_green">
<ImageView
<ImageView android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:padding="10dp"
android:padding="10dp" android:src="@drawable/im_ico_chat_time" />
android:src="@drawable/im_ico_chat_time" />
<TextView
<TextView android:id="@+id/tv_title"
android:id="@+id/tv_title" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_gravity="center_vertical"
android:layout_gravity="center_vertical" android:paddingRight="10dp"
android:paddingRight="10dp" android:text="修改预约时间"
android:text="修改预约时间" android:textColor="#ffffff"
android:textColor="#ffffff" android:textSize="14sp" />
android:textSize="14sp" /> </LinearLayout>
</LinearLayout>
<TextView
<TextView android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:textSize="11sp"
android:textSize="11sp" android:layout_alignLeft="@id/modify_time_main"
android:layout_alignLeft="@id/modify_time_main" android:layout_alignRight="@id/modify_time_main"
android:layout_alignRight="@id/modify_time_main" android:textColor="#999999"
android:textColor="#999999" android:layout_below="@id/modify_time_main"
android:layout_below="@id/modify_time_main" android:background="@drawable/im_bg_raduis_down_white"
android:background="@drawable/im_bg_raduis_down_white" android:paddingLeft="10dp"
android:paddingLeft="10dp" android:paddingTop="2dp"
android:paddingTop="2dp" android:paddingBottom="2dp"
android:paddingBottom="2dp" android:text="修改预约时间" />
android:text="修改预约时间" />
<!-- <ImageView-->
<ImageView <!-- android:id="@+id/trangle_orange"-->
android:id="@+id/trangle_orange" <!-- android:layout_width="wrap_content"-->
android:layout_width="wrap_content" <!-- android:layout_height="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_marginTop="15dp"-->
android:layout_marginTop="15dp" <!-- android:src="@mipmap/im_left_2"/>-->
android:src="@mipmap/im_left_2"/>
</RelativeLayout>
</RelativeLayout>
m-im/src/main/res/layout/im_ui_message_received_money.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout android:id="@+id/message_received" <RelativeLayout android:id="@+id/message_received"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<RelativeLayout <RelativeLayout
android:id="@+id/red_packet_main" android:id="@+id/red_packet_main"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@id/trangle_orange" android:background="@drawable/im_bg_raduis_up_green">
android:background="@drawable/im_bg_raduis_up_green">
<TextView
<TextView android:id="@+id/packet_title"
android:id="@+id/packet_title" android:layout_width="160dp"
android:layout_width="160dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginTop="10dp"
android:layout_marginTop="10dp" android:layout_toRightOf="@+id/packte_im"
android:layout_toRightOf="@+id/packte_im" android:paddingRight="10dp"
android:paddingRight="10dp" android:text="1对1专业咨询"
android:text="1对1专业咨询" android:textColor="#ffffff"
android:textColor="#ffffff" android:textSize="14sp" />
android:textSize="14sp" />
<TextView
<TextView android:id="@+id/text_content"
android:id="@+id/text_content" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_below="@+id/packet_title"
android:layout_below="@+id/packet_title" android:layout_marginTop="5dp"
android:layout_marginTop="5dp" android:layout_marginBottom="5dp"
android:layout_marginBottom="5dp" android:layout_toRightOf="@+id/packte_im"
android:layout_toRightOf="@+id/packte_im" tools:text="您需要支付300元"
tools:text="您需要支付300元" android:textColor="#ffffff"
android:textColor="#ffffff" android:textSize="12sp" />
android:textSize="12sp" />
<ImageView
<ImageView android:id="@+id/packte_im"
android:id="@+id/packte_im" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:padding="10dp"
android:padding="10dp" android:src="@mipmap/im_weifu"
android:src="@mipmap/im_weifu" android:layout_alignParentTop="true"
android:layout_alignParentTop="true" android:layout_alignParentLeft="true"
android:layout_alignParentLeft="true" android:layout_alignParentStart="true" />
android:layout_alignParentStart="true" />
</RelativeLayout>
</RelativeLayout>
<TextView
<TextView android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:textSize="11sp"
android:textSize="11sp" android:layout_alignLeft="@id/red_packet_main"
android:layout_alignLeft="@id/red_packet_main" android:layout_alignRight="@id/red_packet_main"
android:layout_alignRight="@id/red_packet_main" android:textColor="#999999"
android:textColor="#999999" android:layout_below="@id/red_packet_main"
android:layout_below="@id/red_packet_main" android:background="@drawable/im_bg_raduis_down_white"
android:background="@drawable/im_bg_raduis_down_white" android:paddingLeft="10dp"
android:paddingLeft="10dp" android:paddingTop="2dp"
android:paddingTop="2dp" android:paddingBottom="2dp"
android:paddingBottom="2dp" android:text="收款" />
android:text="收款" />
</RelativeLayout>
</RelativeLayout>
m-im/src/main/res/layout/im_ui_message_subscript_time.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout
android:id="@+id/message_received" android:id="@+id/message_received"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:id="@+id/red_packet_main" android:id="@+id/red_packet_main"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/trangle_orange" android:background="@drawable/im_bg_raduis_up_green">
android:background="@drawable/im_bg_raduis_up_green">
<TextView
<TextView android:id="@+id/packet_title"
android:id="@+id/packet_title" android:layout_width="160dp"
android:layout_width="160dp" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginTop="10dp"
android:layout_marginTop="10dp" android:layout_toRightOf="@+id/packte_im"
android:layout_toRightOf="@+id/packte_im" android:paddingRight="10dp"
android:paddingRight="10dp" android:text="请尽快添加可预约时间"
android:text="请尽快添加可预约时间" android:textColor="#ffffff"
android:textColor="#ffffff" android:textSize="14sp" />
android:textSize="14sp" />
<TextView
<TextView android:id="@+id/text_content1"
android:id="@+id/text_content1" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_below="@+id/packet_title"
android:layout_below="@+id/packet_title" android:layout_toRightOf="@+id/packte_im"
android:layout_toRightOf="@+id/packte_im" android:text=""
android:text="" android:textColor="#ffffff"
android:textColor="#ffffff" android:textSize="12sp" />
android:textSize="12sp" />
<ImageView
<ImageView android:id="@+id/packte_im"
android:id="@+id/packte_im" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:padding="10dp"
android:padding="10dp" android:src="@mipmap/im_shijianxiao"
android:src="@mipmap/im_shijianxiao" android:layout_alignParentTop="true"
android:layout_alignParentTop="true" android:layout_alignParentLeft="true"
android:layout_alignParentLeft="true" android:layout_alignParentStart="true" />
android:layout_alignParentStart="true" />
</RelativeLayout>
</RelativeLayout>
<TextView
<TextView android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:textSize="11sp"
android:textSize="11sp" android:layout_alignLeft="@id/red_packet_main"
android:layout_alignLeft="@id/red_packet_main" android:layout_alignRight="@id/red_packet_main"
android:layout_alignRight="@id/red_packet_main" android:textColor="#999999"
android:textColor="#999999" android:layout_below="@id/red_packet_main"
android:layout_below="@id/red_packet_main" android:background="@drawable/im_bg_raduis_down_white"
android:background="@drawable/im_bg_raduis_down_white" android:paddingLeft="10dp"
android:paddingLeft="10dp" android:paddingTop="2dp"
android:paddingTop="2dp" android:paddingBottom="2dp"
android:paddingBottom="2dp" android:text="添加新时段提醒" />
android:text="添加新时段提醒" />
<!-- <ImageView-->
<ImageView <!-- android:id="@+id/trangle_orange"-->
android:id="@+id/trangle_orange" <!-- android:layout_width="wrap_content"-->
android:layout_width="wrap_content" <!-- android:layout_height="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_marginTop="15dp"-->
android:layout_marginTop="15dp" <!-- android:layout_alignParentRight="true"-->
android:layout_alignParentRight="true" <!-- android:src="@mipmap/im_right_22"/>-->
android:src="@mipmap/im_right_22"/>
</RelativeLayout>
</RelativeLayout>
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