1.白板文档模块优化删除和更新逻辑

2.课堂加入成功之后返回的数据值中增加当前课堂状态

1.白板文档模块优化删除和更新逻辑
2.课堂加入成功之后返回的数据值中增加当前课堂状态
李勇
Commit abd144bb3f50e0d290d0a2666589e019ae75027a abd144bb 1 parent 9d47e6a1
dist/McuClient.js
src/EngineEntrance.js
src/GlobalConfig.js
src/apes/Ape.js
src/apes/DocApe.js
src/apes/WhiteBoardApe.js
--- a/dist/McuClient.js
查看文件 @abd144b
+++ b/dist/McuClient.js
查看文件 @abd144b
--- a/src/EngineEntrance.js
查看文件 @abd144b
+++ b/src/EngineEntrance.js
查看文件 @abd144b
@@ -574,6 +574,7 @@ export default class MessageEntrance extends Emiter {
         joinClassSuccessCallBackData.DOCServerIP = GlobalConfig.DOCServerIP;
         joinClassSuccessCallBackData.DOCServerPort = GlobalConfig.DOCServerPort;
+        joinClassSuccessCallBackData.classStatus= GlobalConfig.classStatus;
         joinClassSuccessCallBackData.classId = GlobalConfig.classId;
         joinClassSuccessCallBackData.className = GlobalConfig.className;
         joinClassSuccessCallBackData.h5Module = GlobalConfig.h5Module;
@@ -991,7 +992,7 @@ export default class MessageEntrance extends Emiter {
             return;
         }
         loger.log('Doc UpdateId ->');
-        loger.log(_data);
+        //loger.log(_data);
         if (_whiteboard_ape) {
             _whiteboard_ape.docUpdateHandler(_data);
         }
@@ -1127,6 +1128,7 @@ export default class MessageEntrance extends Emiter {
         joinClassSuccessCallBackData.DOCServerIP = GlobalConfig.DOCServerIP;
         joinClassSuccessCallBackData.DOCServerPort = GlobalConfig.DOCServerPort;
+        joinClassSuccessCallBackData.classStatus= GlobalConfig.classStatus;
         joinClassSuccessCallBackData.classId = GlobalConfig.classId;
         joinClassSuccessCallBackData.className = GlobalConfig.className;
         joinClassSuccessCallBackData.h5Module = GlobalConfig.h5Module;
--- a/src/GlobalConfig.js
查看文件 @abd144b
+++ b/src/GlobalConfig.js
查看文件 @abd144b
@@ -116,8 +116,8 @@ class GlobalConfig {
         this.recordFileName=data.recordFileName||this.recordFileName;//录制的文件名
         this.recordDownloadUrl=data.recordDownloadUrl||this.recordDownloadUrl;//下载地址
-        this.activeDocId=data.activeDocId||this.activeDocId;//当前激活的文档ID
-        this.activeDocCurPage=data.activeDocCurPage||this.activeDocCurPage;//当前激活的文档的当前页
+        //this.activeDocId=data.activeDocId||this.activeDocId;//当前激活的文档ID
+        //this.activeDocCurPage=data.activeDocCurPage||this.activeDocCurPage;//当前激活的文档的当前页
     }
--- a/src/apes/Ape.js
查看文件 @abd144b
+++ b/src/apes/Ape.js
查看文件 @abd144b
@@ -168,10 +168,14 @@ export default class Ape extends Emiter {
                     //loger.log("RCRegistryTableUpdateItemPdu " + tableUpdateItemsLen);
                     //loger.log(tableUpdateData);
+
                     for (let i = 0; i < tableUpdateItemsLen; ++i) {
                         let tableItem = tableUpdateItems[i];
                         this.tableUpdateHandler(tableItem.owner, tableItem.itemIdx, tableItem.itemData,seekTime);
                     }
+
+                    //白板数据内部自己处理数组
+                    this.tableUpdateApeHandler(tableUpdateItems);
                     break;
                 case pdu.RCPDU_REG_QUEUE_UPDATE_PDU:
                 case pdu.RCPDU_REG_QUEUE_DELETE_PDU:
@@ -202,7 +206,9 @@ export default class Ape extends Emiter {
     tableUpdateHandler(ownerId, recordId, recordData,seekTime) {
         loger.warn(this._session_name + ' tableUpdateHandler 应有子类具体覆盖处理.');
     }
+    tableUpdateApeHandler(tableUpdateItems,seekTime){
+    }
     tableDeleteHandler(tableId, record) {
         loger.warn(this._session_name + ' tableDelHandler 应有子类具体覆盖处理.');
     }
--- a/src/apes/DocApe.js
查看文件 @abd144b
+++ b/src/apes/DocApe.js
查看文件 @abd144b
@@ -359,14 +359,14 @@ class DocApe extends Ape {
       for (let i=0;i<len;i++){
         if(this.docList[itemIdxs[i]]){
           loger.log("删除文档数据:",itemIdxs[i]);
-          //this._emit(MessageTypes.DOC_DELETE,itemIdxs[i]);
-          this._emit(MessageTypes.DOC_DELETE, {"itemIdx": itemIdxs[i]});
+          //this._emit(MessageTypes.DOC_DELETE, {"itemIdx": itemIdxs[i]});
           let itemDataInfo=this.docList[itemIdxs[i]];
           if(itemDataInfo&&(itemDataInfo.visible=="true"||itemDataInfo.visible==true)){
             GlobalConfig.activeDocId=0;//当前激活的文档ID
             GlobalConfig.activeDocCurPage=1;//当前激活的文档的当前页
             loger.log('tableDeleteHandler 设置当前激活的文档id');
           }
+          this._emit(MessageTypes.DOC_DELETE, {"itemIdx": itemIdxs[i]});
           delete this.docList[itemIdxs[i]];
         }
       }
--- a/src/apes/WhiteBoardApe.js
查看文件 @abd144b
+++ b/src/apes/WhiteBoardApe.js
查看文件 @abd144b
@@ -123,6 +123,7 @@ class WhiteBoardApe extends Ape {
     //删除当前页码的所有标注
     sendDeleteCurPageAnnotation(_param) {
+        this.insertHistory=[];
         for (let key in this.annoInfos) {
             let item = this.annoInfos[key];
             if (item && item.parentId == GlobalConfig.activeDocId && item.curPageNo == GlobalConfig.activeDocCurPage) {
@@ -134,6 +135,7 @@ class WhiteBoardApe extends Ape {
     //删除所有标注
     sendDeleteAllAnnotation(_param) {
+        this.insertHistory=[];
         for (let key in this.annoInfos) {
             this.sendDeleteAnnotaion({"itemIdx": key});
         }
@@ -224,7 +226,7 @@ class WhiteBoardApe extends Ape {
     /////收到消息处理/////////////////////////////////////////////////////////////////////////////////
     tableInsertHandler(owner, itemIdx, itemData) {
         let whiteBoardModel = this.unPackPdu(owner, itemIdx, itemData);
-        loger.log('tableInsertHandler');
+        loger.log('tableInsertHandler',"activeDocId->",GlobalConfig.activeDocId ,"parentId->", whiteBoardModel.parentId);
         loger.log(whiteBoardModel);
         if (whiteBoardModel) {
             if (GlobalConfig.activeDocId == whiteBoardModel.parentId && GlobalConfig.activeDocCurPage == whiteBoardModel.curPageNo) {
@@ -236,12 +238,23 @@ class WhiteBoardApe extends Ape {
     }
     tableUpdateHandler(owner, itemIdx, itemData) {
-        let whiteBoardModel = this.unPackPdu(owner, itemIdx, itemData);
-        loger.log('tableUpdateHandler');
+        //白板标注数据不在这个函数中处理，在tableUpdateApeHandler中处理
+       /*let whiteBoardModel = this.unPackPdu(owner, itemIdx, itemData);
+        loger.log('tableUpdateHandler',"activeDocId->",GlobalConfig.activeDocId ,"parentId->", whiteBoardModel.parentId);
         loger.log(whiteBoardModel);
         if (whiteBoardModel && whiteBoardModel.parentId == GlobalConfig.activeDocId && whiteBoardModel.curPageNo == GlobalConfig.activeDocCurPage) {
             this.updateAandShowAnnotaion();
+        }*/
+    }
+
+    tableUpdateApeHandler(_tableUpdateItems,_seekTime){
+        let tableUpdateItemsLen = _tableUpdateItems.length;
+        loger.log('tableUpdateApeHandler',"activeDocId->",GlobalConfig.activeDocId ,"tableUpdateItemsLen->", tableUpdateItemsLen);
+        for (let i = 0; i < tableUpdateItemsLen; ++i) {
+            let tableItem = _tableUpdateItems[i];
+            let whiteBoardModel = this.unPackPdu(tableItem.owner, tableItem.itemIdx, tableItem.itemData);
         }
+        this.updateAandShowAnnotaion();
     }
     tableDeleteHandler(object_id, tableDeleteData) {
@@ -283,6 +296,12 @@ class WhiteBoardApe extends Ape {
                 this.sendDeleteAnnotaion({"itemIdx": key});
             }
         }
+
+        //判断当前是否有文档在显示，如果文档没有显示就显示默认的白板数据
+        if(GlobalConfig.activeDocId==0){
+            this.insertHistory=[];
+            this.updateAandShowAnnotaion();
+        }
     }
     //增量添加标注