Commit 8d64a578 by 刘鹏

feat: 云信退出加埋点

parent 1e567709
...@@ -5,12 +5,12 @@ ext { ...@@ -5,12 +5,12 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.02", "m-confide" : "0.0.49.04",
"m-consultant" : "0.0.59.68", "m-consultant" : "0.0.59.68",
"m-fm" : "0.0.30.01", "m-fm" : "0.0.30.01",
"m-user" : "0.0.61.23", "m-user" : "0.0.61.24",
"m-home" : "0.0.22.59", "m-home" : "0.0.22.59",
"m-im" : "0.0.18.45", "m-im" : "0.0.18.46",
"m-dynamic" : "0.0.7.19", "m-dynamic" : "0.0.7.19",
"m-article" : "0.0.0.6", "m-article" : "0.0.0.6",
...@@ -88,12 +88,12 @@ ext { ...@@ -88,12 +88,12 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.02", "m-confide" : "0.0.49.04",
"m-consultant" : "0.0.59.68", "m-consultant" : "0.0.59.68",
"m-fm" : "0.0.30.01", "m-fm" : "0.0.30.01",
"m-user" : "0.0.61.23", "m-user" : "0.0.61.24",
"m-home" : "0.0.22.59", "m-home" : "0.0.22.59",
"m-im" : "0.0.18.45", "m-im" : "0.0.18.46",
"m-dynamic" : "0.0.7.19", "m-dynamic" : "0.0.7.19",
"m-article" : "0.0.0.6", "m-article" : "0.0.0.6",
......
...@@ -4,7 +4,6 @@ import android.content.Context; ...@@ -4,7 +4,6 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
...@@ -17,6 +16,8 @@ import com.netease.nimlib.sdk.msg.MsgServiceObserve; ...@@ -17,6 +16,8 @@ import com.netease.nimlib.sdk.msg.MsgServiceObserve;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.CustomNotification; import com.netease.nimlib.sdk.msg.model.CustomNotification;
import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.ydl.ydlnet.utils.log.AliYunLogConfig;
import com.ydl.ydlnet.utils.log.AliYunLogHelper;
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.IMRegisterObserverCustomNotificationCallBack; import com.yidianling.im.api.bean.IMRegisterObserverCustomNotificationCallBack;
...@@ -82,9 +83,8 @@ public class YDLP2PMessageActivity extends YDLBaseMessageActivity { ...@@ -82,9 +83,8 @@ public class YDLP2PMessageActivity extends YDLBaseMessageActivity {
/** /**
* 切换到客服界面 * 切换到客服界面
*
*/ */
public static void startChangeDoctor(Context context, String contactId, SessionCustomization customization, IMMessage anchor, IP2PCustomActionHandler l){ public static void startChangeDoctor(Context context, String contactId, SessionCustomization customization, IMMessage anchor, IP2PCustomActionHandler l) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra(Extras.EXTRA_ACCOUNT, contactId); intent.putExtra(Extras.EXTRA_ACCOUNT, contactId);
intent.putExtra(Extras.EXTRA_CUSTOMIZATION, customization); intent.putExtra(Extras.EXTRA_CUSTOMIZATION, customization);
...@@ -106,7 +106,7 @@ public class YDLP2PMessageActivity extends YDLBaseMessageActivity { ...@@ -106,7 +106,7 @@ public class YDLP2PMessageActivity extends YDLBaseMessageActivity {
// 如果isChangeDoctor为true表示切换客服 // 如果isChangeDoctor为true表示切换客服
if (isChangeDoctor) { if (isChangeDoctor) {
messageFragment = (YDLMessageFragment) switchContent(switchServiceFragment(intent)); messageFragment = (YDLMessageFragment) switchContent(switchServiceFragment(intent));
isChangeDoctor=false; isChangeDoctor = false;
} }
} }
...@@ -137,7 +137,7 @@ public class YDLP2PMessageActivity extends YDLBaseMessageActivity { ...@@ -137,7 +137,7 @@ public class YDLP2PMessageActivity extends YDLBaseMessageActivity {
isChangeDoctor = true; isChangeDoctor = true;
String serviceUid = String.valueOf(serviceBean.getData().getToUid()); String serviceUid = String.valueOf(serviceBean.getData().getToUid());
tb.setTitle(serviceBean.getData().getName()); tb.setTitle(serviceBean.getData().getName());
YDLP2PMessageActivity.startChangeDoctor(YDLP2PMessageActivity.this, serviceUid, SessionHelper.getP2pCustomization(-1), null,new P2PCustomActionHandlerImpl(serviceUid, serviceBean.getData().getName(), serviceUid)); YDLP2PMessageActivity.startChangeDoctor(YDLP2PMessageActivity.this, serviceUid, SessionHelper.getP2pCustomization(-1), null, new P2PCustomActionHandlerImpl(serviceUid, serviceBean.getData().getName(), serviceUid));
} }
} }
}); });
...@@ -145,13 +145,13 @@ public class YDLP2PMessageActivity extends YDLBaseMessageActivity { ...@@ -145,13 +145,13 @@ public class YDLP2PMessageActivity extends YDLBaseMessageActivity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
if (ActionHandlerStorage.getL(sessionId) != null) if (ActionHandlerStorage.getL(sessionId) != null) {
ActionHandlerStorage.getL(sessionId).clear(sessionId); ActionHandlerStorage.getL(sessionId).clear(sessionId);
}
registerObservers(false); registerObservers(false);
super.onDestroy(); super.onDestroy();
AliYunLogHelper.Companion.getInstance().sendLog(AliYunLogConfig.YUNXIN,"退出聊天页面");
} }
@Override @Override
......
...@@ -52,6 +52,8 @@ import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils; ...@@ -52,6 +52,8 @@ import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils;
import com.ydl.ydlcommon.utils.log.LogHelper; import com.ydl.ydlcommon.utils.log.LogHelper;
import com.ydl.ydlcommon.view.CircleImageView; import com.ydl.ydlcommon.view.CircleImageView;
import com.ydl.ydlcommon.view.dialog.CommonDialog; import com.ydl.ydlcommon.view.dialog.CommonDialog;
import com.ydl.ydlnet.utils.log.AliYunLogConfig;
import com.ydl.ydlnet.utils.log.AliYunLogHelper;
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.helper.IMChatUtil; import com.yidianling.im.helper.IMChatUtil;
...@@ -754,15 +756,21 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy { ...@@ -754,15 +756,21 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
} }
// 帮助人数 // 帮助人数
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"; if (TextUtils.isEmpty(help_num)) {
help_num = "0";
}
help_num_tv.setText(help_num); help_num_tv.setText(help_num);
// 服务时长 // 服务时长
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"; if (TextUtils.isEmpty(server_num)) {
server_num = "0";
}
server_num_tv.setText(server_num); server_num_tv.setText(server_num);
// 好评率 // 好评率
good_num = ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoFeedbackRateForShow; good_num = ActionHandlerStorage.getL(sessionId).getInfo().doctorBriefInfoFeedbackRateForShow;
if (TextUtils.isEmpty(good_num)) good_num = "0.0"; if (TextUtils.isEmpty(good_num)) {
good_num = "0.0";
}
good_num_tv.setText(good_num); good_num_tv.setText(good_num);
try { try {
...@@ -1176,13 +1184,14 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy { ...@@ -1176,13 +1184,14 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
} }
}); });
AliYunLogHelper.Companion.getInstance().sendLog(AliYunLogConfig.YUNXIN,"sendMessage 该消息发送成功");
} else { } else {
// 替换成tip // 替换成tip
message = MessageBuilder.createTipMessage(message.getSessionId(), message.getSessionType()); message = MessageBuilder.createTipMessage(message.getSessionId(), message.getSessionType());
message.setContent("该消息无法发送"); message.setContent("该消息无法发送");
message.setStatus(MsgStatusEnum.success); message.setStatus(MsgStatusEnum.success);
NIMClient.getService(MsgService.class).saveMessageToLocal(message, false); NIMClient.getService(MsgService.class).saveMessageToLocal(message, false);
AliYunLogHelper.Companion.getInstance().sendLog(AliYunLogConfig.YUNXIN,"sendMessage 该消息无法发送");
} }
messageListPanel.onMsgSend(message); messageListPanel.onMsgSend(message);
...@@ -1210,9 +1219,12 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy { ...@@ -1210,9 +1219,12 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
LogHelper.Companion.getInstance().writeLogSync("发送消息失败:已被对方拉黑"); LogHelper.Companion.getInstance().writeLogSync("发送消息失败:已被对方拉黑");
ToastUtil.toastLong(getActivity(), "您已被对方拉黑!"); ToastUtil.toastLong(getActivity(), "您已被对方拉黑!");
AliYunLogHelper.Companion.getInstance().sendLog(AliYunLogConfig.YUNXIN,"sendFailWithBlackList 发送消息失败:已被对方拉黑");
} else if (code == 404) { } else if (code == 404) {
LogHelper.Companion.getInstance().writeLogSync("发送消息失败:对象不见了"); LogHelper.Companion.getInstance().writeLogSync("发送消息失败:对象不见了");
ToastUtil.toastLong(getActivity(), "对象不见了!"); ToastUtil.toastLong(getActivity(), "对象不见了!");
AliYunLogHelper.Companion.getInstance().sendLog(AliYunLogConfig.YUNXIN,"sendFailWithBlackList 发送消息失败:对象不见了 404");
} else { } else {
//上传至后台 //上传至后台
if (!TextUtils.isEmpty(sessionId) && ActionHandlerStorage.getL(sessionId) != null) { if (!TextUtils.isEmpty(sessionId) && ActionHandlerStorage.getL(sessionId) != null) {
......
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