From 707cea8fc119caaeb0e8c7ed0fb0a837d623f3f1 Mon Sep 17 00:00:00 2001
From: liyong <liyong@3mang.com>
Date: Thu, 22 Jun 2017 12:21:33 +0800
Subject: [PATCH] 合并冲突解决
---
src/EngineEntrance.js | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/EngineEntrance.js b/src/EngineEntrance.js
index 590368a..6d2b65e 100644
--- a/src/EngineEntrance.js
+++ b/src/EngineEntrance.js
@@ -33,7 +33,7 @@ import QuestionApe from 'apes/QuestionApe';
import UTF8 from 'utf-8';
let loger = Loger.getLoger('McuClient');
-let _sdkInfo = { "version": "v1.36.8.20170620", "author": "www.3mang.com" };
+let _sdkInfo = { "version": "v1.37.1.20170622", "author": "www.3mang.com" };
//APE
let _sass;
@@ -1233,15 +1233,9 @@ export default class MessageEntrance extends Emiter {
}
}
- << << << < HEAD
- //ChatApe
- // 发送聊天消息
- _sendChatMsg(_messageInfo) {
- if (!_mcu.connected) {
- loger.warn(GlobalConfig.getCurrentStatus());
- return { "code": ApeConsts.RETURN_FAILED, "data": "" }; === === =
+
//获取课堂所有参数 api/meeting/detail.do? flash中的接口文件是 getClassParam.do
- _sassGetClassParamSuccessHandler(_data) {
+ _sassGetClassParamSuccessHandler(_data) {
loger.log('获取课堂课堂信息完成.');
//包含整个课堂最全的信息,储存数据
if (_data) {
@@ -1407,7 +1401,14 @@ export default class MessageEntrance extends Emiter {
} else {
//根据用户的userIp获取信息,选点
this.getUserIpInfo();
- } >>> >>> > 51e886 c5e7fcd06f9e4a662071aaec162c455e1d
+ }
+ }
+ //ChatApe
+ // 发送聊天消息
+ _sendChatMsg(_messageInfo) {
+ if (!_mcu.connected) {
+ loger.warn(GlobalConfig.getCurrentStatus());
+ return { "code": ApeConsts.RETURN_FAILED, "data": "" };
}
if (_messageInfo === null || EngineUtils.isEmptyObject(_messageInfo)) {
loger.log('发送聊天消息失败->参数错误', _messageInfo);
--
libgit2 0.24.0