Skip to content

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

feat : im去掉部分消息类型

parent 3edfc1a4
Showing with 5 additions and 173 deletions
config.gradle
......@@ -11,7 +11,7 @@ ext {
"m-user" : "0.0.61.90",
"m-user-medical" : "0.0.61.99",
"m-home" : "0.0.22.70",
"m-im-medical" : "0.0.21.25",
"m-im-medical" : "0.0.21.26",
"m-im" : "0.0.20.76",
"m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.10",
......@@ -97,7 +97,7 @@ ext {
"m-user" : "0.0.61.90",
"m-user-medical" : "0.0.61.99",
"m-home" : "0.0.22.70",
"m-im-medical" : "0.0.21.25",
"m-im-medical" : "0.0.21.26",
"m-im" : "0.0.20.76",
"m-dynamic" : "0.0.7.28",
"m-article" : "0.0.0.8",
......
m-im/src/main/java/com/yidianling/im/bridge/P2PCustomActionHandlerImpl.java
......@@ -267,21 +267,6 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
@Override
public void toExpertHome(String doctorId, String name, String cover) {
// // 跳转到专家主页
// String junmpurl = ImIn.INSTANCE.getExpertHost() + doctorId;
// String share_title = name + "咨询工作室";
// String share_head = cover;
// String share_context = "";
// String share_url = ImIn.INSTANCE.getShareExpertHost() + doctorId;
//
// H5Params h5Params = new H5Params(junmpurl, null);
// if (!TextUtils.isEmpty(share_url)) {
// ShareData shareData1 = new ShareData(junmpurl, share_title, share_head, share_context);
// h5Params.setShareData(shareData1);
// }
// h5Params.setShowMenu(true);
// if (mActivity != null) {
// NewH5Activity.start(mActivity, h5Params);
// }
}
/**
......
m-im/src/main/java/com/yidianling/im/helper/IMChatUtil.kt
......@@ -522,9 +522,9 @@ object IMChatUtil {
if (!(promptRule == 4 || promptRule == 5)) {
val showExpertList = !(promptRule == 1 || promptRule == 3)
if (actionHandler.userType == USER_TYPE_EXPERT && status == 2) { //当该专家离线时
sendRecommendExpertListMessage(1, showExpertList, toUid, actionHandler)
// sendRecommendExpertListMessage(1, showExpertList, toUid, actionHandler)
} else if (actionHandler.userType == USER_TYPE_EXPERT && status >= 3) { //当该专家忙碌时
sendRecommendExpertListMessage(2, showExpertList, toUid, actionHandler)
// sendRecommendExpertListMessage(2, showExpertList, toUid, actionHandler)
}
}
}
......@@ -548,7 +548,7 @@ object IMChatUtil {
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ res: BaseAPIResponse<ArrayList<RecommendExpertBean>> ->
//发送推荐专家列表消息
actionHandler.sendRecommendExpertListMessage(toUid, res.data, type, showExpertList)
// actionHandler.sendRecommendExpertListMessage(toUid, res.data, type, showExpertList)
}, { throwable: Throwable -> ToastUtil.toastShort(throwable.toString()) })
}
......
m-im/src/main/java/com/yidianling/im/session/SessionHelper.java
......@@ -31,11 +31,6 @@ import com.yidianling.im.R;
import com.yidianling.im.http.ImRetrofitApi;
import com.yidianling.im.router.ImIn;
import com.yidianling.im.session.action.AVChatAction;
import com.yidianling.im.session.action.H5VideoAction;
import com.yidianling.im.session.action.MakeCollectionsAction;
import com.yidianling.im.session.action.OrderAction;
import com.yidianling.im.session.action.RedPacketAction;
import com.yidianling.im.session.action.SendCardAction;
import com.yidianling.im.session.action.TeamAVChatAction;
import com.yidianling.im.session.extension.CustomAttachAssistantReceivedMoney;
import com.yidianling.im.session.extension.CustomAttachChatTipMsg;
......@@ -52,7 +47,6 @@ import com.yidianling.im.session.extension.CustomAttachParser;
import com.yidianling.im.session.extension.CustomAttachPleaseSubscribeConsultDate;
import com.yidianling.im.session.extension.CustomAttachReceivedMoney;
import com.yidianling.im.session.extension.CustomAttachRedPacket;
import com.yidianling.im.session.extension.CustomAttachSubScriptTime;
import com.yidianling.im.session.extension.CustomAttachTipMsg;
import com.yidianling.im.session.extension.CustomAttachment;
import com.yidianling.im.session.extension.CustomAttachmentBusinessCard;
......@@ -117,7 +111,6 @@ import com.yidianling.im.session.viewholder.MsgViewHolderRedStatus;
import com.yidianling.im.session.viewholder.MsgViewHolderSendTest;
import com.yidianling.im.session.viewholder.MsgViewHolderShareMsg;
import com.yidianling.im.session.viewholder.MsgViewHolderSticker;
import com.yidianling.im.session.viewholder.MsgViewHolderSubscriptTime;
import com.yidianling.im.session.viewholder.MsgViewHolderSwitchKeFuTips;
import com.yidianling.im.session.viewholder.MsgViewHolderSystemTips;
import com.yidianling.im.session.viewholder.MsgViewHolderTip;
......@@ -455,32 +448,20 @@ public class SessionHelper {
NimUIKit.registerMsgItemViewHolder(CustomAttachmentEvaluate.class, MsgViewHolderEvaluate.class);
NimUIKit.registerMsgItemViewHolder(CustomAttachConsult.class, MsgViewHolderConsult.class);
NimUIKit.registerMsgItemViewHolder(CustomAttachmentRecommendAssistant.class, MsgViewHolderRecommendAssistant.class);
NimUIKit.registerMsgItemViewHolder(CustomAttachRedPacket.class, MsgViewHolderRedPacket.class);//红包消息
NimUIKit.registerMsgItemViewHolder(CustomAttachmentRedStatus.class, MsgViewHolderRedStatus.class);//红包状态
NimUIKit.registerMsgItemViewHolder(CustomAttachReceivedMoney.class, MsgViewHolderReceivedMoney.class);//收款消息
NimUIKit.registerMsgItemViewHolder(CustomAttachmentReceivedSuccess.class, MsgViewHolderReceivedStatus.class);//收款提醒消息(成功)
NimUIKit.registerMsgItemViewHolder(CustomAttachmentReceivedTimeout.class, MsgViewHolderReceivedStatus.class);//收款提醒消息（超时）
NimUIKit.registerMsgItemViewHolder(DefaultCustomAttachment.class, MsgViewHolderUnknown.class);
NimUIKit.registerTipMsgViewHolder(MsgViewHolderTip.class);
NimUIKit.registerMsgItemViewHolder(CustomAttachSubScriptTime.class, MsgViewHolderSubscriptTime.class);//添加预约时间
NimUIKit.registerMsgItemViewHolder(CustomAttachTipMsg.class, MsgViewHolderCustomTip.class);//自定义样式提醒消息
NimUIKit.registerMsgItemViewHolder(CustomAttachmentOrderStatus.class, MsgViewHolderOrderStatus.class);//订单提醒消息
NimUIKit.registerMsgItemViewHolder(CustomAttachChatTipMsg.class, MsgViewHolderChatTip.class);//短时间内发送过多私聊 给你警示
NimUIKit.registerMsgItemViewHolder(CustomAttachModifyTime.class, MsgViewHolderModifyTime.class);
NimUIKit.registerMsgItemViewHolder(CustomAttachmentPhoneCallRedPacket.class, MsgViewHolderPhoneCallRedPacket.class);//倾述后评价红包
NimUIKit.registerMsgItemViewHolder(CustomAttachmentPhoneCallSystemNotice.class, MsgViewHolderPhoneCallSystemNotice.class);//本地自定义消息
NimUIKit.registerMsgItemViewHolder(CustomSystemTips.class, MsgViewHolderSystemTips.class);//本地系统自定义消息 对应24
NimUIKit.registerMsgItemViewHolder(CustomRecommendExpertListMsg.class, MsgViewHolderRecommendExpertList.class);//推荐专家列表 对应25
NimUIKit.registerMsgItemViewHolder(CustomAttachConsultSubScript.class, MsgViewHolderConsultSubScribe.class);//确认咨询预约消息 27
NimUIKit.registerMsgItemViewHolder(CustomAttachConsultPerfectData.class, MsgViewHolderPerfectConsultData.class);//完善咨询资料提醒消息
NimUIKit.registerMsgItemViewHolder(CustomAttachPleaseSubscribeConsultDate.class, MsgViewHolderPleaseSubscribeConsultDate.class);//请预约咨询时间
NimUIKit.registerMsgItemViewHolder(CustomCustomerServiceCardAttachment.class, MsgViewHolderCustomerServiceCard.class);//客服小壹名片
NimUIKit.registerMsgItemViewHolder(CustomAttachmentShareMsg.class, MsgViewHolderShareMsg.class);//分享推送
NimUIKit.registerMsgItemViewHolder(CustomAttachConsultCallStatus.class, MsgViewHolderConsultCallStatus.class);//咨询声网的拨打状态
NimUIKit.registerMsgItemViewHolder(CustomAttachAssistantReceivedMoney.class, MsgViewHolderAssistantReceivedMoney.class);
NimUIKit.registerMsgItemViewHolder(CustomAttachmentBusinessCard.class, MsgViewHolderBusinessCard.class);//专家自定义名片 ，TYPE=34
NimUIKit.registerMsgItemViewHolder(CustomAttachmentJumpToDaoYi.class, MsgViewHolderJumpToDaoYi.class);//跳转导医聊天窗口触发导医分配逻辑，TYPE=35
NimUIKit.registerMsgItemViewHolder(CustomAttachmentSwitchKeFuTips.class, MsgViewHolderSwitchKeFuTips.class);//客服转介需求，TYPE=40
NimUIKit.registerMsgItemViewHolder(CustomAttachmentFilter.class, MsgViewHolderUnknown.class);// 注册消息过滤器
NimUIKit.registerMsgItemViewHolder(CustomAttachmentConfirmOrder.class, MsgViewHolderConfirmOrder.class);//确认完成订单消息类型38
NimUIKit.registerMsgItemViewHolder(CustomAttachmentOrderAlreadyDone.class, MsgViewHolderOrderAlreadyDone.class);//已完成订单消息类型39
......
m-im/src/main/java/com/yidianling/im/session/extension/CustomAttachParser.java
......@@ -37,140 +37,6 @@ public class CustomAttachParser implements MsgAttachmentParser {
attachment = new CustomAttachmentRecipel();
break;
//// case CustomAttachmentType.SnapChat:
// return new SnapChatAttachment(data);
//// case CustomAttachmentType.Sticker:
//// attachment = new StickerAttachment();
//// break;
// case CustomAttachmentType.RTS:
//// attachment = new RTSAttachment();
// break;
// case CustomAttachmentType.TEST:
// case CustomAttachmentType.TYPE_LINGXI_TEST_QUESTION:
// attachment = new CustomAttachmentTest();
// break;
// case CustomAttachmentType.EVALUATE:
// attachment = new CustomAttachmentEvaluate();
// break;
// case CustomAttachmentType.CONSULT:
// attachment = new CustomAttachConsult();
// break;
// case CustomAttachmentType.ASSISTANT:
// attachment = new CustomAttachmentRecommendAssistant();
// break;
// case CustomAttachmentType.REDPACKET:
// attachment = new CustomAttachRedPacket();
// break;
// case CustomAttachmentType.REDSTATUS:
// case CustomAttachmentType.REDTIMEOUT:
// attachment = new CustomAttachmentRedStatus();
// break;
// case CustomAttachmentType.RECEIVEDMONEY:
// //收款消息解析器
// attachment = new CustomAttachReceivedMoney();
// break;
// case CustomAttachmentType.RECEIVEDMONEY_STATUS:
// //收款消息支付状态发生变化
// attachment = new CustomAttachmentReceivedSuccess();
// break;
// case CustomAttachmentType.RECEIVEDMONEY_TIMEOUT:
// //收款消息超时未支付
// attachment = new CustomAttachmentReceivedTimeout();
// break;
// case CustomAttachmentType.ADD_SUBSCRIPT_TIME:
// //添加预约时间提醒
// attachment = new CustomAttachSubScriptTime();
// break;
// case CustomAttachmentType.TIP_MSG:
// //自定义样式提醒消息
// attachment = new CustomAttachTipMsg();
// break;
// case CustomAttachmentType.ORDER_TIP:
// //订单状态
// attachment = new CustomAttachmentOrderStatus();
// break;
// //修改
// case CustomAttachmentType.MODIFY_TIME:
// attachment = new CustomAttachModifyTime();
// break;
// case CustomAttachmentType.TYPE_PHONE_CALL_RED_PACKET:
// attachment = new CustomAttachmentPhoneCallRedPacket();
// break;
// case CustomAttachmentType.TYPE_PHONE_CALL_SYSTEM_NOTICE:
// attachment = new CustomAttachmentPhoneCallSystemNotice();
// break;
// case CustomAttachmentType.TYPE_CUSTOM_SYSTEM_TIPS:
// attachment = new CustomSystemTips();
// break;
// case CustomAttachmentType.TYPE_RECOMMEND_EXPORTS:
// attachment = new CustomRecommendExpertListMsg();
// break;
// case CustomAttachmentType.TYPE_CONSULT_SUBSCRIBE_SURE:
// //咨询预约时间确认
// attachment = new CustomAttachConsultSubScript();
// break;
// case CustomAttachmentType.TYPE_CONSULT_PERFECT_DATA:
// //完善咨询资料消息
// attachment = new CustomAttachConsultPerfectData();
// break;
// case CustomAttachmentType.TYPE_PLEASE_SUBSCRIBE_CONSULT_DATE:
// //请预约咨询时间
// attachment = new CustomAttachPleaseSubscribeConsultDate();
// break;
// case CustomAttachmentType.TYPE_CUSTOMER_SERVICE:
// //客服小壹名片
// attachment = new CustomCustomerServiceCardAttachment();
// break;
// case CustomAttachmentType.TYPE_PUSH_SHARE:
// //分享消息，倾诉推荐，课程，测评，文章
// attachment = new CustomAttachmentShareMsg();
// break;
// case CustomAttachmentType.TYPE_CUSTOMER_CONSULT_CALL_STATUS:
// //咨询的声网拨打状态的自定义消息
// attachment = new CustomAttachConsultCallStatus();
// break;
// case CustomAttachmentType.ASSISTANT_RECEIVEDMONEY:
// attachment = new CustomAttachAssistantReceivedMoney();
// break;
// case CustomAttachmentType.TYPE_EXPERT_DETAIL_CARD:
// //专家自定义名片
// attachment = new CustomAttachmentBusinessCard();
// break;
// case CustomAttachmentType.TYPE_JUMPTO_DAOYI:
// //跳转导医聊天界面
// attachment = new CustomAttachmentJumpToDaoYi();
// break;
// case CustomAttachmentType.TYPE_SWITCH_KEFU_TIPS:
// //客服转介需求
// attachment = new CustomAttachmentSwitchKeFuTips();
// break;
// //41 42消息过滤掉
// case CustomAttachmentType.TYPE_FILTER_41:
// case CustomAttachmentType.TYPE_FILTER_42:
// case CustomAttachmentType.TYPE_FILTER_61:
// case CustomAttachmentType.TYPE_FILTER_70:
// case CustomAttachmentType.TYPE_FILTER_71:
// case CustomAttachmentType.TYPE_FILTER_80:
// attachment = new CustomAttachmentFilter();
// break;
// case CustomAttachmentType.TYPE_CONFIRM_ORDER://38 确认订单消息
// attachment = new CustomAttachmentConfirmOrder();
// break;
// case CustomAttachmentType.TYPE_ORDER_ALREADY_DONE://39 订单已完成
// attachment = new CustomAttachmentOrderAlreadyDone();
// break;
// case CustomAttachmentType.TYPE_LINGXI_WHICH_QUESTION://灵犀2.0-您想要咨询下列哪些问题
// attachment = new CustomAttachLingxiWhichQuestion();
// break;
// case CustomAttachmentType.TYPE_LINGXI_ANSWER_QUESTION://灵犀2.0-回答问题
// attachment = new CustomAttachLingxiAnswerQuestion();
// break;
// case CustomAttachmentType.TYPE_LINGXI_JUMP_CONFIDE_LIST: // 跳转倾诉列表
// attachment = new CustomAttachLingXiJumpConfideList();
// break;
// case CustomAttachmentType.TYPE_LINGXI_FIRST_QUESTION: //首问语
// attachment = new CustomAttachLingxiFirstQuestion();
// break;
default:
// attachment = new CustomAttachmentFilter();
break;
......
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