李勇

1.修复文档模块数据解析错误(鼠标模块的数据发送到了文档模块);2.修改课堂状态更新时全员禁言状态值不正确的问题;3.鼠标激光笔模块tableid不正确

此 diff 太大无法显示。
... ... @@ -34,7 +34,7 @@ import mdetect from "mdetect";
import UTF8 from 'utf-8';
let loger = Loger.getLoger('McuClient');
let _sdkInfo = { "version": "v1.38.4.20170629", "author": "www.3mang.com" };
let _sdkInfo = { "version": "v1.39.1.20170705", "author": "www.3mang.com" };
//APE
let _sass;
... ...
... ... @@ -967,7 +967,7 @@ class ConferApe extends Ape {
classStatusInfo.activeDocCurPage = GlobalConfig.activeDocCurPage; //当前激活的文档的当前页
classStatusInfo.isStopAllPublishMedia = _param.isStopAllPublishMedia || false;
classStatusInfo.currentSceneTableId = GlobalConfig.currentSceneTableId;
classStatusInfo.silence = _param.silence || false;
classStatusInfo.silence = _param.silence || GlobalConfig.silence;
//loger.log("classStatusInfo--->", classStatusInfo);
/*
... ...
... ... @@ -49,7 +49,7 @@ class CursorApe extends Ape {
// 添加鼠标
sendInsertCursor(_param) {
if (_param == null || EngineUtils.isEmptyObject(_param)) {
loger.warn('添加标注失败->参数错误->', _param);
loger.warn('添加激光笔失败->参数错误->', _param);
this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_INTERFACE_PARAM_WRONG);
return;
}
... ... @@ -57,7 +57,7 @@ class CursorApe extends Ape {
let itemIdx = ApeConsts.CURSOR_OBJ_TABLE_ID;
let cursorModelPdu = this.packPdu(_param, itemIdx);
if (cursorModelPdu == null) {
loger.warn('添加标注失败-->参数错误->', _param);
loger.warn('添加激光笔失败-->参数错误->', _param);
this._emit(MessageTypes.MCU_ERROR, MessageTypes.ERR_APE_INTERFACE_PARAM_WRONG);
return;
}
... ... @@ -71,11 +71,11 @@ class CursorApe extends Ape {
let tableInsertItemPdu = new pdu['RCRegistryTableUpdateItemPdu'];
//optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_UPDATE_PDU];
//repeated RCRegistryTableItemPdu items = 2;
tableInsertItemPdu.type = pdu.RCPDU_REG_TABLE_UPDATE_PDU; //
tableInsertItemPdu.type = pdu.RCPDU_REG_TABLE_UPDATE_PDU;
tableInsertItemPdu.items.push(tableItemPdu);
let updateObjPdu = new pdu['RCRegistryUpdateObjPdu'];
updateObjPdu.objId = ApeConsts.DOCSHARING_OBJ_TABLE_ID; // updateObjPdu.objId = ApeConsts.DOCSHARING_OBJ_TABLE_ID_H5;
updateObjPdu.objId = ApeConsts.CURSOR_OBJ_TABLE_ID;
updateObjPdu.subType = tableInsertItemPdu.type;
updateObjPdu.userData = tableInsertItemPdu.toArrayBuffer();
... ... @@ -95,7 +95,7 @@ class CursorApe extends Ape {
/////鼠标数据接受/////////////////////////////////////////////////////////////////////////////////
tableUpdateHandler(owner, itemIdx, itemData) {
let cursorModel = this.unPackPdu(owner, itemIdx, itemData);
loger.log('tableUpdateHandler', "activeDocId->", GlobalConfig.activeDocId, "parentId->", cursorModel.parentId);
loger.log('鼠标数据->tableUpdateHandler');
loger.log(cursorModel);
if (cursorModel) {
this._emit(MessageTypes.CURSOR_UPDATE, cursorModel);
... ... @@ -131,13 +131,13 @@ class CursorApe extends Ape {
unPackPdu(owner, itemIdx, itemData) {
try {
loger.log("鼠标标注数据->unPackPdu");
loger.log("鼠标激光笔数据->unPackPdu");
const cursorModelPdu = pdu['RCCursorDataModelPdu'].decode(itemData);
const _pointGroup = EngineUtils.arrayFromJsonString(cursorModelPdu.pointGroup);
cursorModelPdu.pointGroup = _pointGroup;
return cursorModelPdu;
} catch (err) {
loger.log("鼠标标注数据->unPackPdu->Pdu解析错误,itemIdx=" + itemIdx + " err:" + err.message);
loger.log("鼠标激光笔数据->unPackPdu->Pdu解析错误,itemIdx=" + itemIdx + " err:" + err.message);
}
return null;
}
... ...
... ... @@ -534,6 +534,7 @@ class DocApe extends Ape {
loger.log('添加文档->', "activeDocId->", GlobalConfig.activeDocId, "tableUpdateItemsLen->", tableInsertItemsLen);
for (let i = 0; i < tableInsertItemsLen; ++i) {
let insertItem = tableInsertItems[i];
if(insertItem){
//this.tableInsertHandler(insertItem.owner, insertItem.itemIdx, insertItem.itemData);
let itemDataInfo = this.unPackPdu(insertItem.owner, insertItem.itemIdx, insertItem.itemData);
if(itemDataInfo){
... ... @@ -545,6 +546,10 @@ class DocApe extends Ape {
}
let getdocPackFullInfo= this._docPackFullInfo(itemDataInfo);
this._emit(MessageTypes.DOC_UPDATE, getdocPackFullInfo);//用添加和更新都统一DOC_UPDATE
}else{
loger.warn('文档数据解析失败->删除->itemIdx:'+insertItem.itemIdx);
this.documentDelete({"itemIdx": insertItem.itemIdx});
}
}
}
//文档数据更新完毕,如果当前没有显示的文档,默认选择一个显示
... ... @@ -596,8 +601,9 @@ class DocApe extends Ape {
loger.log('更新文档->', "activeDocId->", GlobalConfig.activeDocId, "更新的数量->", tableUpdateItemsLen);
for (let i = 0; i < tableUpdateItemsLen; ++i) {
let tableItem = _tableUpdateItems[i];
if(tableItem) {
let itemDataInfo = this.unPackPdu(tableItem.owner, tableItem.itemIdx, tableItem.itemData);
if (itemDataInfo != null) {
if (itemDataInfo) {
this.docList[tableItem.itemIdx] = itemDataInfo;
if (itemDataInfo && (itemDataInfo.visible == "true" || itemDataInfo.visible == true)) {
GlobalConfig.activeDocId = itemDataInfo.itemIdx;//当前激活的文档ID
... ... @@ -607,7 +613,9 @@ class DocApe extends Ape {
let getdocPackFullInfo= this._docPackFullInfo(itemDataInfo);
this._emit(MessageTypes.DOC_UPDATE, getdocPackFullInfo);
} else {
loger.log('更新文档-> 数据无效--> itemIdx', itemIdx);
loger.warn('文档数据解析失败->删除->itemIdx:'+tableItem.itemIdx);
this.documentDelete({"itemIdx": tableItem.itemIdx});
}
}
}
this._showDefaultDoc();
... ...