正在显示
14 个修改的文件
包含
451 行增加
和
380 行删除
| @@ -73,7 +73,7 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -73,7 +73,7 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 73 | /******/ } | 73 | /******/ } |
| 74 | 74 | ||
| 75 | /******/ var hotApplyOnUpdate = true; | 75 | /******/ var hotApplyOnUpdate = true; |
| 76 | -/******/ var hotCurrentHash = "19556e0306a68021271b"; // eslint-disable-line no-unused-vars | 76 | +/******/ var hotCurrentHash = "a9772cf69e3cdf097b41"; // eslint-disable-line no-unused-vars |
| 77 | /******/ var hotCurrentModuleData = {}; | 77 | /******/ var hotCurrentModuleData = {}; |
| 78 | /******/ var hotCurrentParents = []; // eslint-disable-line no-unused-vars | 78 | /******/ var hotCurrentParents = []; // eslint-disable-line no-unused-vars |
| 79 | 79 | ||
| @@ -789,7 +789,7 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -789,7 +789,7 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 789 | return _this._emit(type, data); | 789 | return _this._emit(type, data); |
| 790 | }); | 790 | }); |
| 791 | _doc_ape.on(_MessageTypes2.default.DOC_UPDATE, _this.docUpdateHandler.bind(_this)); | 791 | _doc_ape.on(_MessageTypes2.default.DOC_UPDATE, _this.docUpdateHandler.bind(_this)); |
| 792 | - _doc_ape.on(_MessageTypes2.default.DOC_DEL, _this.docDeleteHandler.bind(_this)); | 792 | + _doc_ape.on(_MessageTypes2.default.DOC_DELETE, _this.docDeleteHandler.bind(_this)); |
| 793 | 793 | ||
| 794 | _whiteboard_ape = new _WhiteBoardApe2.default(); | 794 | _whiteboard_ape = new _WhiteBoardApe2.default(); |
| 795 | _whiteboard_ape.on('*', function (type, data) { | 795 | _whiteboard_ape.on('*', function (type, data) { |
| @@ -1154,7 +1154,7 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -1154,7 +1154,7 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 1154 | key: 'docDeleteHandler', | 1154 | key: 'docDeleteHandler', |
| 1155 | value: function docDeleteHandler(docItem) { | 1155 | value: function docDeleteHandler(docItem) { |
| 1156 | if (docItem.id == _confer_ape.activeDocId) { | 1156 | if (docItem.id == _confer_ape.activeDocId) { |
| 1157 | - this._emit(_MessageTypes2.default.DOC_DEL, docItem); | 1157 | + this._emit(_MessageTypes2.default.DOC_DELETE, docItem); |
| 1158 | } | 1158 | } |
| 1159 | } | 1159 | } |
| 1160 | }]); | 1160 | }]); |
| @@ -1822,9 +1822,11 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -1822,9 +1822,11 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 1822 | 1822 | ||
| 1823 | //文档模块事件定义 | 1823 | //文档模块事件定义 |
| 1824 | MessageTypes.DOC_SHOW = 'document.show'; | 1824 | MessageTypes.DOC_SHOW = 'document.show'; |
| 1825 | - MessageTypes.DOC_SWITCH = 'document.switch'; | ||
| 1826 | - MessageTypes.DOC_UPDATE = 'document.update'; | ||
| 1827 | - MessageTypes.DOC_DEL = 'document.delete'; | 1825 | + MessageTypes.DOC_UPLOAD = 'document.upload'; //上传文档 |
| 1826 | + MessageTypes.DOC_COMMAND = 'document.command'; //操作文档 | ||
| 1827 | + MessageTypes.DOC_SWITCH = 'document.switch'; //切换文档 | ||
| 1828 | + MessageTypes.DOC_UPDATE = 'document.update'; //更新文档 | ||
| 1829 | + MessageTypes.DOC_DELETE = 'document.delete'; //删除文档 | ||
| 1828 | MessageTypes.DOC_ANNOTATION = 'document.annotation'; //笔记 | 1830 | MessageTypes.DOC_ANNOTATION = 'document.annotation'; //笔记 |
| 1829 | 1831 | ||
| 1830 | //笔记事件定义 | 1832 | //笔记事件定义 |
| @@ -13458,7 +13460,7 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -13458,7 +13460,7 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 13458 | Object.defineProperty(exports, "__esModule", { | 13460 | Object.defineProperty(exports, "__esModule", { |
| 13459 | value: true | 13461 | value: true |
| 13460 | }); | 13462 | }); |
| 13461 | - var _default = "\n//start\n// pdu_def.proto\n\n// syntax = \"proto3\";\n\noption optimize_for = LITE_RUNTIME;\nenum RCPduPriority_E {\n DP_TOP = 0;\n DP_HIGH = 1;\n DP_MEDIUM = 2;\n DP_LOW = 3;\n}\n\nenum RCPduSegment_E {\n SEG_BEGIN = 0;\n SEG_END = 1;\n SEG_ONCE = 2;\n}\n\nenum RCPduTokenStatus_E {\n TS_NOT_IN_USE = 0;\n TS_SELF_GRABBED = 1;\n TS_OTHER_GRABBED = 2;\n TS_SELF_INHIBITED = 3;\n TS_OTHER_INHIBITED = 4;\n TS_SELF_RECIPIENT = 5;\n TS_SELF_GIVING = 6;\n TS_OTHER_GIVING = 7;\n}\n\nenum RCPduType_E {\n// GCC PDU\n RCPDU_CONNECT_PROVIDER_REQUEST = 0;\n RCPDU_CONNECT_PROVIDER_RESPONSE = 1;\n RCPDU_CONFERENCE_JOIN_REQUEST = 2;\n RCPDU_CONFERENCE_JOIN_RESPONSE = 3;\n RCPDU_CONFERENCE_INVITE_REQUEST = 10;\n RCPDU_CONFERENCE_INVITE_RESPONSE = 11;\n RCPDU_CONFERENCE_LOCK_REQUEST = 20;\n RCPDU_CONFERENCE_LOCK_RESPONSE = 21;\n RCPDU_CONFERENCE_LOCK_INDICATION = 22;\n RCPDU_CONFERENCE_UNLOCK_REQUEST = 30;\n RCPDU_CONFERENCE_UNLOCK_RESPONSE = 31;\n RCPDU_CONFERENCE_UNLOCK_INDICATION = 32;\n RCPDU_CONFERENCE_LEAVE_REQUEST = 39;\n RCPDU_CONFERENCE_TERMINATE_REQUEST = 40;\n RCPDU_CONFERENCE_TERMINATE_RESPONSE = 41;\n RCPDU_CONFERENCE_TERMINATE_INDICATION = 42;\n RCPDU_CONFERENCE_EJECT_USER_REQUEST = 50;\n RCPDU_CONFERENCE_EJECT_USER_RESPONSE = 51;\n RCPDU_CONFERENCE_EJECT_USER_INDICATION = 52;\n RCPDU_ROSTER_UPDATE_INDICATION = 60;\n RCPDU_REGISTRY_UPDATE_REQUEST = 70; // INCLUDE ALL OBJS OPERATION\n RCPDU_REGISTRY_UPDATE_RESPONSE = 71;\n RCPDU_REGISTRY_UPDATE_INDICATION = 72;\n RCPDU_FUNCTION_NOT_SUPPORTED_RESPONSE = 80;\n\n // MCS PDU\n RCPDU_SESSION_JOIN_REQUEST = 90;\n RCPDU_SESSION_JOIN_RESPONSE = 91;\n RCPDU_CHANNEL_GRAB_REQUEST = 100;\n RCPDU_CHANNEL_GRAB_RESPONSE = 101;\n RCPDU_CHANNEL_GRAB_INDICATION = 102;\n RCPDU_CHANNEL_JOIN_REQUEST = 103;\n RCPDU_CHANNEL_JOIN_RESPONSE = 104;\n RCPDU_CHANNEL_LEAVE_REQUEST = 105;\n RCPDU_CHANNEL_RELEASE_REQUEST = 106;\n RCPDU_CHANNEL_RELEASE_INDICATION = 107;\n RCPDU_SEND_DATA_REQUEST = 120;\n RCPDU_SEND_DATA_INDICATION = 121;\n RCPDU_UNIFORM_SEND_DATA_REQUEST = 125;\n RCPDU_UNIFORM_SEND_DATA_INDICATION = 126;\n RCPDU_TOKEN_GRAB_REQUEST = 130;\n RCPDU_TOKEN_GRAB_CONFIRM = 131;\n RCPDU_TOKEN_INHIBIT_REQUEST = 132;\n RCPDU_TOKEN_INHIBIT_CONFIRM = 133;\n RCPDU_TOKEN_GIVE_REQUEST = 134;\n RCPDU_TOKEN_GIVE_INDICATION = 135;\n RCPDU_TOKEN_GIVE_RESPONSE = 136;\n RCPDU_TOKEN_GIVE_CONFIRM = 137;\n RCPDU_TOKEN_PLEASE_REQUEST = 138;\n RCPDU_TOKEN_PLEASE_INDICATION = 139;\n RCPDU_TOKEN_RELEASE_REQUEST = 140;\n RCPDU_TOKEN_RELEASE_CONFIRM = 141;\n RCPDU_TOKEN_TEST_REQUEST = 142;\n RCPDU_TOKEN_TEST_CONFIRM = 143;\n\n // Registry PDU\n RCPDU_REG_REGISTER_KEY = 200;\n RCPDU_REG_UNREGISTER_KEY = 201;\n RCPDU_REG_REGISTER_ROSTER = 202;\n RCPDU_REG_REGISTER_TOKEN = 203;\n RCPDU_REG_REGISTER_PARAMETER = 204;\n RCPDU_REG_REGISTER_COUNTER = 205;\n RCPDU_REG_REGISTER_TABLE = 206;\n RCPDU_REG_REGISTER_CACHE = 207;\n RCPDU_REG_REGISTER_OBJ = 208;\n RCPDU_REG_UNREGISTER_OBJ = 209;\n RCPDU_REG_UPDATE_OBJ = 210;\n RCPDU_REG_ADAPTER = 211;\n RCPDU_REG_CLEANUP_NODE = 212;\n RCPDU_REG_REGISTER_QUEUE = 213;\n\n // Registry Obj update PDU\n RCPDU_REG_TABLE_INSERT_PDU = 230;\n RCPDU_REG_TABLE_DELETE_PDU = 231;\n RCPDU_REG_TABLE_UPDATE_PDU = 232;\n RCPDU_REG_ROSTER_INSERT_PDU = 240;\n RCPDU_REG_ROSTER_DELETE_PDU = 241;\n RCPDU_REG_ROSTER_UPDATE_PDU = 242;\n RCPDU_REG_PARAMETER_UPDATE_PDU = 250;\n RCPDU_REG_QUEUE_INSERT_PDU = 255;\n RCPDU_REG_QUEUE_DELETE_PDU = 256;\n RCPDU_REG_QUEUE_UPDATE_PDU = 257;\n\n // data\n RCPDU_CONFERENCE_SEND_DATA_REQUEST = 259;\n RCPDU_VIDEO_SEND_DATA_REQUEST = 260;\n RCPDU_AUDIO_SEND_DATA_REQUEST = 261;\n RCPDU_GIFT_SEND_DATA_REQUEST = 262;\n RCPDU_CHAT_SEND_DATA_REQUEST = 263;\n RCPDU_VOTING_POLL_RECORD = 265;\n\n // Registry resource request or response PDU\n RCPDU_REG_REQUEST_OBJ = 290;\n RCPDU_REG_RESPONSE_OBJ = 291;\n RCPDU_REG_COUNTER_REQUEST_PDU = 292;\n RCPDU_REG_COUNTER_RESPONSE_PDU = 293;\n\n // Index exchange\n RCPDU_INDEX_ADAPTER = 300;\n RCPDU_INDEX_SERVER_USERS = 301;\n RCPDU_INDEX_CONFERENCE_USER_JOINED = 302;\n RCPDU_INDEX_CONFERENCE_USER_EXITED = 303;\n RCPDU_INDEX_CONFERENCE_USERS = 304;\n}\n\nenum RCPduNodeType_E {\n NT_TERMINAL = 0;\n NT_MULTIPORT_TERMINAL = 1;\n NT_MCU = 2;\n}\n\nenum RCPduReason_E {\n RSN_USERINITIATED = 0;\n RSN_DISCONNECTED = 1;\n RSN_SUPER_LEFT = 2;\n}\n\nenum RCPduResult_E {\n RET_SUCCESS = 0;\n RET_USER_REJECTED = 1;\n RET_INVALID_CONFERENCE = 2;\n RET_INVALID_PASSWORD = 3;\n RET_INVALID_CONVENER_PASSWORD = 4;\n RET_CHALLENGE_RESPONSE_REQUIRED = 5;\n RET_INVALID_CHALLENGE_RESPONSE = 6;\n RET_NO_CONNECTION = 7;\n RET_FULL_CAPACITY = 8;\n}\n\nenum RCPduNodeCategory_E {\n NC_CONVENTIONAL = 0;\n NC_COUNTED = 1;\n NC_ANONYMOUS = 2;\n}\n\nmessage RCConferenceDescriptorPdu {\n required uint32 id = 1;\n required bytes name = 2;\n optional bytes description = 3;\n //optional string net_address = 4;\n optional uint32 mode = 4;\n optional string password = 5;\n optional uint32 capacity = 6;\n optional bytes user_data = 7;\n}\n\nmessage RCNodeRecordPdu {\n required uint32 id = 1;\n optional uint32 superior_node = 2;\n required RCPduNodeType_E type = 3;\n required string name = 4;\n required uint32 capability = 5;\n optional string net_address = 6;\n optional RCPduNodeCategory_E category = 7;\n}\n\nmessage RCApplicationRecordPdu {\n required uint32 id = 1; // session id\n required string name = 2;\n required string tag = 3;\n repeated uint32 channel_ids = 4 [packed = true];\n optional uint32 capability = 5;\n}\n\n//reg.proto\n\noption optimize_for = LITE_RUNTIME;\nmessage RCRegistryRegisterKeyPdu {\n required RCPduType_E type = 1 [default = RCPDU_REG_REGISTER_KEY];\n required uint32 id = 2;\n required string name = 3;\n required string tag = 4;\n optional bytes user_data = 5;\n}\n\nmessage RCRegistryUnregisterKeyPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_UNREGISTER_KEY];\n required uint32 key_id = 2;\n}\n\nmessage RCRegistryRegisterObjPdu {\n optional RCPduType_E type = 1;\n required uint32 obj_id = 2;\n required string name = 3;\n required string tag = 4;\n optional uint32 owner = 5;\n optional bytes user_data = 6;\n}\n\nmessage RCRegistryUnregisterObjPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_UNREGISTER_OBJ];\n required uint32 obj_id = 2;\n}\n\nmessage RCRegistryUpdateObjPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_UPDATE_OBJ];\n required RCPduType_E sub_type = 2;\n required uint32 obj_id = 3;\n required bytes user_data = 4;\n}\n\nmessage RCAdapterItemPdu {\n required RCPduType_E type = 1;\n required bytes item_data = 2;\n}\n\n// adapter pdu that used to package a list of pdu.\nmessage RCAdapterPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_ADAPTER];\n repeated RCAdapterItemPdu item = 2;\n}\n\n// table operation pdu\nmessage RCRegistryTableItemPdu {\n required uint32 item_idx = 1;\n required uint32 owner = 2;\n required bytes item_data = 3;\n optional uint32 register_obj_id=4;\n}\n\nmessage RCRegistryTableInsertItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_INSERT_PDU];\n repeated RCRegistryTableItemPdu items = 2;\n}\n\nmessage RCRegistryTableDeleteItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_DELETE_PDU];\n repeated uint32 item_idx = 2;\n}\n\nmessage RCRegistryTableUpdateItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_UPDATE_PDU];\n repeated RCRegistryTableItemPdu items = 2;\n}\n\n// roster operation pdu\nmessage RCRegistryRosterItemPdu {\n required uint32 node_id = 1;\n required bytes node_data = 2;\n}\nmessage RCRegistryWBItemPdu {\n required uint32 node_id = 1;\n required bytes node_data = 2;\n}\nmessage RCRegistryRosterInsertItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_ROSTER_INSERT_PDU];\n repeated RCRegistryRosterItemPdu items = 2;\n}\n\nmessage RCRegistryRosterDeleteItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_ROSTER_DELETE_PDU];\n required uint32 node_id = 2;\n}\n\nmessage RCRegistryRosterUpdateItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_ROSTER_UPDATE_PDU];\n repeated RCRegistryRosterItemPdu items = 2;\n}\n\n//message RCCleanupNodePdu\n//{\n// optional RCPduType_E type = 1 [default = RCPDU_REG_CLEANUP_NODE];\n// required uint32 node_id = 2;\n//}\n\n// parameter operation pdu\nmessage RCRegistryParameterUpdatePdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_PARAMETER_UPDATE_PDU];\n required uint32 value = 2 [default = 0];\n optional uint32 begin_bit = 3 [default = 31];\n optional uint32 end_bit = 4;\n}\n\n// queue operation pdu\nmessage RCRegistryQueueItemPdu {\n required uint32 owner = 1;\n required uint32 item_id = 2;\n optional bytes item_data = 3;\n optional uint32 item_idx = 4;\n}\n\nmessage RCRegstryQueueInsertItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_QUEUE_INSERT_PDU];\n repeated RCRegistryQueueItemPdu items = 2;\n}\n\nmessage RCRegistryQueueDeleteItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_QUEUE_DELETE_PDU];\n required uint32 item_id = 2;\n}\n\nmessage RCRegistryQueueUpdateItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_QUEUE_UPDATE_PDU];\n repeated RCRegistryQueueItemPdu items = 2;\n}\n\nmessage RCRegistryRequestObjPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_REQUEST_OBJ];\n required RCPduType_E sub_type = 2;\n required uint32 obj_id = 3;\n required bytes user_data = 4;\n}\n\nmessage RCRegistryResponseObjPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_RESPONSE_OBJ];\n required RCPduType_E sub_type = 2;\n required uint32 obj_id = 3;\n required bytes user_data = 4;\n}\n\nmessage RCRegistryCounterRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_COUNTER_REQUEST_PDU];\n required uint32 count = 2;\n}\n\nmessage RCRegistryCounterResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_COUNTER_RESPONSE_PDU];\n required uint32 start = 2;\n required uint32 end = 3;\n}\n\n// mcs\noption optimize_for = LITE_RUNTIME;\n\n// Session management\nmessage RCSessionJoinRequestPdu {\n required RCPduType_E type = 1 [default = RCPDU_SESSION_JOIN_REQUEST];\n required uint32 id = 2;\n required string name = 3;\n required string tag = 4;\n optional bytes session_data = 5; //\u805A\u5408\u5728\u4E00\u8D77\u7684registry\u4FE1\u606F\n}\n\nmessage RCSessionJoinResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_SESSION_JOIN_RESPONSE];\n required uint32 id = 2;\n optional bytes response_data = 3;\n}\n\n// Channel management\nmessage RCChannelGrabRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CHANNEL_GRAB_REQUEST];\n required uint32 initiator = 2;\n required uint32 channel_id = 3;\n}\n\nmessage RCChannelGrabResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_CHANNEL_GRAB_RESPONSE];\n required uint32 initiator = 2;\n required uint32 requested_channel_id = 3;\n required RCPduResult_E result = 4;\n optional uint32 channel_id = 5;\n}\n\nmessage RCChannelGrabIndicationPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CHANNEL_GRAB_INDICATION];\n required uint32 initiator = 2;\n optional uint32 channel_id = 3;\n}\n\nmessage RCChannelJoinRequestPdu {\n required RCPduType_E type = 1 [default = RCPDU_CHANNEL_JOIN_REQUEST];\n required uint32 initiator = 2;\n required uint32 channel_id = 3;\n}\n\nmessage RCChannelJoinResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_CHANNEL_JOIN_RESPONSE];\n required uint32 initiator = 2;\n required uint32 requested_channel_id = 3;\n required RCPduResult_E result = 4;\n}\n\nmessage RCChannelLeaveRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CHANNEL_LEAVE_REQUEST];\n required uint32 initiator = 2;\n repeated uint32 channel_ids = 3 [packed = true];\n}\n\nmessage RCChannelReleaseRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CHANNEL_RELEASE_REQUEST];\n required uint32 initiator = 2;\n required uint32 channel_id = 3;\n}\n\nmessage RCChannelReleaseIndicationPdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CHANNEL_RELEASE_INDICATION];\n required uint32 initiator = 2;\n required uint32 channel_id = 3;\n}\n\n// Data transfer\nmessage RCSendDataPdu {\n required RCPduType_E type = 1 [default = RCPDU_SEND_DATA_REQUEST];\n required RCPduType_E sub_type = 2;\n required uint32 initiator = 3;\n required uint32 conf_id = 4;\n required uint32 session_id = 5;\n required uint32 channel_id = 6;\n required bool upward = 7;\n required bool reliability = 8;\n required RCPduPriority_E priority = 9;\n required bytes data = 10;\n optional uint32 peer = 11;\n optional RCPduSegment_E seg = 12;\n optional uint32 total_size = 13;\n optional uint32 site_id = 14;\n optional string user_id = 15;\n optional string user_name = 16;\n optional string user_role = 17;\n optional string device_type = 18;\n optional string site = 19;\n}\n\n// Token management\nmessage RCTokenGrabRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_GRAB_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n}\n\nmessage RCTokenGrabConfirmPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_GRAB_CONFIRM];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n required RCPduResult_E result = 4;\n required RCPduTokenStatus_E status = 5;\n}\n\nmessage RCTokenInhibitRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_INHIBIT_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n}\n\nmessage RCTokenInhibitConfirmPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_INHIBIT_CONFIRM];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n required RCPduResult_E result = 4;\n required RCPduTokenStatus_E status = 5;\n}\n\nmessage RCTokenGiveRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_GIVE_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n required uint64 recipient = 4;\n}\n\nmessage RCTokenGiveIndicationPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_GIVE_INDICATION];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n required uint64 recipient = 4;\n}\n\nmessage RCTokenGiveResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_GIVE_RESPONSE];\n required uint32 token_id = 2;\n required uint64 recipient = 3;\n required RCPduResult_E result = 4;\n}\n\nmessage RCTokenGiveConfirmPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_GIVE_CONFIRM];\n required uint32 token_id = 2;\n required uint64 recipient = 3;\n required RCPduResult_E result = 4;\n required RCPduTokenStatus_E status = 5;\n}\n\nmessage RCTokenPleaseRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_PLEASE_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n}\n\nmessage RCTokenPleaseIndicationPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_PLEASE_INDICATION];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n}\n\nmessage RCTokenReleaseRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_RELEASE_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n}\n\nmessage RCTokenReleaseConfirmPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_TEST_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n required RCPduResult_E result = 4;\n required RCPduTokenStatus_E status = 5;\n}\n\nmessage RCTokenTestRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_TEST_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n}\n\nmessage RCTokenTestConfirmPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_TEST_CONFIRM];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n required RCPduTokenStatus_E status = 4;\n}\n\n//gcc.proto\n\noption optimize_for = LITE_RUNTIME;\nmessage RCConferenceJoinRequestPdu {\n required RCPduType_E type = 1 [default = RCPDU_CONFERENCE_JOIN_REQUEST];\n required uint32 initiator = 2;\n required RCPduNodeType_E node_type = 3;\n required RCConferenceDescriptorPdu conf_desc = 4;\n}\n\nmessage RCConferenceJoinResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_CONFERENCE_JOIN_RESPONSE];\n required uint32 conf_id = 2;\n required RCPduResult_E result = 3;\n optional RCConferenceDescriptorPdu conf_desc = 4;\n}\n\nmessage RCConferenceInviteRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CONFERENCE_INVITE_REQUEST];\n required uint32 initiator = 2;\n required RCConferenceDescriptorPdu conf_desc = 3;\n}\n\nmessage RCConferenceInviteResponsePdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_INVITE_RESPONSE];\n required RCPduResult_E result = 2;\n optional bytes user_data = 3;\n}\n\nmessage RCConferenceLockRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CONFERENCE_LOCK_REQUEST];\n}\n\nmessage RCConferenceLockResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_CONFERENCE_LOCK_RESPONSE];\n required RCPduResult_E result = 2;\n}\n\nmessage RCConferenceLockIndicationPdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_LOCK_INDICATION];\n}\n\nmessage RCConferenceUnlockRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CONFERENCE_UNLOCK_REQUEST];\n}\n\nmessage RCConferenceUnlockResponsePdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_UNLOCK_RESPONSE];\n required RCPduResult_E result = 2;\n}\n\nmessage RCConferenceUnlockIndicationPdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_UNLOCK_INDICATION];\n}\n\nmessage RCConferenceLeaveRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CONFERENCE_LEAVE_REQUEST];\n required RCPduReason_E reason = 2;\n}\n\nmessage RCConferenceTerminateRequestPdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_TERMINATE_REQUEST];\n required RCPduReason_E reason = 2;\n}\n\nmessage RCConferenceTerminateResponsePdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_TERMINATE_RESPONSE];\n required RCPduResult_E result = 2;\n}\n\nmessage RCConferenceTerminateIndicationPdu { // MCS_Uniform_Send_Data on GCC_Broadcast_Channel\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_TERMINATE_INDICATION];\n required RCPduReason_E reason = 2;\n}\n\nmessage RCConferenceEjectUserRequestPdu { // MCS_Send_Data on Node ID Channel of Top GCC\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_EJECT_USER_REQUEST];\n required uint32 ejected_node_id = 2;\n required RCPduReason_E reason = 3;\n}\n\nmessage RCConferenceEjectUserResponsePdu { // MCS_Send_Data on Node ID Channel of requester\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_EJECT_USER_RESPONSE];\n required uint32 ejected_node_id = 2;\n required RCPduResult_E result = 3;\n}\n\nmessage RCConferenceEjectUserIndicationPdu { // MCS_Uniform_Send_Data on GCC_Broadcast_Channel\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_EJECT_USER_INDICATION];\n required uint32 ejected_node_id = 2;\n required RCPduReason_E reason = 3;\n}\n\nmessage RCRosterUpdateIndicationPdu { // MCS_Send_Data on Node ID Channel or\n// MCS_Uniform_Send_Data on GCC_Broadcast_Channel\n optional RCPduType_E type = 1 [default = RCPDU_ROSTER_UPDATE_INDICATION];\n required bool full_refresh = 2; // Conference Roster and all\n repeated RCNodeRecordPdu node_record = 3;\n repeated RCApplicationRecordPdu app_record = 4;\n}\n\nmessage RCRegistryUpdateRequestPdu { // MCS_Send_Data on Node ID Channel of Top GCC\n optional RCPduType_E type = 1 [default = RCPDU_REGISTRY_UPDATE_REQUEST];\n required uint32 key_id = 2;\n required uint32 obj_id = 3;\n required bytes user_data = 4;\n}\n\nmessage RCRegistryUpdateIndicationPdu { // MCS_Send_Data on Node ID Channel of Top GCC\n optional RCPduType_E type = 1 [default = RCPDU_REGISTRY_UPDATE_RESPONSE];\n required uint32 key_id = 2;\n required uint32 obj_id = 3;\n required bytes user_data = 4;\n}\n\nmessage RCRegistryUpdateResponsePdu { // MCS_Send_Data on Node ID Channel of requester\n optional RCPduType_E type = 1 [default = RCPDU_REGISTRY_UPDATE_INDICATION];\n required uint32 key_id = 2;\n required uint32 obj_id = 3;\n required RCPduResult_E result = 4;\n}\n\nmessage RCFunctionNotSupportedResponsePdu {\n optional RCPduType_E type = 1\n [default = RCPDU_FUNCTION_NOT_SUPPORTED_RESPONSE];\n required uint32 request_pdu_id = 2;\n}\n\n//ape.proto\n\noption optimize_for = LITE_RUNTIME;\nmessage RCConferenceSendDataRequestPdu {\n optional uint32 initiator = 1;\n optional uint32 peer = 2;\n required bool is_public = 3;\n required bytes user_data = 4;\n}\n\nmessage RCChatSendDataRequestPdu {\n optional uint32 initiator = 1;\n optional uint32 peer = 2;\n required bool is_public = 3;\n required bytes user_data = 4;\n required uint32 from_role = 5;\n required bytes from_name = 6;\n}\n\nmessage RCDocSendDataRequestPdu {\n required int32 id = 1;\n required string doc_type = 2;\n required string uri = 3;\n optional int32 owner = 4;\n optional int32 from = 5;\n optional string name = 6;\n optional int32 cur_page_no = 7;\n optional int32 cur_H = 8;\n optional int32 cur_V = 9;\n optional int32 scale = 10;\n optional int32 page_num = 11;\n}\n\nmessage RCGiftSendDataRequestPdu {\n optional uint32 initiator = 1;\n required uint32 peer = 2;\n required uint32 index = 3;\n required uint32 num = 4;\n optional bytes user_data = 5;\n}\n\nmessage RCAudioSendDataRequestPdu {\n optional uint32 initiator = 1;\n required bytes user_data = 2;\n}\n\nmessage RCVideoSendDataRequestPdu {\n optional uint32 initiator = 1;\n required bool key_frame = 2;\n required uint32 sequence_id = 3;\n required uint32 slice_id = 4;\n required bytes user_data = 5;\n}\n\nmessage RCAudioChannelInfoRecordPdu {\n required uint32 status = 1;\n required uint32 device_id = 2;\n required uint32 framerate = 3;\n required uint32 bitrate = 4;\n required uint32 codec = 5;\n}\n\nmessage RCVideoChannelInfoRecordPdu {\n optional uint32 status = 1;\n optional uint32 device_id = 2;\n optional uint32 width = 3;\n optional uint32 height = 4;\n optional uint32 framerate = 5;\n optional uint32 bitrate = 6;\n optional uint32 codec = 7;\n optional string peer_id = 8;\n optional string url = 9;\n optional uint32 type = 10;\n optional string shamlive = 11;\n optional uint32 livetype = 12;\n optional uint32 releaseGrab = 13;\n optional string curTime = 14;\n}\n\nmessage RCAudioDeviceInfoRecordPdu {\n required uint32 device_id = 1;\n required string device_name = 2;\n}\n\nmessage RCVideoDeviceInfoRecordPdu {\n required uint32 device_id = 1;\n required string device_name = 2;\n}\n\nmessage RCNodeInfoRecordPdu {\n required uint32 node_id = 1;\n required string name = 2;\n required uint32 role = 3;\n required uint32 level = 4;\n repeated RCAudioDeviceInfoRecordPdu audio_records = 5;\n repeated RCVideoDeviceInfoRecordPdu video_records = 6;\n optional uint32 status = 7;\n optional bytes user_data = 8;\n optional string user_id = 9;\n optional uint32 handUpTime = 10;\n optional uint32 deviceType = 11;\n optional uint32 mobileDirection = 12;\n}\n\nmessage RCVotingPollSettingsPdu {\n required bool timer = 1;\n optional uint32 time_limit = 2;\n optional uint32 total_score = 3;\n}\n\nmessage RCVotingPollResultPdu {\n required string title = 1;\n required string content = 2;\n optional uint32 score = 3;\n}\n\nmessage RCVotingPollQuestionPdu {\n required uint32 index = 1;\n required uint32 type = 2;\n required string title = 3;\n repeated string options = 4;\n optional uint32 score = 5;\n optional uint32 time_limit = 6;\n optional string restrict_input = 7;\n optional uint32 char_limit = 8;\n optional string answer = 9;\n repeated uint32 selections = 10;\n repeated string responses = 11;\n}\n\nmessage RCVotingPollRecordPdu {\n required RCVotingPollSettingsPdu settings = 1;\n required string title = 2;\n repeated RCVotingPollResultPdu results = 3;\n repeated RCVotingPollQuestionPdu questions = 4;\n}\n\nmessage RCNodeInfoUserDataPdu {\n optional string qq = 1;\n optional string skype = 2;\n optional string mobile = 3;\n}\nmessage RCTabUpdateDataRequestPdu {\n optional uint32 id = 1;\n optional bytes action = 2;\n optional uint32 uncomprLen =3;\n}\n\nmessage RCWhiteBoardDataModel {\n required uint32 type= 1;//\u767D\u677F\u7C7B\u578B\n required uint32 itemIdx= 2;//itemIdx \u6BCF\u4E00\u6B21\u7ED8\u5236\u7684\u552F\u4E00\u6807\u8BC6\n required uint32 initiator=3; //\u7ED8\u5236\u6765\u81EA\u8C01\n required uint32 parentId=4; //\u7236\u7EA7\u7684id\n optional string pointGroup=5; //\u5750\u6807\u70B9\u96C6\u6570\u7EC4\u7684JSON\u5B57\u7B26\u4E32\n optional string color=6 [default = \"#000000\"]; //\u989C\u8272\n optional uint32 thickness= 7 ;//\u7EBF\u6761\u7C97\u7EC6\n optional uint32 radius= 8;//\u56ED\u7684\u534A\u5F84\n optional uint32 fontSize= 9;//\u5B57\u4F53\u5927\u5C0F\n optional string fontName= 10;//\u5B57\u4F53\u540D\u79F0\n optional string text= 11;//\u6587\u672C\u5185\u5BB9\n}\n\n\n//end\n"; | 13463 | + var _default = "\n//start\n// pdu_def.proto\n\n// syntax = \"proto3\";\n\noption optimize_for = LITE_RUNTIME;\nenum RCPduPriority_E {\n DP_TOP = 0;\n DP_HIGH = 1;\n DP_MEDIUM = 2;\n DP_LOW = 3;\n}\n\nenum RCPduSegment_E {\n SEG_BEGIN = 0;\n SEG_END = 1;\n SEG_ONCE = 2;\n}\n\nenum RCPduTokenStatus_E {\n TS_NOT_IN_USE = 0;\n TS_SELF_GRABBED = 1;\n TS_OTHER_GRABBED = 2;\n TS_SELF_INHIBITED = 3;\n TS_OTHER_INHIBITED = 4;\n TS_SELF_RECIPIENT = 5;\n TS_SELF_GIVING = 6;\n TS_OTHER_GIVING = 7;\n}\n\nenum RCPduType_E {\n// GCC PDU\n RCPDU_CONNECT_PROVIDER_REQUEST = 0;\n RCPDU_CONNECT_PROVIDER_RESPONSE = 1;\n RCPDU_CONFERENCE_JOIN_REQUEST = 2;\n RCPDU_CONFERENCE_JOIN_RESPONSE = 3;\n RCPDU_CONFERENCE_INVITE_REQUEST = 10;\n RCPDU_CONFERENCE_INVITE_RESPONSE = 11;\n RCPDU_CONFERENCE_LOCK_REQUEST = 20;\n RCPDU_CONFERENCE_LOCK_RESPONSE = 21;\n RCPDU_CONFERENCE_LOCK_INDICATION = 22;\n RCPDU_CONFERENCE_UNLOCK_REQUEST = 30;\n RCPDU_CONFERENCE_UNLOCK_RESPONSE = 31;\n RCPDU_CONFERENCE_UNLOCK_INDICATION = 32;\n RCPDU_CONFERENCE_LEAVE_REQUEST = 39;\n RCPDU_CONFERENCE_TERMINATE_REQUEST = 40;\n RCPDU_CONFERENCE_TERMINATE_RESPONSE = 41;\n RCPDU_CONFERENCE_TERMINATE_INDICATION = 42;\n RCPDU_CONFERENCE_EJECT_USER_REQUEST = 50;\n RCPDU_CONFERENCE_EJECT_USER_RESPONSE = 51;\n RCPDU_CONFERENCE_EJECT_USER_INDICATION = 52;\n RCPDU_ROSTER_UPDATE_INDICATION = 60;\n RCPDU_REGISTRY_UPDATE_REQUEST = 70; // INCLUDE ALL OBJS OPERATION\n RCPDU_REGISTRY_UPDATE_RESPONSE = 71;\n RCPDU_REGISTRY_UPDATE_INDICATION = 72;\n RCPDU_FUNCTION_NOT_SUPPORTED_RESPONSE = 80;\n\n // MCS PDU\n RCPDU_SESSION_JOIN_REQUEST = 90;\n RCPDU_SESSION_JOIN_RESPONSE = 91;\n RCPDU_CHANNEL_GRAB_REQUEST = 100;\n RCPDU_CHANNEL_GRAB_RESPONSE = 101;\n RCPDU_CHANNEL_GRAB_INDICATION = 102;\n RCPDU_CHANNEL_JOIN_REQUEST = 103;\n RCPDU_CHANNEL_JOIN_RESPONSE = 104;\n RCPDU_CHANNEL_LEAVE_REQUEST = 105;\n RCPDU_CHANNEL_RELEASE_REQUEST = 106;\n RCPDU_CHANNEL_RELEASE_INDICATION = 107;\n RCPDU_SEND_DATA_REQUEST = 120;\n RCPDU_SEND_DATA_INDICATION = 121;\n RCPDU_UNIFORM_SEND_DATA_REQUEST = 125;\n RCPDU_UNIFORM_SEND_DATA_INDICATION = 126;\n RCPDU_TOKEN_GRAB_REQUEST = 130;\n RCPDU_TOKEN_GRAB_CONFIRM = 131;\n RCPDU_TOKEN_INHIBIT_REQUEST = 132;\n RCPDU_TOKEN_INHIBIT_CONFIRM = 133;\n RCPDU_TOKEN_GIVE_REQUEST = 134;\n RCPDU_TOKEN_GIVE_INDICATION = 135;\n RCPDU_TOKEN_GIVE_RESPONSE = 136;\n RCPDU_TOKEN_GIVE_CONFIRM = 137;\n RCPDU_TOKEN_PLEASE_REQUEST = 138;\n RCPDU_TOKEN_PLEASE_INDICATION = 139;\n RCPDU_TOKEN_RELEASE_REQUEST = 140;\n RCPDU_TOKEN_RELEASE_CONFIRM = 141;\n RCPDU_TOKEN_TEST_REQUEST = 142;\n RCPDU_TOKEN_TEST_CONFIRM = 143;\n\n // Registry PDU\n RCPDU_REG_REGISTER_KEY = 200;\n RCPDU_REG_UNREGISTER_KEY = 201;\n RCPDU_REG_REGISTER_ROSTER = 202;\n RCPDU_REG_REGISTER_TOKEN = 203;\n RCPDU_REG_REGISTER_PARAMETER = 204;\n RCPDU_REG_REGISTER_COUNTER = 205;\n RCPDU_REG_REGISTER_TABLE = 206;\n RCPDU_REG_REGISTER_CACHE = 207;\n RCPDU_REG_REGISTER_OBJ = 208;\n RCPDU_REG_UNREGISTER_OBJ = 209;\n RCPDU_REG_UPDATE_OBJ = 210;\n RCPDU_REG_ADAPTER = 211;\n RCPDU_REG_CLEANUP_NODE = 212;\n RCPDU_REG_REGISTER_QUEUE = 213;\n\n // Registry Obj update PDU\n RCPDU_REG_TABLE_INSERT_PDU = 230;\n RCPDU_REG_TABLE_DELETE_PDU = 231;\n RCPDU_REG_TABLE_UPDATE_PDU = 232;\n RCPDU_REG_ROSTER_INSERT_PDU = 240;\n RCPDU_REG_ROSTER_DELETE_PDU = 241;\n RCPDU_REG_ROSTER_UPDATE_PDU = 242;\n RCPDU_REG_PARAMETER_UPDATE_PDU = 250;\n RCPDU_REG_QUEUE_INSERT_PDU = 255;\n RCPDU_REG_QUEUE_DELETE_PDU = 256;\n RCPDU_REG_QUEUE_UPDATE_PDU = 257;\n\n // data\n RCPDU_CONFERENCE_SEND_DATA_REQUEST = 259;\n RCPDU_VIDEO_SEND_DATA_REQUEST = 260;\n RCPDU_AUDIO_SEND_DATA_REQUEST = 261;\n RCPDU_GIFT_SEND_DATA_REQUEST = 262;\n RCPDU_CHAT_SEND_DATA_REQUEST = 263;\n RCPDU_VOTING_POLL_RECORD = 265;\n\n // Registry resource request or response PDU\n RCPDU_REG_REQUEST_OBJ = 290;\n RCPDU_REG_RESPONSE_OBJ = 291;\n RCPDU_REG_COUNTER_REQUEST_PDU = 292;\n RCPDU_REG_COUNTER_RESPONSE_PDU = 293;\n\n // Index exchange\n RCPDU_INDEX_ADAPTER = 300;\n RCPDU_INDEX_SERVER_USERS = 301;\n RCPDU_INDEX_CONFERENCE_USER_JOINED = 302;\n RCPDU_INDEX_CONFERENCE_USER_EXITED = 303;\n RCPDU_INDEX_CONFERENCE_USERS = 304;\n}\n\nenum RCPduNodeType_E {\n NT_TERMINAL = 0;\n NT_MULTIPORT_TERMINAL = 1;\n NT_MCU = 2;\n}\n\nenum RCPduReason_E {\n RSN_USERINITIATED = 0;\n RSN_DISCONNECTED = 1;\n RSN_SUPER_LEFT = 2;\n}\n\nenum RCPduResult_E {\n RET_SUCCESS = 0;\n RET_USER_REJECTED = 1;\n RET_INVALID_CONFERENCE = 2;\n RET_INVALID_PASSWORD = 3;\n RET_INVALID_CONVENER_PASSWORD = 4;\n RET_CHALLENGE_RESPONSE_REQUIRED = 5;\n RET_INVALID_CHALLENGE_RESPONSE = 6;\n RET_NO_CONNECTION = 7;\n RET_FULL_CAPACITY = 8;\n}\n\nenum RCPduNodeCategory_E {\n NC_CONVENTIONAL = 0;\n NC_COUNTED = 1;\n NC_ANONYMOUS = 2;\n}\n\nmessage RCConferenceDescriptorPdu {\n required uint32 id = 1;\n required bytes name = 2;\n optional bytes description = 3;\n //optional string net_address = 4;\n optional uint32 mode = 4;\n optional string password = 5;\n optional uint32 capacity = 6;\n optional bytes user_data = 7;\n}\n\nmessage RCNodeRecordPdu {\n required uint32 id = 1;\n optional uint32 superior_node = 2;\n required RCPduNodeType_E type = 3;\n required string name = 4;\n required uint32 capability = 5;\n optional string net_address = 6;\n optional RCPduNodeCategory_E category = 7;\n}\n\nmessage RCApplicationRecordPdu {\n required uint32 id = 1; // session id\n required string name = 2;\n required string tag = 3;\n repeated uint32 channel_ids = 4 [packed = true];\n optional uint32 capability = 5;\n}\n\n//reg.proto\n\noption optimize_for = LITE_RUNTIME;\nmessage RCRegistryRegisterKeyPdu {\n required RCPduType_E type = 1 [default = RCPDU_REG_REGISTER_KEY];\n required uint32 id = 2;\n required string name = 3;\n required string tag = 4;\n optional bytes user_data = 5;\n}\n\nmessage RCRegistryUnregisterKeyPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_UNREGISTER_KEY];\n required uint32 key_id = 2;\n}\n\nmessage RCRegistryRegisterObjPdu {\n optional RCPduType_E type = 1;\n required uint32 obj_id = 2;\n required string name = 3;\n required string tag = 4;\n optional uint32 owner = 5;\n optional bytes user_data = 6;\n}\n\nmessage RCRegistryUnregisterObjPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_UNREGISTER_OBJ];\n required uint32 obj_id = 2;\n}\n\nmessage RCRegistryUpdateObjPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_UPDATE_OBJ];\n required RCPduType_E sub_type = 2;\n required uint32 obj_id = 3;\n required bytes user_data = 4;\n}\n\nmessage RCAdapterItemPdu {\n required RCPduType_E type = 1;\n required bytes item_data = 2;\n}\n\n// adapter pdu that used to package a list of pdu.\nmessage RCAdapterPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_ADAPTER];\n repeated RCAdapterItemPdu item = 2;\n}\n\n// table operation pdu\nmessage RCRegistryTableItemPdu {\n required uint32 item_idx = 1;\n required uint32 owner = 2;\n required bytes item_data = 3;\n optional uint32 register_obj_id=4;\n}\n\nmessage RCRegistryTableInsertItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_INSERT_PDU];\n repeated RCRegistryTableItemPdu items = 2;\n}\n\nmessage RCRegistryTableDeleteItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_DELETE_PDU];\n repeated uint32 item_idx = 2;\n}\n\nmessage RCRegistryTableUpdateItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_UPDATE_PDU];\n repeated RCRegistryTableItemPdu items = 2;\n}\n\n// roster operation pdu\nmessage RCRegistryRosterItemPdu {\n required uint32 node_id = 1;\n required bytes node_data = 2;\n}\nmessage RCRegistryWBItemPdu {\n required uint32 node_id = 1;\n required bytes node_data = 2;\n}\nmessage RCRegistryRosterInsertItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_ROSTER_INSERT_PDU];\n repeated RCRegistryRosterItemPdu items = 2;\n}\n\nmessage RCRegistryRosterDeleteItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_ROSTER_DELETE_PDU];\n required uint32 node_id = 2;\n}\n\nmessage RCRegistryRosterUpdateItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_ROSTER_UPDATE_PDU];\n repeated RCRegistryRosterItemPdu items = 2;\n}\n\n//message RCCleanupNodePdu\n//{\n// optional RCPduType_E type = 1 [default = RCPDU_REG_CLEANUP_NODE];\n// required uint32 node_id = 2;\n//}\n\n// parameter operation pdu\nmessage RCRegistryParameterUpdatePdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_PARAMETER_UPDATE_PDU];\n required uint32 value = 2 [default = 0];\n optional uint32 begin_bit = 3 [default = 31];\n optional uint32 end_bit = 4;\n}\n\n// queue operation pdu\nmessage RCRegistryQueueItemPdu {\n required uint32 owner = 1;\n required uint32 item_id = 2;\n optional bytes item_data = 3;\n optional uint32 item_idx = 4;\n}\n\nmessage RCRegstryQueueInsertItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_QUEUE_INSERT_PDU];\n repeated RCRegistryQueueItemPdu items = 2;\n}\n\nmessage RCRegistryQueueDeleteItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_QUEUE_DELETE_PDU];\n required uint32 item_id = 2;\n}\n\nmessage RCRegistryQueueUpdateItemPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_QUEUE_UPDATE_PDU];\n repeated RCRegistryQueueItemPdu items = 2;\n}\n\nmessage RCRegistryRequestObjPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_REQUEST_OBJ];\n required RCPduType_E sub_type = 2;\n required uint32 obj_id = 3;\n required bytes user_data = 4;\n}\n\nmessage RCRegistryResponseObjPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_RESPONSE_OBJ];\n required RCPduType_E sub_type = 2;\n required uint32 obj_id = 3;\n required bytes user_data = 4;\n}\n\nmessage RCRegistryCounterRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_COUNTER_REQUEST_PDU];\n required uint32 count = 2;\n}\n\nmessage RCRegistryCounterResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_REG_COUNTER_RESPONSE_PDU];\n required uint32 start = 2;\n required uint32 end = 3;\n}\n\n// mcs\noption optimize_for = LITE_RUNTIME;\n\n// Session management\nmessage RCSessionJoinRequestPdu {\n required RCPduType_E type = 1 [default = RCPDU_SESSION_JOIN_REQUEST];\n required uint32 id = 2;\n required string name = 3;\n required string tag = 4;\n optional bytes session_data = 5; //\u805A\u5408\u5728\u4E00\u8D77\u7684registry\u4FE1\u606F\n}\n\nmessage RCSessionJoinResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_SESSION_JOIN_RESPONSE];\n required uint32 id = 2;\n optional bytes response_data = 3;\n}\n\n// Channel management\nmessage RCChannelGrabRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CHANNEL_GRAB_REQUEST];\n required uint32 initiator = 2;\n required uint32 channel_id = 3;\n}\n\nmessage RCChannelGrabResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_CHANNEL_GRAB_RESPONSE];\n required uint32 initiator = 2;\n required uint32 requested_channel_id = 3;\n required RCPduResult_E result = 4;\n optional uint32 channel_id = 5;\n}\n\nmessage RCChannelGrabIndicationPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CHANNEL_GRAB_INDICATION];\n required uint32 initiator = 2;\n optional uint32 channel_id = 3;\n}\n\nmessage RCChannelJoinRequestPdu {\n required RCPduType_E type = 1 [default = RCPDU_CHANNEL_JOIN_REQUEST];\n required uint32 initiator = 2;\n required uint32 channel_id = 3;\n}\n\nmessage RCChannelJoinResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_CHANNEL_JOIN_RESPONSE];\n required uint32 initiator = 2;\n required uint32 requested_channel_id = 3;\n required RCPduResult_E result = 4;\n}\n\nmessage RCChannelLeaveRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CHANNEL_LEAVE_REQUEST];\n required uint32 initiator = 2;\n repeated uint32 channel_ids = 3 [packed = true];\n}\n\nmessage RCChannelReleaseRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CHANNEL_RELEASE_REQUEST];\n required uint32 initiator = 2;\n required uint32 channel_id = 3;\n}\n\nmessage RCChannelReleaseIndicationPdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CHANNEL_RELEASE_INDICATION];\n required uint32 initiator = 2;\n required uint32 channel_id = 3;\n}\n\n// Data transfer\nmessage RCSendDataPdu {\n required RCPduType_E type = 1 [default = RCPDU_SEND_DATA_REQUEST];\n required RCPduType_E sub_type = 2;\n required uint32 initiator = 3;\n required uint32 conf_id = 4;\n required uint32 session_id = 5;\n required uint32 channel_id = 6;\n required bool upward = 7;\n required bool reliability = 8;\n required RCPduPriority_E priority = 9;\n required bytes data = 10;\n optional uint32 peer = 11;\n optional RCPduSegment_E seg = 12;\n optional uint32 total_size = 13;\n optional uint32 site_id = 14;\n optional string user_id = 15;\n optional string user_name = 16;\n optional string user_role = 17;\n optional string device_type = 18;\n optional string site = 19;\n}\n\n// Token management\nmessage RCTokenGrabRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_GRAB_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n}\n\nmessage RCTokenGrabConfirmPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_GRAB_CONFIRM];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n required RCPduResult_E result = 4;\n required RCPduTokenStatus_E status = 5;\n}\n\nmessage RCTokenInhibitRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_INHIBIT_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n}\n\nmessage RCTokenInhibitConfirmPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_INHIBIT_CONFIRM];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n required RCPduResult_E result = 4;\n required RCPduTokenStatus_E status = 5;\n}\n\nmessage RCTokenGiveRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_GIVE_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n required uint64 recipient = 4;\n}\n\nmessage RCTokenGiveIndicationPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_GIVE_INDICATION];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n required uint64 recipient = 4;\n}\n\nmessage RCTokenGiveResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_GIVE_RESPONSE];\n required uint32 token_id = 2;\n required uint64 recipient = 3;\n required RCPduResult_E result = 4;\n}\n\nmessage RCTokenGiveConfirmPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_GIVE_CONFIRM];\n required uint32 token_id = 2;\n required uint64 recipient = 3;\n required RCPduResult_E result = 4;\n required RCPduTokenStatus_E status = 5;\n}\n\nmessage RCTokenPleaseRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_PLEASE_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n}\n\nmessage RCTokenPleaseIndicationPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_PLEASE_INDICATION];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n}\n\nmessage RCTokenReleaseRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_RELEASE_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n}\n\nmessage RCTokenReleaseConfirmPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_TEST_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n required RCPduResult_E result = 4;\n required RCPduTokenStatus_E status = 5;\n}\n\nmessage RCTokenTestRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_TEST_REQUEST];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n}\n\nmessage RCTokenTestConfirmPdu {\n optional RCPduType_E type = 1 [default = RCPDU_TOKEN_TEST_CONFIRM];\n required uint32 initiator = 2;\n required uint32 token_id = 3;\n required RCPduTokenStatus_E status = 4;\n}\n\n//gcc.proto\n\noption optimize_for = LITE_RUNTIME;\nmessage RCConferenceJoinRequestPdu {\n required RCPduType_E type = 1 [default = RCPDU_CONFERENCE_JOIN_REQUEST];\n required uint32 initiator = 2;\n required RCPduNodeType_E node_type = 3;\n required RCConferenceDescriptorPdu conf_desc = 4;\n}\n\nmessage RCConferenceJoinResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_CONFERENCE_JOIN_RESPONSE];\n required uint32 conf_id = 2;\n required RCPduResult_E result = 3;\n optional RCConferenceDescriptorPdu conf_desc = 4;\n}\n\nmessage RCConferenceInviteRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CONFERENCE_INVITE_REQUEST];\n required uint32 initiator = 2;\n required RCConferenceDescriptorPdu conf_desc = 3;\n}\n\nmessage RCConferenceInviteResponsePdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_INVITE_RESPONSE];\n required RCPduResult_E result = 2;\n optional bytes user_data = 3;\n}\n\nmessage RCConferenceLockRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CONFERENCE_LOCK_REQUEST];\n}\n\nmessage RCConferenceLockResponsePdu {\n optional RCPduType_E type = 1 [default = RCPDU_CONFERENCE_LOCK_RESPONSE];\n required RCPduResult_E result = 2;\n}\n\nmessage RCConferenceLockIndicationPdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_LOCK_INDICATION];\n}\n\nmessage RCConferenceUnlockRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CONFERENCE_UNLOCK_REQUEST];\n}\n\nmessage RCConferenceUnlockResponsePdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_UNLOCK_RESPONSE];\n required RCPduResult_E result = 2;\n}\n\nmessage RCConferenceUnlockIndicationPdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_UNLOCK_INDICATION];\n}\n\nmessage RCConferenceLeaveRequestPdu {\n optional RCPduType_E type = 1 [default = RCPDU_CONFERENCE_LEAVE_REQUEST];\n required RCPduReason_E reason = 2;\n}\n\nmessage RCConferenceTerminateRequestPdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_TERMINATE_REQUEST];\n required RCPduReason_E reason = 2;\n}\n\nmessage RCConferenceTerminateResponsePdu {\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_TERMINATE_RESPONSE];\n required RCPduResult_E result = 2;\n}\n\nmessage RCConferenceTerminateIndicationPdu { // MCS_Uniform_Send_Data on GCC_Broadcast_Channel\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_TERMINATE_INDICATION];\n required RCPduReason_E reason = 2;\n}\n\nmessage RCConferenceEjectUserRequestPdu { // MCS_Send_Data on Node ID Channel of Top GCC\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_EJECT_USER_REQUEST];\n required uint32 ejected_node_id = 2;\n required RCPduReason_E reason = 3;\n}\n\nmessage RCConferenceEjectUserResponsePdu { // MCS_Send_Data on Node ID Channel of requester\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_EJECT_USER_RESPONSE];\n required uint32 ejected_node_id = 2;\n required RCPduResult_E result = 3;\n}\n\nmessage RCConferenceEjectUserIndicationPdu { // MCS_Uniform_Send_Data on GCC_Broadcast_Channel\n optional RCPduType_E type = 1\n [default = RCPDU_CONFERENCE_EJECT_USER_INDICATION];\n required uint32 ejected_node_id = 2;\n required RCPduReason_E reason = 3;\n}\n\nmessage RCRosterUpdateIndicationPdu { // MCS_Send_Data on Node ID Channel or\n// MCS_Uniform_Send_Data on GCC_Broadcast_Channel\n optional RCPduType_E type = 1 [default = RCPDU_ROSTER_UPDATE_INDICATION];\n required bool full_refresh = 2; // Conference Roster and all\n repeated RCNodeRecordPdu node_record = 3;\n repeated RCApplicationRecordPdu app_record = 4;\n}\n\nmessage RCRegistryUpdateRequestPdu { // MCS_Send_Data on Node ID Channel of Top GCC\n optional RCPduType_E type = 1 [default = RCPDU_REGISTRY_UPDATE_REQUEST];\n required uint32 key_id = 2;\n required uint32 obj_id = 3;\n required bytes user_data = 4;\n}\n\nmessage RCRegistryUpdateIndicationPdu { // MCS_Send_Data on Node ID Channel of Top GCC\n optional RCPduType_E type = 1 [default = RCPDU_REGISTRY_UPDATE_RESPONSE];\n required uint32 key_id = 2;\n required uint32 obj_id = 3;\n required bytes user_data = 4;\n}\n\nmessage RCRegistryUpdateResponsePdu { // MCS_Send_Data on Node ID Channel of requester\n optional RCPduType_E type = 1 [default = RCPDU_REGISTRY_UPDATE_INDICATION];\n required uint32 key_id = 2;\n required uint32 obj_id = 3;\n required RCPduResult_E result = 4;\n}\n\nmessage RCFunctionNotSupportedResponsePdu {\n optional RCPduType_E type = 1\n [default = RCPDU_FUNCTION_NOT_SUPPORTED_RESPONSE];\n required uint32 request_pdu_id = 2;\n}\n\n//ape.proto\n\noption optimize_for = LITE_RUNTIME;\nmessage RCConferenceSendDataRequestPdu {\n optional uint32 initiator = 1;\n optional uint32 peer = 2;\n required bool is_public = 3;\n required bytes user_data = 4;\n}\n\nmessage RCChatSendDataRequestPdu {\n optional uint32 initiator = 1;\n optional uint32 peer = 2;\n required bool is_public = 3;\n required bytes user_data = 4;\n required uint32 from_role = 5;\n required bytes from_name = 6;\n}\n\nmessage RCDocSendDataRequestPdu {\n required int32 id = 1;\n required string doc_type = 2;\n required string uri = 3;\n optional int32 owner = 4;\n optional int32 from = 5;\n optional string name = 6;\n optional int32 cur_page_no = 7;\n optional int32 cur_H = 8;\n optional int32 cur_V = 9;\n optional int32 scale = 10;\n optional int32 page_num = 11;\n}\n\nmessage RCGiftSendDataRequestPdu {\n optional uint32 initiator = 1;\n required uint32 peer = 2;\n required uint32 index = 3;\n required uint32 num = 4;\n optional bytes user_data = 5;\n}\n\nmessage RCAudioSendDataRequestPdu {\n optional uint32 initiator = 1;\n required bytes user_data = 2;\n}\n\nmessage RCVideoSendDataRequestPdu {\n optional uint32 initiator = 1;\n required bool key_frame = 2;\n required uint32 sequence_id = 3;\n required uint32 slice_id = 4;\n required bytes user_data = 5;\n}\n\nmessage RCAudioChannelInfoRecordPdu {\n required uint32 status = 1;\n required uint32 device_id = 2;\n required uint32 framerate = 3;\n required uint32 bitrate = 4;\n required uint32 codec = 5;\n}\n\nmessage RCVideoChannelInfoRecordPdu {\n optional uint32 status = 1;\n optional uint32 device_id = 2;\n optional uint32 width = 3;\n optional uint32 height = 4;\n optional uint32 framerate = 5;\n optional uint32 bitrate = 6;\n optional uint32 codec = 7;\n optional string peer_id = 8;\n optional string url = 9;\n optional uint32 type = 10;\n optional string shamlive = 11;\n optional uint32 livetype = 12;\n optional uint32 releaseGrab = 13;\n optional string curTime = 14;\n}\n\nmessage RCAudioDeviceInfoRecordPdu {\n required uint32 device_id = 1;\n required string device_name = 2;\n}\n\nmessage RCVideoDeviceInfoRecordPdu {\n required uint32 device_id = 1;\n required string device_name = 2;\n}\n\nmessage RCNodeInfoRecordPdu {\n required uint32 node_id = 1;\n required string name = 2;\n required uint32 role = 3;\n required uint32 level = 4;\n repeated RCAudioDeviceInfoRecordPdu audio_records = 5;\n repeated RCVideoDeviceInfoRecordPdu video_records = 6;\n optional uint32 status = 7;\n optional bytes user_data = 8;\n optional string user_id = 9;\n optional uint32 handUpTime = 10;\n optional uint32 deviceType = 11;\n optional uint32 mobileDirection = 12;\n}\n\nmessage RCVotingPollSettingsPdu {\n required bool timer = 1;\n optional uint32 time_limit = 2;\n optional uint32 total_score = 3;\n}\n\nmessage RCVotingPollResultPdu {\n required string title = 1;\n required string content = 2;\n optional uint32 score = 3;\n}\n\nmessage RCVotingPollQuestionPdu {\n required uint32 index = 1;\n required uint32 type = 2;\n required string title = 3;\n repeated string options = 4;\n optional uint32 score = 5;\n optional uint32 time_limit = 6;\n optional string restrict_input = 7;\n optional uint32 char_limit = 8;\n optional string answer = 9;\n repeated uint32 selections = 10;\n repeated string responses = 11;\n}\n\nmessage RCVotingPollRecordPdu {\n required RCVotingPollSettingsPdu settings = 1;\n required string title = 2;\n repeated RCVotingPollResultPdu results = 3;\n repeated RCVotingPollQuestionPdu questions = 4;\n}\n\nmessage RCNodeInfoUserDataPdu {\n optional string qq = 1;\n optional string skype = 2;\n optional string mobile = 3;\n}\nmessage RCTabUpdateDataRequestPdu {\n optional uint32 id = 1;\n optional bytes action = 2;\n optional uint32 uncomprLen =3;\n}\n\nmessage RCWhiteBoardDataModel {\n required uint32 type= 1;//\u767D\u677F\u7C7B\u578B\n required uint32 itemIdx= 2;//itemIdx \u6BCF\u4E00\u6B21\u7ED8\u5236\u7684\u552F\u4E00\u6807\u8BC6\n required uint32 initiator=3; //\u7ED8\u5236\u6765\u81EA\u8C01\n required uint32 parentId=4; //\u7236\u7EA7\u7684id\n required uint32 pageNum= 5;//\u9875\u7801\n optional string pointGroup=6; //\u5750\u6807\u70B9\u96C6\u6570\u7EC4\u7684JSON\u5B57\u7B26\u4E32\n optional string color=7 [default = \"#000000\"]; //\u989C\u8272\n optional uint32 thickness= 8 ;//\u7EBF\u6761\u7C97\u7EC6\n optional uint32 radius= 9;//\u56ED\u7684\u534A\u5F84\n optional uint32 fontSize= 10;//\u5B57\u4F53\u5927\u5C0F\n optional string fontName= 11;//\u5B57\u4F53\u540D\u79F0\n optional string text= 12;//\u6587\u672C\u5185\u5BB9\n optional bytes data = 13;//\u6682\u65F6\u9884\u7559\u7684\u53C2\u6570\n}\n\n\n//end\n"; |
| 13462 | exports.default = _default; | 13464 | exports.default = _default; |
| 13463 | ; | 13465 | ; |
| 13464 | 13466 | ||
| @@ -13665,8 +13667,8 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -13665,8 +13667,8 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 13665 | 13667 | ||
| 13666 | //角色身份 | 13668 | //角色身份 |
| 13667 | ApeConsts.NR_GUEST = 0; // 客人 | 13669 | ApeConsts.NR_GUEST = 0; // 客人 |
| 13668 | - ApeConsts.NR_NORMAL = 1;// 普通与会者 | ||
| 13669 | - ApeConsts.NR_ADMIN = 2;// 管理员 | 13670 | + ApeConsts.NR_NORMAL = 1; // 普通与会者 |
| 13671 | + ApeConsts.NR_ADMIN = 2; // 管理员 | ||
| 13670 | ApeConsts.NR_MASTER = 4; // 主持人 | 13672 | ApeConsts.NR_MASTER = 4; // 主持人 |
| 13671 | ApeConsts.NR_SLAVE = 8; // 主讲人 | 13673 | ApeConsts.NR_SLAVE = 8; // 主讲人 |
| 13672 | ApeConsts.NR_ASSISTANT = 16; // 助教 | 13674 | ApeConsts.NR_ASSISTANT = 16; // 助教 |
| @@ -13680,9 +13682,9 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -13680,9 +13682,9 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 13680 | ApeConsts.DOCUMENT_DEL = 1; | 13682 | ApeConsts.DOCUMENT_DEL = 1; |
| 13681 | 13683 | ||
| 13682 | // RCChannelGrabStatus | 13684 | // RCChannelGrabStatus |
| 13683 | - ApeConsts.CGS_RELEASED = 0;///< 无人占用状态 | ||
| 13684 | - ApeConsts.CGS_PENDING = 1;///< 占用成功,等待打开 | ||
| 13685 | - ApeConsts.CGS_OPENNED = 2;///< 打开成功 | 13685 | + ApeConsts.CGS_RELEASED = 0; ///< 无人占用状态 |
| 13686 | + ApeConsts.CGS_PENDING = 1; ///< 占用成功,等待打开 | ||
| 13687 | + ApeConsts.CGS_OPENNED = 2; ///< 打开成功 | ||
| 13686 | ApeConsts.CGS_GRABBING = 3; ///< 准备占用中, 属于本地状态机需要用的状态,在多点数据库中不存在。 | 13688 | ApeConsts.CGS_GRABBING = 3; ///< 准备占用中, 属于本地状态机需要用的状态,在多点数据库中不存在。 |
| 13687 | 13689 | ||
| 13688 | // defs for common session id | 13690 | // defs for common session id |
| @@ -14319,7 +14321,7 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -14319,7 +14321,7 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 14319 | break; | 14321 | break; |
| 14320 | case _pdus2.default.RCPDU_REG_TABLE_DELETE_PDU: | 14322 | case _pdus2.default.RCPDU_REG_TABLE_DELETE_PDU: |
| 14321 | var tableDeleteData = _pdus2.default['RCRegistryTableDeleteItemPdu'].decode(user_data); | 14323 | var tableDeleteData = _pdus2.default['RCRegistryTableDeleteItemPdu'].decode(user_data); |
| 14322 | - console.log("tableDeleteData", object_id, tableDeleteData); | 14324 | + //console.log("tableDeleteData",object_id,tableDeleteData); |
| 14323 | this.tableDeleteHandler(object_id, tableDeleteData); | 14325 | this.tableDeleteHandler(object_id, tableDeleteData); |
| 14324 | break; | 14326 | break; |
| 14325 | case _pdus2.default.RCPDU_REG_TABLE_UPDATE_PDU: | 14327 | case _pdus2.default.RCPDU_REG_TABLE_UPDATE_PDU: |
| @@ -14500,6 +14502,22 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -14500,6 +14502,22 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 14500 | // Mcu发送 | 14502 | // Mcu发送 |
| 14501 | this.mcu.send(uniformPdu); | 14503 | this.mcu.send(uniformPdu); |
| 14502 | } | 14504 | } |
| 14505 | + }, { | ||
| 14506 | + key: 'sendChatUniform', | ||
| 14507 | + value: function sendChatUniform(appPdu, top) { | ||
| 14508 | + loger.log('Ape发送数据UNIFORM PDU', appPdu); | ||
| 14509 | + loger.log('当前的状态============', _GlobalConfig2.default.getCurrentStatus().code); | ||
| 14510 | + if (_GlobalConfig2.default.getCurrentStatus().code == 0 || _GlobalConfig2.default.getCurrentStatus().code == 1) { | ||
| 14511 | + this._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_APE_SEND_FAILED_NO_JOIN); | ||
| 14512 | + return; | ||
| 14513 | + } | ||
| 14514 | + | ||
| 14515 | + var uniformPdu = _pdus2.default.create_uniform_pdu(appPdu.type, this._confInfo.nodeId, this._confInfo.confId, this._session_id, top ? _ApeConsts2.default.BROADCAST_CHANNEL_ID : this._channel_id, true, _PduConsts2.default.DP_TOP, 0, //flash中这个值设置为0 | ||
| 14516 | + _PduConsts2.default.SEG_ONCE); | ||
| 14517 | + uniformPdu.data = appPdu.toArrayBuffer(); | ||
| 14518 | + // Mcu发送 | ||
| 14519 | + this.mcu.send(uniformPdu); | ||
| 14520 | + } | ||
| 14503 | }]); | 14521 | }]); |
| 14504 | 14522 | ||
| 14505 | return Ape; | 14523 | return Ape; |
| @@ -15194,17 +15212,21 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -15194,17 +15212,21 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 15194 | chatSendPdu.type = _pdus2.default.RCPDU_CHAT_SEND_DATA_REQUEST; | 15212 | chatSendPdu.type = _pdus2.default.RCPDU_CHAT_SEND_DATA_REQUEST; |
| 15195 | chatSendPdu.initiator = this._confInfo.nodeId; //发起人 | 15213 | chatSendPdu.initiator = this._confInfo.nodeId; //发起人 |
| 15196 | chatSendPdu.peer = parseInt(_messageInfo.to); //发送给谁,公聊的时候是0,私聊的时候是指定的用户id | 15214 | chatSendPdu.peer = parseInt(_messageInfo.to); //发送给谁,公聊的时候是0,私聊的时候是指定的用户id |
| 15197 | - chatSendPdu.isPublic = true; | 15215 | + |
| 15198 | chatSendPdu.userData = this._rCArrayBufferUtil.strToUint8Array("h5" + _messageInfo.message); | 15216 | chatSendPdu.userData = this._rCArrayBufferUtil.strToUint8Array("h5" + _messageInfo.message); |
| 15199 | chatSendPdu.fromName = this._rCArrayBufferUtil.strToUint8Array("h5" + this._confInfo.userName); | 15217 | chatSendPdu.fromName = this._rCArrayBufferUtil.strToUint8Array("h5" + this._confInfo.userName); |
| 15200 | chatSendPdu.fromRole = this._confInfo.classRole; | 15218 | chatSendPdu.fromRole = this._confInfo.classRole; |
| 15201 | - | ||
| 15202 | - if (!(chatSendPdu.isPublic || 0 === chatSendPdu.peer)) { | 15219 | + chatSendPdu.isPublic = true; |
| 15220 | + // if (!(chatSendPdu.isPublic || 0 === chatSendPdu.peer)) { | ||
| 15221 | + if (!chatSendPdu && 0 != chatSendPdu.peer) { | ||
| 15203 | //发送给制定的人 | 15222 | //发送给制定的人 |
| 15223 | + loger.log('发送私聊消息.'); | ||
| 15204 | this.send(chatSendPdu); | 15224 | this.send(chatSendPdu); |
| 15205 | } else { | 15225 | } else { |
| 15206 | //发送给所有人 | 15226 | //发送给所有人 |
| 15207 | - this.sendUniform(chatSendPdu); | 15227 | + loger.log('发送公聊消息.'); |
| 15228 | + //this.sendUniform(chatSendPdu); | ||
| 15229 | + this.sendChatUniform(chatSendPdu); | ||
| 15208 | } | 15230 | } |
| 15209 | } | 15231 | } |
| 15210 | }, { | 15232 | }, { |
| @@ -15399,15 +15421,15 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -15399,15 +15421,15 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 15399 | 15421 | ||
| 15400 | 15422 | ||
| 15401 | _createClass(VideoChat, [{ | 15423 | _createClass(VideoChat, [{ |
| 15402 | - key: 'playVideoPath', | ||
| 15403 | - value: function playVideoPath(_param) { | 15424 | + key: 'getPlayVideoPath', |
| 15425 | + value: function getPlayVideoPath(_param) { | ||
| 15404 | return { "code": 0, "data": "播放流地址XXXXXXXXXXXXXXXXXXXXX" }; | 15426 | return { "code": 0, "data": "播放流地址XXXXXXXXXXXXXXXXXXXXX" }; |
| 15405 | } | 15427 | } |
| 15406 | //获取推流地址 | 15428 | //获取推流地址 |
| 15407 | 15429 | ||
| 15408 | }, { | 15430 | }, { |
| 15409 | - key: 'publishVideoPath', | ||
| 15410 | - value: function publishVideoPath(_param) { | 15431 | + key: 'getPublishVideoPath', |
| 15432 | + value: function getPublishVideoPath(_param) { | ||
| 15411 | return { "code": 0, "data": "推流地址XXXXXXXXXXXXXXXXXXXXXXX" }; | 15433 | return { "code": 0, "data": "推流地址XXXXXXXXXXXXXXXXXXXXXXX" }; |
| 15412 | } | 15434 | } |
| 15413 | 15435 | ||
| @@ -15582,7 +15604,7 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -15582,7 +15604,7 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 15582 | value: function tableDeleteHandler(itemIdx, itemData) { | 15604 | value: function tableDeleteHandler(itemIdx, itemData) { |
| 15583 | /*const re={}; | 15605 | /*const re={}; |
| 15584 | re.type=ApeConsts.DOCUMENT_DEL; | 15606 | re.type=ApeConsts.DOCUMENT_DEL; |
| 15585 | - this._emit(MessageTypes.DOC_DEL, re);*/ | 15607 | + this._emit(MessageTypes.DOC_DELETE, re);*/ |
| 15586 | 15608 | ||
| 15587 | } | 15609 | } |
| 15588 | }, { | 15610 | }, { |
| @@ -15640,7 +15662,7 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -15640,7 +15662,7 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 15640 | 'use strict'; | 15662 | 'use strict'; |
| 15641 | 15663 | ||
| 15642 | Object.defineProperty(exports, "__esModule", { | 15664 | Object.defineProperty(exports, "__esModule", { |
| 15643 | - value: true | 15665 | + value: true |
| 15644 | }); | 15666 | }); |
| 15645 | 15667 | ||
| 15646 | var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); | 15668 | var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); |
| @@ -15710,338 +15732,346 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -15710,338 +15732,346 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 15710 | var TYPE_TEXT = 4; //文本 | 15732 | var TYPE_TEXT = 4; //文本 |
| 15711 | 15733 | ||
| 15712 | var WhiteBoardApe = function (_Ape) { | 15734 | var WhiteBoardApe = function (_Ape) { |
| 15713 | - _inherits(WhiteBoardApe, _Ape); | ||
| 15714 | - | ||
| 15715 | - function WhiteBoardApe() { | ||
| 15716 | - _classCallCheck(this, WhiteBoardApe); | ||
| 15717 | - | ||
| 15718 | - // properties | ||
| 15719 | - var _this = _possibleConstructorReturn(this, (WhiteBoardApe.__proto__ || Object.getPrototypeOf(WhiteBoardApe)).call(this, _ApeConsts2.default.WHITEBOARD_SESSION_ID, _ApeConsts2.default.WHITEBOARD_SESSION_NAME, _ApeConsts2.default.WHITEBOARD_SESSION_TAG)); | ||
| 15720 | - | ||
| 15721 | - _this.annoInfos = {}; | ||
| 15722 | - | ||
| 15723 | - //Ape Models | ||
| 15724 | - _this.registerKey(_this._session_id, _this._session_name, _this._session_tag, new ArrayBuffer()); | ||
| 15725 | - _this.registerObj(_pdus2.default.RCPDU_REG_REGISTER_TABLE, _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID, _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_NAME, _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_TAG, 0, new ArrayBuffer()); | ||
| 15726 | - | ||
| 15727 | - // ape listeners | ||
| 15728 | - _this.on(_pdus2.default.RCPDU_CONFERENCE_SEND_DATA_REQUEST, _this.whiteboardMsgComingHandler.bind(_this)); | ||
| 15729 | - _this.on(_pdus2.default.RCPDU_SESSION_JOIN_RESPONSE, _this._joinSessionHandler.bind(_this)); | ||
| 15730 | - // 白板延迟 | ||
| 15731 | - _this._apeDelayed = true; | ||
| 15732 | - return _this; | ||
| 15733 | - } | ||
| 15734 | - | ||
| 15735 | - _createClass(WhiteBoardApe, [{ | ||
| 15736 | - key: '_joinSessionHandler', | ||
| 15737 | - value: function _joinSessionHandler(confInfo) { | ||
| 15738 | - loger.log("RCPDU_SESSION_JOIN_RESPONSE"); | ||
| 15739 | - } | ||
| 15740 | - | ||
| 15741 | - /////////////发送数据操作////////////////////////////////////////////////////// | ||
| 15742 | - // 添加标注,发送信息 | ||
| 15743 | - | ||
| 15744 | - }, { | ||
| 15745 | - key: 'sendInsetAnnotaion', | ||
| 15746 | - value: function sendInsetAnnotaion(_param) { | ||
| 15747 | - /* itemIdx=parseInt(Date.now()/1000); | ||
| 15748 | - let whiteBoardModelPdu =new pdu['RCWhiteBoardDataModel']; | ||
| 15749 | - whiteBoardModelPdu.id =itemIdx; | ||
| 15750 | - whiteBoardModelPdu.initiator =GlobalConfig.nodeId; | ||
| 15751 | - whiteBoardModelPdu.pointGroup =EngineUtils.arrayToJsonString([{"w":10,"h":20},{"w":10,"h":20},{"w":10,"h":20},{"w":10,"h":20}]); | ||
| 15752 | - whiteBoardModelPdu.type = 3; | ||
| 15753 | - | ||
| 15754 | - */ | ||
| 15755 | - | ||
| 15756 | - /* let whiteBoardModelPdu =new pdu['RCWhiteBoardDataModel']; | ||
| 15757 | - whiteBoardModelPdu.id =ApeConsts.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15758 | - whiteBoardModelPdu.initiator =GlobalConfig.nodeId; | ||
| 15759 | - whiteBoardModelPdu.pointGroup =EngineUtils.arrayToJsonString([{"w":133,"h":20},{"w":1313,"h":20},{"w":313,"h":20},{"w":10,"h":20}]); | ||
| 15760 | - whiteBoardModelPdu.type = 3; | ||
| 15761 | - */ | ||
| 15762 | - | ||
| 15763 | - if (_param == null || _EngineUtils2.default.isEmptyObject(_param)) { | ||
| 15764 | - loger.log('sendInsetAnnotaion失败,参数错误'); | ||
| 15765 | - this._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_APE_INTERFACE_PARAM_WRONG); | ||
| 15766 | - return; | ||
| 15767 | - } | ||
| 15768 | - | ||
| 15769 | - itemIdx = parseInt(Date.now() / 1000); | ||
| 15770 | - var whiteBoardModelPdu = this.packPdu(_param, itemIdx); | ||
| 15771 | - if (whiteBoardModelPdu == null) { | ||
| 15772 | - loger.log('sendInsetAnnotaion失败,参数错误'); | ||
| 15773 | - this._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_APE_INTERFACE_PARAM_WRONG); | ||
| 15774 | - return; | ||
| 15775 | - } | ||
| 15776 | - console.log(whiteBoardModelPdu); | ||
| 15777 | - | ||
| 15778 | - var tableItemPdu = new _pdus2.default['RCRegistryTableItemPdu'](); | ||
| 15779 | - tableItemPdu.itemIdx = itemIdx; //直接用时间戳作为id | ||
| 15780 | - tableItemPdu.registerObjId = _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15781 | - tableItemPdu.owner = 0; //收到flash的是这个值,不清楚先写固定 | ||
| 15782 | - tableItemPdu.itemData = whiteBoardModelPdu.toArrayBuffer(); | 15735 | + _inherits(WhiteBoardApe, _Ape); |
| 15783 | 15736 | ||
| 15784 | - //insert | ||
| 15785 | - var tableInsertItemPdu = new _pdus2.default['RCRegistryTableInsertItemPdu'](); | ||
| 15786 | - //optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_UPDATE_PDU]; | ||
| 15787 | - //repeated RCRegistryTableItemPdu items = 2; | ||
| 15788 | - tableInsertItemPdu.type = _pdus2.default.RCPDU_REG_TABLE_INSERT_PDU; // | ||
| 15789 | - tableInsertItemPdu.items.push(tableItemPdu); | 15737 | + function WhiteBoardApe() { |
| 15738 | + _classCallCheck(this, WhiteBoardApe); | ||
| 15790 | 15739 | ||
| 15791 | - var updateObjPdu = new _pdus2.default['RCRegistryUpdateObjPdu'](); | ||
| 15792 | - updateObjPdu.objId = _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15793 | - updateObjPdu.subType = tableInsertItemPdu.type; | ||
| 15794 | - updateObjPdu.userData = tableInsertItemPdu.toArrayBuffer(); | ||
| 15795 | - | ||
| 15796 | - //同步 | ||
| 15797 | - var adapterItemPdu = new _pdus2.default['RCAdapterItemPdu'](); | ||
| 15798 | - adapterItemPdu.type = _pdus2.default.RCPDU_REG_UPDATE_OBJ; | ||
| 15799 | - adapterItemPdu.itemData = updateObjPdu.toArrayBuffer(); | ||
| 15800 | - | ||
| 15801 | - var adapterPdu = new _pdus2.default['RCAdapterPdu'](); | ||
| 15802 | - adapterPdu.type = _pdus2.default.RCPDU_REG_ADAPTER; | ||
| 15803 | - adapterPdu.item.push(adapterItemPdu); | ||
| 15804 | - | ||
| 15805 | - console.log("白板insert数据======111111111111=tableItemPdu.itemIdx=" + tableItemPdu.itemIdx); | ||
| 15806 | - this.sendUniform(adapterPdu, true); | ||
| 15807 | - } | ||
| 15808 | - //删除所有标注 | ||
| 15809 | - | ||
| 15810 | - }, { | ||
| 15811 | - key: 'sendDeleteAllAnnotation', | ||
| 15812 | - value: function sendDeleteAllAnnotation(_param) { | ||
| 15813 | - var len = 0; | ||
| 15814 | - for (var key in this.annoInfos) { | ||
| 15815 | - console.log("key:" + key); | ||
| 15816 | - console.log("删除白板数据,itemIdx:" + this.annoInfos[key]); | ||
| 15817 | - this.sendDeleteAnnotaion({ "itemIdx": key }); | ||
| 15818 | - } | ||
| 15819 | - } | ||
| 15820 | - //删除标注,发送信息 | ||
| 15821 | - | ||
| 15822 | - }, { | ||
| 15823 | - key: 'sendDeleteAnnotaion', | ||
| 15824 | - value: function sendDeleteAnnotaion(_param) { | ||
| 15825 | - //{"itemIdx":itemIdx} | ||
| 15826 | - var tableDeleteItemPdu = new _pdus2.default['RCRegistryTableDeleteItemPdu'](); | ||
| 15827 | - //optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_DELETE_PDU]; | ||
| 15828 | - // repeated uint32 item_idx = 2; | ||
| 15829 | - tableDeleteItemPdu.type = _pdus2.default.RCPDU_REG_TABLE_DELETE_PDU; // | ||
| 15830 | - tableDeleteItemPdu.itemIdx = parseInt(_param.itemIdx); //这里需要设置要删除的数据的itemIdx,每条数据的这个id都不一样 | ||
| 15831 | - | ||
| 15832 | - var updateObjPdu = new _pdus2.default['RCRegistryUpdateObjPdu'](); | ||
| 15833 | - updateObjPdu.objId = _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15834 | - updateObjPdu.subType = tableDeleteItemPdu.type; | ||
| 15835 | - updateObjPdu.userData = tableDeleteItemPdu.toArrayBuffer(); | 15740 | + // properties |
| 15741 | + var _this = _possibleConstructorReturn(this, (WhiteBoardApe.__proto__ || Object.getPrototypeOf(WhiteBoardApe)).call(this, _ApeConsts2.default.WHITEBOARD_SESSION_ID, _ApeConsts2.default.WHITEBOARD_SESSION_NAME, _ApeConsts2.default.WHITEBOARD_SESSION_TAG)); | ||
| 15836 | 15742 | ||
| 15837 | - //同步 | ||
| 15838 | - var adapterItemPdu = new _pdus2.default['RCAdapterItemPdu'](); | ||
| 15839 | - adapterItemPdu.type = _pdus2.default.RCPDU_REG_UPDATE_OBJ; | ||
| 15840 | - adapterItemPdu.itemData = updateObjPdu.toArrayBuffer(); | 15743 | + _this.annoInfos = {}; |
| 15841 | 15744 | ||
| 15842 | - var adapterPdu = new _pdus2.default['RCAdapterPdu'](); | ||
| 15843 | - adapterPdu.type = _pdus2.default.RCPDU_REG_ADAPTER; | ||
| 15844 | - adapterPdu.item.push(adapterItemPdu); | 15745 | + //Ape Models |
| 15746 | + _this.registerKey(_this._session_id, _this._session_name, _this._session_tag, new ArrayBuffer()); | ||
| 15747 | + _this.registerObj(_pdus2.default.RCPDU_REG_REGISTER_TABLE, _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID, _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_NAME, _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_TAG, 0, new ArrayBuffer()); | ||
| 15845 | 15748 | ||
| 15846 | - console.log("白板发送删除数据=============" + tableDeleteItemPdu.itemIdx); | ||
| 15847 | - this.sendUniform(adapterPdu, true); | 15749 | + // ape listeners |
| 15750 | + _this.on(_pdus2.default.RCPDU_CONFERENCE_SEND_DATA_REQUEST, _this.whiteboardMsgComingHandler.bind(_this)); | ||
| 15751 | + _this.on(_pdus2.default.RCPDU_SESSION_JOIN_RESPONSE, _this._joinSessionHandler.bind(_this)); | ||
| 15752 | + // 白板延迟 | ||
| 15753 | + _this._apeDelayed = true; | ||
| 15754 | + return _this; | ||
| 15848 | } | 15755 | } |
| 15849 | 15756 | ||
| 15850 | - //更新标注 | ||
| 15851 | - | ||
| 15852 | - }, { | ||
| 15853 | - key: 'sendUpdaterAnnotaion', | ||
| 15854 | - value: function sendUpdaterAnnotaion(_param) { | ||
| 15855 | - if (_param == null || _EngineUtils2.default.isEmptyObject(_param)) { | ||
| 15856 | - loger.log('sendUpdaterAnnotaion失败,参数错误'); | ||
| 15857 | - this._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_APE_INTERFACE_PARAM_WRONG); | ||
| 15858 | - return; | ||
| 15859 | - } | ||
| 15860 | - | ||
| 15861 | - /* let whiteBoardModelPdu =new pdu['RCWhiteBoardDataModel']; | ||
| 15862 | - whiteBoardModelPdu.id =ApeConsts.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15863 | - whiteBoardModelPdu.initiator =GlobalConfig.nodeId; | ||
| 15864 | - whiteBoardModelPdu.pointGroup =EngineUtils.arrayToJsonString([{"w":133,"h":20},{"w":1313,"h":20},{"w":313,"h":20},{"w":10,"h":20}]); | ||
| 15865 | - whiteBoardModelPdu.type = 3; | ||
| 15866 | - */ | ||
| 15867 | - | ||
| 15868 | - itemIdx = _param.itemIdx; | ||
| 15869 | - var whiteBoardModelPdu = this.packPdu(_param, itemIdx); | ||
| 15870 | - console.log(whiteBoardModelPdu); | 15757 | + _createClass(WhiteBoardApe, [{ |
| 15758 | + key: '_joinSessionHandler', | ||
| 15759 | + value: function _joinSessionHandler(confInfo) { | ||
| 15760 | + loger.log("RCPDU_SESSION_JOIN_RESPONSE"); | ||
| 15761 | + } | ||
| 15871 | 15762 | ||
| 15872 | - if (whiteBoardModelPdu == null) { | ||
| 15873 | - loger.log('sendInsetAnnotaion失败,参数错误'); | ||
| 15874 | - this._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_APE_INTERFACE_PARAM_WRONG); | ||
| 15875 | - return; | ||
| 15876 | - } | 15763 | + /////////////发送数据操作////////////////////////////////////////////////////// |
| 15764 | + // 添加标注,发送信息 | ||
| 15877 | 15765 | ||
| 15878 | - var tableItemPdu = new _pdus2.default['RCRegistryTableItemPdu'](); | ||
| 15879 | - tableItemPdu.itemIdx = itemIdx; | ||
| 15880 | - tableItemPdu.owner = 0; //收到flash的是这个值,不清楚先写固定 | ||
| 15881 | - tableItemPdu.registerObjId = _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15882 | - tableItemPdu.itemData = whiteBoardModelPdu.toArrayBuffer(); | 15766 | + }, { |
| 15767 | + key: 'sendInsetAnnotaion', | ||
| 15768 | + value: function sendInsetAnnotaion(_param) { | ||
| 15769 | + /* itemIdx=parseInt(Date.now()/1000); | ||
| 15770 | + let whiteBoardModelPdu =new pdu['RCWhiteBoardDataModel']; | ||
| 15771 | + whiteBoardModelPdu.id =itemIdx; | ||
| 15772 | + whiteBoardModelPdu.initiator =GlobalConfig.nodeId; | ||
| 15773 | + whiteBoardModelPdu.pointGroup =EngineUtils.arrayToJsonString([{"w":10,"h":20},{"w":10,"h":20},{"w":10,"h":20},{"w":10,"h":20}]); | ||
| 15774 | + whiteBoardModelPdu.type = 3; | ||
| 15775 | + | ||
| 15776 | + */ | ||
| 15777 | + | ||
| 15778 | + /* let whiteBoardModelPdu =new pdu['RCWhiteBoardDataModel']; | ||
| 15779 | + whiteBoardModelPdu.id =ApeConsts.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15780 | + whiteBoardModelPdu.initiator =GlobalConfig.nodeId; | ||
| 15781 | + whiteBoardModelPdu.pointGroup =EngineUtils.arrayToJsonString([{"w":133,"h":20},{"w":1313,"h":20},{"w":313,"h":20},{"w":10,"h":20}]); | ||
| 15782 | + whiteBoardModelPdu.type = 3; | ||
| 15783 | + */ | ||
| 15784 | + | ||
| 15785 | + if (_param == null || _EngineUtils2.default.isEmptyObject(_param)) { | ||
| 15786 | + loger.log('sendInsetAnnotaion失败,参数错误'); | ||
| 15787 | + this._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_APE_INTERFACE_PARAM_WRONG); | ||
| 15788 | + return; | ||
| 15789 | + } | ||
| 15883 | 15790 | ||
| 15884 | - //updater | ||
| 15885 | - var whiteBoardUpdateItem = new _pdus2.default['RCRegistryTableUpdateItemPdu'](); | ||
| 15886 | - //optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_UPDATE_PDU]; | ||
| 15887 | - //repeated RCRegistryTableItemPdu items = 2; | ||
| 15888 | - whiteBoardUpdateItem.type = _pdus2.default.RCPDU_REG_TABLE_UPDATE_PDU; // | ||
| 15889 | - whiteBoardUpdateItem.items.push(tableItemPdu); | 15791 | + itemIdx = parseInt(Date.now() / 1000); |
| 15792 | + var whiteBoardModelPdu = this.packPdu(_param, itemIdx); | ||
| 15793 | + if (whiteBoardModelPdu == null) { | ||
| 15794 | + loger.log('sendInsetAnnotaion失败,参数错误'); | ||
| 15795 | + this._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_APE_INTERFACE_PARAM_WRONG); | ||
| 15796 | + return; | ||
| 15797 | + } | ||
| 15798 | + console.log(whiteBoardModelPdu); | ||
| 15799 | + | ||
| 15800 | + var tableItemPdu = new _pdus2.default['RCRegistryTableItemPdu'](); | ||
| 15801 | + tableItemPdu.itemIdx = itemIdx; //直接用时间戳作为id | ||
| 15802 | + tableItemPdu.registerObjId = _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15803 | + tableItemPdu.owner = 0; //收到flash的是这个值,不清楚先写固定 | ||
| 15804 | + tableItemPdu.itemData = whiteBoardModelPdu.toArrayBuffer(); | ||
| 15805 | + | ||
| 15806 | + //insert | ||
| 15807 | + var tableInsertItemPdu = new _pdus2.default['RCRegistryTableInsertItemPdu'](); | ||
| 15808 | + //optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_UPDATE_PDU]; | ||
| 15809 | + //repeated RCRegistryTableItemPdu items = 2; | ||
| 15810 | + tableInsertItemPdu.type = _pdus2.default.RCPDU_REG_TABLE_INSERT_PDU; // | ||
| 15811 | + tableInsertItemPdu.items.push(tableItemPdu); | ||
| 15812 | + | ||
| 15813 | + var updateObjPdu = new _pdus2.default['RCRegistryUpdateObjPdu'](); | ||
| 15814 | + updateObjPdu.objId = _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15815 | + updateObjPdu.subType = tableInsertItemPdu.type; | ||
| 15816 | + updateObjPdu.userData = tableInsertItemPdu.toArrayBuffer(); | ||
| 15817 | + | ||
| 15818 | + //同步 | ||
| 15819 | + var adapterItemPdu = new _pdus2.default['RCAdapterItemPdu'](); | ||
| 15820 | + adapterItemPdu.type = _pdus2.default.RCPDU_REG_UPDATE_OBJ; | ||
| 15821 | + adapterItemPdu.itemData = updateObjPdu.toArrayBuffer(); | ||
| 15822 | + | ||
| 15823 | + var adapterPdu = new _pdus2.default['RCAdapterPdu'](); | ||
| 15824 | + adapterPdu.type = _pdus2.default.RCPDU_REG_ADAPTER; | ||
| 15825 | + adapterPdu.item.push(adapterItemPdu); | ||
| 15826 | + | ||
| 15827 | + console.log("白板insert数据======111111111111=tableItemPdu.itemIdx=" + tableItemPdu.itemIdx); | ||
| 15828 | + this.sendUniform(adapterPdu, true); | ||
| 15829 | + } | ||
| 15830 | + //删除所有标注 | ||
| 15890 | 15831 | ||
| 15891 | - var updateObjPdu = new _pdus2.default['RCRegistryUpdateObjPdu'](); | ||
| 15892 | - updateObjPdu.objId = _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15893 | - updateObjPdu.subType = whiteBoardUpdateItem.type; | ||
| 15894 | - updateObjPdu.userData = whiteBoardUpdateItem.toArrayBuffer(); | 15832 | + }, { |
| 15833 | + key: 'sendDeleteAllAnnotation', | ||
| 15834 | + value: function sendDeleteAllAnnotation(_param) { | ||
| 15835 | + var len = 0; | ||
| 15836 | + for (var key in this.annoInfos) { | ||
| 15837 | + console.log("key:" + key); | ||
| 15838 | + console.log("删除白板数据,itemIdx:" + this.annoInfos[key]); | ||
| 15839 | + this.sendDeleteAnnotaion({ "itemIdx": key }); | ||
| 15840 | + } | ||
| 15841 | + } | ||
| 15842 | + //删除标注,发送信息 | ||
| 15895 | 15843 | ||
| 15896 | - //同步 | ||
| 15897 | - var adapterItemPdu = new _pdus2.default['RCAdapterItemPdu'](); | ||
| 15898 | - adapterItemPdu.type = _pdus2.default.RCPDU_REG_UPDATE_OBJ; | ||
| 15899 | - adapterItemPdu.itemData = updateObjPdu.toArrayBuffer(); | 15844 | + }, { |
| 15845 | + key: 'sendDeleteAnnotaion', | ||
| 15846 | + value: function sendDeleteAnnotaion(_param) { | ||
| 15847 | + //{"itemIdx":itemIdx} | ||
| 15848 | + var tableDeleteItemPdu = new _pdus2.default['RCRegistryTableDeleteItemPdu'](); | ||
| 15849 | + //optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_DELETE_PDU]; | ||
| 15850 | + // repeated uint32 item_idx = 2; | ||
| 15851 | + tableDeleteItemPdu.type = _pdus2.default.RCPDU_REG_TABLE_DELETE_PDU; // | ||
| 15852 | + tableDeleteItemPdu.itemIdx = parseInt(_param.itemIdx); //这里需要设置要删除的数据的itemIdx,每条数据的这个id都不一样 | ||
| 15853 | + | ||
| 15854 | + var updateObjPdu = new _pdus2.default['RCRegistryUpdateObjPdu'](); | ||
| 15855 | + updateObjPdu.objId = _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15856 | + updateObjPdu.subType = tableDeleteItemPdu.type; | ||
| 15857 | + updateObjPdu.userData = tableDeleteItemPdu.toArrayBuffer(); | ||
| 15858 | + | ||
| 15859 | + //同步 | ||
| 15860 | + var adapterItemPdu = new _pdus2.default['RCAdapterItemPdu'](); | ||
| 15861 | + adapterItemPdu.type = _pdus2.default.RCPDU_REG_UPDATE_OBJ; | ||
| 15862 | + adapterItemPdu.itemData = updateObjPdu.toArrayBuffer(); | ||
| 15863 | + | ||
| 15864 | + var adapterPdu = new _pdus2.default['RCAdapterPdu'](); | ||
| 15865 | + adapterPdu.type = _pdus2.default.RCPDU_REG_ADAPTER; | ||
| 15866 | + adapterPdu.item.push(adapterItemPdu); | ||
| 15867 | + | ||
| 15868 | + console.log("白板发送删除数据=============" + tableDeleteItemPdu.itemIdx); | ||
| 15869 | + this.sendUniform(adapterPdu, true); | ||
| 15870 | + } | ||
| 15900 | 15871 | ||
| 15901 | - var adapterPdu = new _pdus2.default['RCAdapterPdu'](); | ||
| 15902 | - adapterPdu.type = _pdus2.default.RCPDU_REG_ADAPTER; | ||
| 15903 | - adapterPdu.item.push(adapterItemPdu); | 15872 | + //更新标注 |
| 15904 | 15873 | ||
| 15905 | - console.log("白板发送更新数据===============22"); | ||
| 15906 | - this.sendUniform(adapterPdu, true); | ||
| 15907 | - } | 15874 | + }, { |
| 15875 | + key: 'sendUpdaterAnnotaion', | ||
| 15876 | + value: function sendUpdaterAnnotaion(_param) { | ||
| 15877 | + if (_param == null || _EngineUtils2.default.isEmptyObject(_param)) { | ||
| 15878 | + loger.log('sendUpdaterAnnotaion失败,参数错误'); | ||
| 15879 | + this._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_APE_INTERFACE_PARAM_WRONG); | ||
| 15880 | + return; | ||
| 15881 | + } | ||
| 15908 | 15882 | ||
| 15909 | - ///////白板数据的封包和解包///////////////////////////////////////// | 15883 | + /* let whiteBoardModelPdu =new pdu['RCWhiteBoardDataModel']; |
| 15884 | + whiteBoardModelPdu.id =ApeConsts.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15885 | + whiteBoardModelPdu.initiator =GlobalConfig.nodeId; | ||
| 15886 | + whiteBoardModelPdu.pointGroup =EngineUtils.arrayToJsonString([{"w":133,"h":20},{"w":1313,"h":20},{"w":313,"h":20},{"w":10,"h":20}]); | ||
| 15887 | + whiteBoardModelPdu.type = 3; | ||
| 15888 | + */ | ||
| 15889 | + | ||
| 15890 | + itemIdx = _param.itemIdx; | ||
| 15891 | + var whiteBoardModelPdu = this.packPdu(_param, itemIdx); | ||
| 15892 | + console.log(whiteBoardModelPdu); | ||
| 15893 | + | ||
| 15894 | + if (whiteBoardModelPdu == null) { | ||
| 15895 | + loger.log('sendInsetAnnotaion失败,参数错误'); | ||
| 15896 | + this._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_APE_INTERFACE_PARAM_WRONG); | ||
| 15897 | + return; | ||
| 15898 | + } | ||
| 15910 | 15899 | ||
| 15911 | - }, { | ||
| 15912 | - key: 'packPdu', | ||
| 15913 | - value: function packPdu(_param, _itemIdx) { | ||
| 15914 | - /* required uint32 type= 1;//白板类型 | ||
| 15915 | - required uint32 id= 2;//id 每一次绘制的唯一标识 | ||
| 15916 | - required uint32 initiator=3; //绘制来自谁 | ||
| 15917 | - optional string pointGroup=4; //坐标点集数组的JSON字符串 | ||
| 15918 | - optional string color= 5 [default = "#000000"]; //颜色 | ||
| 15919 | - optional uint32 thickness= 6 ;//线条粗细 | ||
| 15920 | - optional uint32 radius= 7;//园的半径 | ||
| 15921 | - optional uint32 fontSize= 8;//字体大小 | ||
| 15922 | - optional uint32 fontName= 9;//字体名称 | ||
| 15923 | - optional uint32 text= 10;//文本内容*/ | ||
| 15924 | - | ||
| 15925 | - //验证坐标点集合数组是否合法 | ||
| 15926 | - if (_param.pointGroup == null || _param.pointGroup.length < 1) { | ||
| 15927 | - this._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_APE_INTERFACE_PARAM_WRONG); | ||
| 15928 | - return null; | ||
| 15929 | - } | ||
| 15930 | - //判断type类型,根据type设置不同的参数 | ||
| 15931 | - var whiteBoardModelPdu = new _pdus2.default['RCWhiteBoardDataModel'](); | ||
| 15932 | - switch (_param.type) { | ||
| 15933 | - case TYPE_BIGHT: | ||
| 15934 | - break; | ||
| 15935 | - case TYPE_LINE: | ||
| 15936 | - break; | ||
| 15937 | - case TYPE_RECT: | ||
| 15938 | - break; | ||
| 15939 | - case TYPE_CIRCLE: | ||
| 15940 | - whiteBoardModelPdu.radius = parseInt(_param.radius); | ||
| 15941 | - break; | ||
| 15942 | - case TYPE_TEXT: | ||
| 15943 | - whiteBoardModelPdu.fontSize = parseInt(_param.fontSize); | ||
| 15944 | - whiteBoardModelPdu.fontName = _param.fontName || null; | ||
| 15945 | - whiteBoardModelPdu.text = _param.text || null; | ||
| 15946 | - break; | ||
| 15947 | - default: | ||
| 15948 | - //其它类型不做处理 | ||
| 15949 | - return null; | ||
| 15950 | - break; | ||
| 15951 | - } | ||
| 15952 | - //下面4个是必须的参数 | ||
| 15953 | - whiteBoardModelPdu.type = _param.type; | ||
| 15954 | - whiteBoardModelPdu.itemIdx = _itemIdx; | ||
| 15955 | - whiteBoardModelPdu.initiator = _GlobalConfig2.default.nodeId; | ||
| 15956 | - whiteBoardModelPdu.parentId = _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID; | 15900 | + var tableItemPdu = new _pdus2.default['RCRegistryTableItemPdu'](); |
| 15901 | + tableItemPdu.itemIdx = itemIdx; | ||
| 15902 | + tableItemPdu.owner = 0; //收到flash的是这个值,不清楚先写固定 | ||
| 15903 | + tableItemPdu.registerObjId = _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15904 | + tableItemPdu.itemData = whiteBoardModelPdu.toArrayBuffer(); | ||
| 15905 | + | ||
| 15906 | + //updater | ||
| 15907 | + var whiteBoardUpdateItem = new _pdus2.default['RCRegistryTableUpdateItemPdu'](); | ||
| 15908 | + //optional RCPduType_E type = 1 [default = RCPDU_REG_TABLE_UPDATE_PDU]; | ||
| 15909 | + //repeated RCRegistryTableItemPdu items = 2; | ||
| 15910 | + whiteBoardUpdateItem.type = _pdus2.default.RCPDU_REG_TABLE_UPDATE_PDU; // | ||
| 15911 | + whiteBoardUpdateItem.items.push(tableItemPdu); | ||
| 15912 | + | ||
| 15913 | + var updateObjPdu = new _pdus2.default['RCRegistryUpdateObjPdu'](); | ||
| 15914 | + updateObjPdu.objId = _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15915 | + updateObjPdu.subType = whiteBoardUpdateItem.type; | ||
| 15916 | + updateObjPdu.userData = whiteBoardUpdateItem.toArrayBuffer(); | ||
| 15917 | + | ||
| 15918 | + //同步 | ||
| 15919 | + var adapterItemPdu = new _pdus2.default['RCAdapterItemPdu'](); | ||
| 15920 | + adapterItemPdu.type = _pdus2.default.RCPDU_REG_UPDATE_OBJ; | ||
| 15921 | + adapterItemPdu.itemData = updateObjPdu.toArrayBuffer(); | ||
| 15922 | + | ||
| 15923 | + var adapterPdu = new _pdus2.default['RCAdapterPdu'](); | ||
| 15924 | + adapterPdu.type = _pdus2.default.RCPDU_REG_ADAPTER; | ||
| 15925 | + adapterPdu.item.push(adapterItemPdu); | ||
| 15926 | + | ||
| 15927 | + console.log("白板发送更新数据===============22"); | ||
| 15928 | + this.sendUniform(adapterPdu, true); | ||
| 15929 | + } | ||
| 15957 | 15930 | ||
| 15958 | - whiteBoardModelPdu.pointGroup = _EngineUtils2.default.arrayToJsonString(_param.pointGroup); | ||
| 15959 | - whiteBoardModelPdu.color = _param.color || "#000000"; | 15931 | + ///////白板数据的封包和解包///////////////////////////////////////// |
| 15960 | 15932 | ||
| 15961 | - return whiteBoardModelPdu; | ||
| 15962 | - } | ||
| 15963 | - }, { | ||
| 15964 | - key: 'unPackPdu', | ||
| 15965 | - value: function unPackPdu(owner, itemIdx, itemData) { | ||
| 15966 | - this.annoInfos[itemIdx] = itemData; | ||
| 15967 | - try { | ||
| 15968 | - console.log("白板收到数据===tableUpdateHandler "); | ||
| 15969 | - var whiteBoardModelPdu = _pdus2.default['RCWhiteBoardDataModel'].decode(itemData); | ||
| 15970 | - console.log(whiteBoardModelPdu); | ||
| 15971 | - loger.log(whiteBoardModelPdu); | ||
| 15972 | - return whiteBoardModelPdu; | ||
| 15973 | - } catch (err) { | ||
| 15974 | - console.log("tableUpdateHandler Pdu解析错误,itemIdx=" + itemIdx + " err:" + err.message); | ||
| 15975 | - } | ||
| 15976 | - return null; | ||
| 15977 | - } | 15933 | + }, { |
| 15934 | + key: 'packPdu', | ||
| 15935 | + value: function packPdu(_param, _itemIdx) { | ||
| 15936 | + /* required uint32 type= 1;//白板类型 | ||
| 15937 | + required uint32 id= 2;//id 每一次绘制的唯一标识 | ||
| 15938 | + required uint32 initiator=3; //绘制来自谁 | ||
| 15939 | + optional string pointGroup=4; //坐标点集数组的JSON字符串 | ||
| 15940 | + optional string color= 5 [default = "#000000"]; //颜色 | ||
| 15941 | + optional uint32 thickness= 6 ;//线条粗细 | ||
| 15942 | + optional uint32 radius= 7;//园的半径 | ||
| 15943 | + optional uint32 fontSize= 8;//字体大小 | ||
| 15944 | + optional uint32 fontName= 9;//字体名称 | ||
| 15945 | + optional uint32 text= 10;//文本内容*/ | ||
| 15946 | + | ||
| 15947 | + //验证坐标点集合数组是否合法 | ||
| 15948 | + if (_param.pointGroup == null || _param.pointGroup.length < 1) { | ||
| 15949 | + this._emit(_MessageTypes2.default.MCU_ERROR, _MessageTypes2.default.ERR_APE_INTERFACE_PARAM_WRONG); | ||
| 15950 | + return null; | ||
| 15951 | + } | ||
| 15952 | + //判断type类型,根据type设置不同的参数 | ||
| 15953 | + var whiteBoardModelPdu = new _pdus2.default['RCWhiteBoardDataModel'](); | ||
| 15954 | + switch (_param.type) { | ||
| 15955 | + case TYPE_BIGHT: | ||
| 15956 | + break; | ||
| 15957 | + case TYPE_LINE: | ||
| 15958 | + break; | ||
| 15959 | + case TYPE_RECT: | ||
| 15960 | + break; | ||
| 15961 | + case TYPE_CIRCLE: | ||
| 15962 | + whiteBoardModelPdu.radius = parseInt(_param.radius); | ||
| 15963 | + break; | ||
| 15964 | + case TYPE_TEXT: | ||
| 15965 | + whiteBoardModelPdu.fontSize = parseInt(_param.fontSize); | ||
| 15966 | + whiteBoardModelPdu.fontName = _param.fontName || null; | ||
| 15967 | + whiteBoardModelPdu.text = _param.text || null; | ||
| 15968 | + break; | ||
| 15969 | + default: | ||
| 15970 | + //其它类型不做处理 | ||
| 15971 | + return null; | ||
| 15972 | + break; | ||
| 15973 | + } | ||
| 15974 | + //下面4个是必须的参数 | ||
| 15975 | + whiteBoardModelPdu.type = _param.type; | ||
| 15976 | + whiteBoardModelPdu.itemIdx = _itemIdx; | ||
| 15977 | + whiteBoardModelPdu.initiator = _GlobalConfig2.default.nodeId; | ||
| 15978 | + whiteBoardModelPdu.parentId = _ApeConsts2.default.WHITEBOARD_OBJ_TABLE_ID; | ||
| 15979 | + whiteBoardModelPdu.pageNum = _param.pageNum || 1; | ||
| 15980 | + whiteBoardModelPdu.pointGroup = _EngineUtils2.default.arrayToJsonString(_param.pointGroup); | ||
| 15981 | + whiteBoardModelPdu.color = _param.color || "#000000"; | ||
| 15982 | + | ||
| 15983 | + return whiteBoardModelPdu; | ||
| 15984 | + } | ||
| 15985 | + }, { | ||
| 15986 | + key: 'unPackPdu', | ||
| 15987 | + value: function unPackPdu(owner, itemIdx, itemData) { | ||
| 15988 | + this.annoInfos[itemIdx] = itemData; | ||
| 15989 | + try { | ||
| 15990 | + console.log("白板收到数据===unPackPdu "); | ||
| 15991 | + var whiteBoardModelPdu = _pdus2.default['RCWhiteBoardDataModel'].decode(itemData); | ||
| 15992 | + //console.log(whiteBoardModelPdu); | ||
| 15993 | + loger.log(whiteBoardModelPdu); | ||
| 15994 | + return whiteBoardModelPdu; | ||
| 15995 | + } catch (err) { | ||
| 15996 | + console.log("unPackPdu Pdu解析错误,itemIdx=" + itemIdx + " err:" + err.message); | ||
| 15997 | + } | ||
| 15998 | + return null; | ||
| 15999 | + } | ||
| 15978 | 16000 | ||
| 15979 | - /////收到消息处理///////////////////////////////////////////////////////////////////////////////// | 16001 | + /////收到消息处理///////////////////////////////////////////////////////////////////////////////// |
| 15980 | 16002 | ||
| 15981 | - }, { | ||
| 15982 | - key: 'whiteboardMsgComingHandler', | ||
| 15983 | - value: function whiteboardMsgComingHandler(pdu) { | ||
| 15984 | - loger.warn('whiteboardMsgComingHandler needs to be handled.'); | ||
| 15985 | - var recordInfo = pdu['RCWhiteboardDataRequestPdu'].decode(pdu); | ||
| 15986 | - console.log("whiteboardMsgComingHandler"); | ||
| 15987 | - loger.log(recordInfo); | ||
| 15988 | - } | ||
| 15989 | - }, { | ||
| 15990 | - key: 'tableInsertHandler', | ||
| 15991 | - value: function tableInsertHandler(owner, itemIdx, itemData) { | ||
| 15992 | - /* try{ | ||
| 15993 | - console.log("白板收到数据===tableInsertHandler "); | ||
| 15994 | - let whiteBoardModelPdu= pdu['RCWhiteBoardDataModel'].decode(itemData); | ||
| 15995 | - this.annoInfos[itemIdx] = itemData; | ||
| 15996 | - console.log(whiteBoardModelPdu); | ||
| 15997 | - }catch (err){ | ||
| 15998 | - console.log("tableInsertHandler Pdu解析错误,itemIdx="+itemIdx+" err:"+err.message); | ||
| 15999 | - }*/ | ||
| 16000 | - var whiteBoardModel = this.unPackPdu(owner, itemIdx, itemData); | ||
| 16001 | - } | ||
| 16002 | - }, { | ||
| 16003 | - key: 'tableUpdateHandler', | ||
| 16004 | - value: function tableUpdateHandler(owner, itemIdx, itemData) { | ||
| 16005 | - var whiteBoardModel = this.unPackPdu(owner, itemIdx, itemData); | ||
| 16006 | - /* try{ | ||
| 16007 | - console.log("白板收到数据===tableUpdateHandler "); | ||
| 16008 | - let whiteBoardModelPdu= pdu['RCWhiteBoardDataModel'].decode(itemData); | ||
| 16009 | - this.annoInfos[itemIdx] = itemData; | ||
| 16010 | - console.log(whiteBoardModelPdu); | ||
| 16011 | - loger.log(whiteBoardModelPdu) | ||
| 16012 | - }catch (err){ | ||
| 16013 | - console.log("tableUpdateHandler Pdu解析错误,itemIdx="+itemIdx+" err:"+err.message); | ||
| 16014 | - }*/ | ||
| 16015 | - | ||
| 16016 | - /*const recordInfo = pdu['RCWhiteboardDataRequestPdu'].decode(recordData); | ||
| 16017 | - console.log("recordInfo"); | ||
| 16018 | - loger.log(recordInfo); | ||
| 16019 | - // 目前只处理 文档标注 | ||
| 16020 | - if (recordInfo.type == ApeConsts.WBA_DOC_ANNOTATION) { | ||
| 16021 | - const uncompressedBytes = new Zlib.Inflate(recordInfo.action.compact().view).decompress(); | ||
| 16022 | - const annoInfo = { | ||
| 16023 | - id: recordId, | ||
| 16024 | - svg: UTF8.getStringFromBytes(uncompressedBytes) | ||
| 16025 | - }; | ||
| 16026 | - loger.log(annoInfo); | ||
| 16027 | - this.annoInfos[recordId] = annoInfo; | ||
| 16028 | - this._emit(MessageTypes.WHITEBOARD_ANNOTATION_UPDATE, annoInfo); | ||
| 16029 | - } else { | ||
| 16030 | - loger.log('白板动作忽略,类型:', ApeConsts(recordInfo.type)); | ||
| 16031 | - }*/ | ||
| 16032 | - } | ||
| 16033 | - }, { | ||
| 16034 | - key: 'tableDeleteHandler', | ||
| 16035 | - value: function tableDeleteHandler(object_id, tableDeleteData) { | ||
| 16036 | - console.log("白板收到数据,tableDeleteHandler object_id=" + object_id); | ||
| 16037 | - if (this.annoInfos[object_id]) { | ||
| 16038 | - delete this.annoInfos[object_id]; | ||
| 16039 | - console.log("当前白板的数据:" + this.annoInfos); | ||
| 16040 | - } | ||
| 16041 | - } | ||
| 16042 | - }]); | 16003 | + }, { |
| 16004 | + key: 'whiteboardMsgComingHandler', | ||
| 16005 | + value: function whiteboardMsgComingHandler(pdu) { | ||
| 16006 | + loger.warn('whiteboardMsgComingHandler needs to be handled.'); | ||
| 16007 | + var recordInfo = pdu['RCWhiteboardDataRequestPdu'].decode(pdu); | ||
| 16008 | + loger.log("whiteboardMsgComingHandler", recordInfo); | ||
| 16009 | + } | ||
| 16010 | + }, { | ||
| 16011 | + key: 'tableInsertHandler', | ||
| 16012 | + value: function tableInsertHandler(owner, itemIdx, itemData) { | ||
| 16013 | + /* try{ | ||
| 16014 | + console.log("白板收到数据===tableInsertHandler "); | ||
| 16015 | + let whiteBoardModelPdu= pdu['RCWhiteBoardDataModel'].decode(itemData); | ||
| 16016 | + this.annoInfos[itemIdx] = itemData; | ||
| 16017 | + console.log(whiteBoardModelPdu); | ||
| 16018 | + }catch (err){ | ||
| 16019 | + console.log("tableInsertHandler Pdu解析错误,itemIdx="+itemIdx+" err:"+err.message); | ||
| 16020 | + }*/ | ||
| 16021 | + var whiteBoardModel = this.unPackPdu(owner, itemIdx, itemData); | ||
| 16022 | + loger.log('tableInsertHandler', whiteBoardModel); | ||
| 16023 | + } | ||
| 16024 | + }, { | ||
| 16025 | + key: 'tableUpdateHandler', | ||
| 16026 | + value: function tableUpdateHandler(owner, itemIdx, itemData) { | ||
| 16027 | + var whiteBoardModel = this.unPackPdu(owner, itemIdx, itemData); | ||
| 16028 | + loger.log('tableUpdateHandler', whiteBoardModel); | ||
| 16029 | + /* try{ | ||
| 16030 | + console.log("白板收到数据===tableUpdateHandler "); | ||
| 16031 | + let whiteBoardModelPdu= pdu['RCWhiteBoardDataModel'].decode(itemData); | ||
| 16032 | + this.annoInfos[itemIdx] = itemData; | ||
| 16033 | + console.log(whiteBoardModelPdu); | ||
| 16034 | + loger.log(whiteBoardModelPdu) | ||
| 16035 | + }catch (err){ | ||
| 16036 | + console.log("tableUpdateHandler Pdu解析错误,itemIdx="+itemIdx+" err:"+err.message); | ||
| 16037 | + }*/ | ||
| 16038 | + | ||
| 16039 | + /*const recordInfo = pdu['RCWhiteboardDataRequestPdu'].decode(recordData); | ||
| 16040 | + console.log("recordInfo"); | ||
| 16041 | + loger.log(recordInfo); | ||
| 16042 | + // 目前只处理 文档标注 | ||
| 16043 | + if (recordInfo.type == ApeConsts.WBA_DOC_ANNOTATION) { | ||
| 16044 | + const uncompressedBytes = new Zlib.Inflate(recordInfo.action.compact().view).decompress(); | ||
| 16045 | + const annoInfo = { | ||
| 16046 | + id: recordId, | ||
| 16047 | + svg: UTF8.getStringFromBytes(uncompressedBytes) | ||
| 16048 | + }; | ||
| 16049 | + loger.log(annoInfo); | ||
| 16050 | + this.annoInfos[recordId] = annoInfo; | ||
| 16051 | + this._emit(MessageTypes.WHITEBOARD_ANNOTATION_UPDATE, annoInfo); | ||
| 16052 | + } else { | ||
| 16053 | + loger.log('白板动作忽略,类型:', ApeConsts(recordInfo.type)); | ||
| 16054 | + }*/ | ||
| 16055 | + } | ||
| 16056 | + }, { | ||
| 16057 | + key: 'tableDeleteHandler', | ||
| 16058 | + value: function tableDeleteHandler(object_id, tableDeleteData) { | ||
| 16059 | + // console.log("白板收到数据,tableDeleteHandler object_id="+object_id);//((18<< 16) + 1)=1179649 | ||
| 16060 | + loger.log('tableDeleteHandler', object_id, tableDeleteData); //["tableDeleteHandler",1179649,{"type":231,"itemIdx":[1486301768]}] | ||
| 16061 | + if (tableDeleteData && tableDeleteData.itemIdx) { | ||
| 16062 | + var len = tableDeleteData.itemIdx.length; | ||
| 16063 | + var itemIdxs = tableDeleteData.itemIdx; | ||
| 16064 | + for (var i = 0; i < len; i++) { | ||
| 16065 | + if (this.annoInfos[itemIdxs[i]]) { | ||
| 16066 | + delete this.annoInfos[itemIdxs[i]]; | ||
| 16067 | + loger.log("删除白板数据:", itemIdxs[i], "当前剩余的白板数据", this.annoInfos); | ||
| 16068 | + } | ||
| 16069 | + } | ||
| 16070 | + } | ||
| 16071 | + } | ||
| 16072 | + }]); | ||
| 16043 | 16073 | ||
| 16044 | - return WhiteBoardApe; | 16074 | + return WhiteBoardApe; |
| 16045 | }(_Ape3.default); | 16075 | }(_Ape3.default); |
| 16046 | 16076 | ||
| 16047 | var _default = WhiteBoardApe; | 16077 | var _default = WhiteBoardApe; |
| @@ -16049,27 +16079,27 @@ return /******/ (function(modules) { // webpackBootstrap | @@ -16049,27 +16079,27 @@ return /******/ (function(modules) { // webpackBootstrap | ||
| 16049 | ; | 16079 | ; |
| 16050 | 16080 | ||
| 16051 | var _temp = function () { | 16081 | var _temp = function () { |
| 16052 | - if (typeof __REACT_HOT_LOADER__ === 'undefined') { | ||
| 16053 | - return; | ||
| 16054 | - } | 16082 | + if (typeof __REACT_HOT_LOADER__ === 'undefined') { |
| 16083 | + return; | ||
| 16084 | + } | ||
| 16055 | 16085 | ||
| 16056 | - __REACT_HOT_LOADER__.register(loger, 'loger', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); | 16086 | + __REACT_HOT_LOADER__.register(loger, 'loger', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); |
| 16057 | 16087 | ||
| 16058 | - __REACT_HOT_LOADER__.register(itemIdx, 'itemIdx', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); | 16088 | + __REACT_HOT_LOADER__.register(itemIdx, 'itemIdx', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); |
| 16059 | 16089 | ||
| 16060 | - __REACT_HOT_LOADER__.register(TYPE_BIGHT, 'TYPE_BIGHT', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); | 16090 | + __REACT_HOT_LOADER__.register(TYPE_BIGHT, 'TYPE_BIGHT', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); |
| 16061 | 16091 | ||
| 16062 | - __REACT_HOT_LOADER__.register(TYPE_LINE, 'TYPE_LINE', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); | 16092 | + __REACT_HOT_LOADER__.register(TYPE_LINE, 'TYPE_LINE', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); |
| 16063 | 16093 | ||
| 16064 | - __REACT_HOT_LOADER__.register(TYPE_RECT, 'TYPE_RECT', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); | 16094 | + __REACT_HOT_LOADER__.register(TYPE_RECT, 'TYPE_RECT', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); |
| 16065 | 16095 | ||
| 16066 | - __REACT_HOT_LOADER__.register(TYPE_CIRCLE, 'TYPE_CIRCLE', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); | 16096 | + __REACT_HOT_LOADER__.register(TYPE_CIRCLE, 'TYPE_CIRCLE', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); |
| 16067 | 16097 | ||
| 16068 | - __REACT_HOT_LOADER__.register(TYPE_TEXT, 'TYPE_TEXT', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); | 16098 | + __REACT_HOT_LOADER__.register(TYPE_TEXT, 'TYPE_TEXT', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); |
| 16069 | 16099 | ||
| 16070 | - __REACT_HOT_LOADER__.register(WhiteBoardApe, 'WhiteBoardApe', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); | 16100 | + __REACT_HOT_LOADER__.register(WhiteBoardApe, 'WhiteBoardApe', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); |
| 16071 | 16101 | ||
| 16072 | - __REACT_HOT_LOADER__.register(_default, 'default', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); | 16102 | + __REACT_HOT_LOADER__.register(_default, 'default', 'D:/work/McuClient/src/apes/WhiteBoardApe.js'); |
| 16073 | }(); | 16103 | }(); |
| 16074 | 16104 | ||
| 16075 | ; | 16105 | ; |
| @@ -707,7 +707,7 @@ client.sendChatMsg(paramInfo); | @@ -707,7 +707,7 @@ client.sendChatMsg(paramInfo); | ||
| 707 | 707 | ||
| 708 | <p>示例代码</p> | 708 | <p>示例代码</p> |
| 709 | 709 | ||
| 710 | -<pre><code> client.on(MessageTypes.DOC_DEL,function(callbackData){ | 710 | +<pre><code> client.on(MessageTypes.DOC_DELETE,function(callbackData){ |
| 711 | //..... | 711 | //..... |
| 712 | }); | 712 | }); |
| 713 | </code></pre> | 713 | </code></pre> |
| @@ -375,7 +375,7 @@ client初始化成功之后,加入会议。 | @@ -375,7 +375,7 @@ client初始化成功之后,加入会议。 | ||
| 375 | ### 删除文档 事件回调 ### | 375 | ### 删除文档 事件回调 ### |
| 376 | 示例代码 | 376 | 示例代码 |
| 377 | 377 | ||
| 378 | - client.on(MessageTypes.DOC_DEL,function(callbackData){ | 378 | + client.on(MessageTypes.DOC_DELETE,function(callbackData){ |
| 379 | //..... | 379 | //..... |
| 380 | }); | 380 | }); |
| 381 | 381 |
| @@ -765,7 +765,7 @@ client.sendChatMsg(paramInfo); | @@ -765,7 +765,7 @@ client.sendChatMsg(paramInfo); | ||
| 765 | 765 | ||
| 766 | <p>示例代码</p> | 766 | <p>示例代码</p> |
| 767 | 767 | ||
| 768 | -<pre><code> client.on(MessageTypes.DOC_DEL,function(callbackData){ | 768 | +<pre><code> client.on(MessageTypes.DOC_DELETE,function(callbackData){ |
| 769 | //..... | 769 | //..... |
| 770 | }); | 770 | }); |
| 771 | </code></pre> | 771 | </code></pre> |
| @@ -432,7 +432,7 @@ client初始化成功之后,加入会议。 | @@ -432,7 +432,7 @@ client初始化成功之后,加入会议。 | ||
| 432 | ### 删除文档 事件回调 ### | 432 | ### 删除文档 事件回调 ### |
| 433 | 示例代码 | 433 | 示例代码 |
| 434 | 434 | ||
| 435 | - client.on(MessageTypes.DOC_DEL,function(callbackData){ | 435 | + client.on(MessageTypes.DOC_DELETE,function(callbackData){ |
| 436 | //..... | 436 | //..... |
| 437 | }); | 437 | }); |
| 438 | 438 |
不能预览此文件类型
| @@ -81,7 +81,7 @@ export default class MessageEntrance extends Emiter { | @@ -81,7 +81,7 @@ export default class MessageEntrance extends Emiter { | ||
| 81 | _doc_ape = new DocApe(); | 81 | _doc_ape = new DocApe(); |
| 82 | _doc_ape.on('*', (type, data) => this._emit(type, data)); | 82 | _doc_ape.on('*', (type, data) => this._emit(type, data)); |
| 83 | _doc_ape.on(MessageTypes.DOC_UPDATE, this.docUpdateHandler.bind(this)); | 83 | _doc_ape.on(MessageTypes.DOC_UPDATE, this.docUpdateHandler.bind(this)); |
| 84 | - _doc_ape.on(MessageTypes.DOC_DEL, this.docDeleteHandler.bind(this)); | 84 | + _doc_ape.on(MessageTypes.DOC_DELETE, this.docDeleteHandler.bind(this)); |
| 85 | 85 | ||
| 86 | 86 | ||
| 87 | _whiteboard_ape = new WhiteBoardApe(); | 87 | _whiteboard_ape = new WhiteBoardApe(); |
| @@ -308,6 +308,7 @@ export default class MessageEntrance extends Emiter { | @@ -308,6 +308,7 @@ export default class MessageEntrance extends Emiter { | ||
| 308 | } | 308 | } |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | + | ||
| 311 | //WhiteBoardApe | 312 | //WhiteBoardApe |
| 312 | // 添加标注,发送信息 | 313 | // 添加标注,发送信息 |
| 313 | _sendInsertAnnotaion(_param){ | 314 | _sendInsertAnnotaion(_param){ |
| @@ -376,7 +377,7 @@ export default class MessageEntrance extends Emiter { | @@ -376,7 +377,7 @@ export default class MessageEntrance extends Emiter { | ||
| 376 | //文档删除 | 377 | //文档删除 |
| 377 | docDeleteHandler(docItem){ | 378 | docDeleteHandler(docItem){ |
| 378 | if (docItem.id == _confer_ape.activeDocId) { | 379 | if (docItem.id == _confer_ape.activeDocId) { |
| 379 | - this._emit(MessageTypes.DOC_DEL, docItem); | 380 | + this._emit(MessageTypes.DOC_DELETE, docItem); |
| 380 | } | 381 | } |
| 381 | } | 382 | } |
| 382 | } | 383 | } |
| @@ -39,9 +39,11 @@ MessageTypes.VIDEO_RECEIVE = 'video.receive'; | @@ -39,9 +39,11 @@ MessageTypes.VIDEO_RECEIVE = 'video.receive'; | ||
| 39 | 39 | ||
| 40 | //文档模块事件定义 | 40 | //文档模块事件定义 |
| 41 | MessageTypes.DOC_SHOW = 'document.show'; | 41 | MessageTypes.DOC_SHOW = 'document.show'; |
| 42 | -MessageTypes.DOC_SWITCH = 'document.switch'; | ||
| 43 | -MessageTypes.DOC_UPDATE = 'document.update'; | ||
| 44 | -MessageTypes.DOC_DEL='document.delete'; | 42 | +MessageTypes.DOC_UPLOAD='document.upload';//上传文档 |
| 43 | +MessageTypes.DOC_COMMAND='document.command';//操作文档 | ||
| 44 | +MessageTypes.DOC_SWITCH = 'document.switch';//切换文档 | ||
| 45 | +MessageTypes.DOC_UPDATE = 'document.update';//更新文档 | ||
| 46 | +MessageTypes.DOC_DELETE='document.delete';//删除文档 | ||
| 45 | MessageTypes.DOC_ANNOTATION = 'document.annotation';//笔记 | 47 | MessageTypes.DOC_ANNOTATION = 'document.annotation';//笔记 |
| 46 | 48 | ||
| 47 | //笔记事件定义 | 49 | //笔记事件定义 |
| @@ -164,7 +164,7 @@ export default class Ape extends Emiter { | @@ -164,7 +164,7 @@ export default class Ape extends Emiter { | ||
| 164 | break; | 164 | break; |
| 165 | case pdu.RCPDU_REG_TABLE_DELETE_PDU: | 165 | case pdu.RCPDU_REG_TABLE_DELETE_PDU: |
| 166 | let tableDeleteData = pdu['RCRegistryTableDeleteItemPdu'].decode(user_data); | 166 | let tableDeleteData = pdu['RCRegistryTableDeleteItemPdu'].decode(user_data); |
| 167 | - console.log("tableDeleteData",object_id,tableDeleteData); | 167 | + //console.log("tableDeleteData",object_id,tableDeleteData); |
| 168 | this.tableDeleteHandler(object_id, tableDeleteData); | 168 | this.tableDeleteHandler(object_id, tableDeleteData); |
| 169 | break; | 169 | break; |
| 170 | case pdu.RCPDU_REG_TABLE_UPDATE_PDU: | 170 | case pdu.RCPDU_REG_TABLE_UPDATE_PDU: |
| @@ -342,5 +342,29 @@ export default class Ape extends Emiter { | @@ -342,5 +342,29 @@ export default class Ape extends Emiter { | ||
| 342 | // Mcu发送 | 342 | // Mcu发送 |
| 343 | this.mcu.send(uniformPdu); | 343 | this.mcu.send(uniformPdu); |
| 344 | } | 344 | } |
| 345 | + | ||
| 346 | + sendChatUniform(appPdu, top) { | ||
| 347 | + loger.log('Ape发送数据UNIFORM PDU', appPdu); | ||
| 348 | + loger.log('当前的状态============',GlobalConfig.getCurrentStatus().code); | ||
| 349 | + if(GlobalConfig.getCurrentStatus().code==0||GlobalConfig.getCurrentStatus().code==1){ | ||
| 350 | + this._emit(MessageTypes.MCU_ERROR,MessageTypes.ERR_APE_SEND_FAILED_NO_JOIN); | ||
| 351 | + return; | ||
| 352 | + } | ||
| 353 | + | ||
| 354 | + let uniformPdu = pdu.create_uniform_pdu( | ||
| 355 | + appPdu.type, | ||
| 356 | + this._confInfo.nodeId, | ||
| 357 | + this._confInfo.confId, | ||
| 358 | + this._session_id, | ||
| 359 | + top ? ApeConsts.BROADCAST_CHANNEL_ID : this._channel_id, | ||
| 360 | + true, | ||
| 361 | + PduConsts.DP_TOP, | ||
| 362 | + 0,//flash中这个值设置为0 | ||
| 363 | + PduConsts.SEG_ONCE | ||
| 364 | + ); | ||
| 365 | + uniformPdu.data = appPdu.toArrayBuffer(); | ||
| 366 | + // Mcu发送 | ||
| 367 | + this.mcu.send(uniformPdu); | ||
| 368 | + } | ||
| 345 | } | 369 | } |
| 346 | 370 |
| @@ -55,17 +55,21 @@ class ChatApe extends Ape { | @@ -55,17 +55,21 @@ class ChatApe extends Ape { | ||
| 55 | chatSendPdu.type = pdu.RCPDU_CHAT_SEND_DATA_REQUEST; | 55 | chatSendPdu.type = pdu.RCPDU_CHAT_SEND_DATA_REQUEST; |
| 56 | chatSendPdu.initiator = this._confInfo.nodeId;//发起人 | 56 | chatSendPdu.initiator = this._confInfo.nodeId;//发起人 |
| 57 | chatSendPdu.peer = parseInt(_messageInfo.to);//发送给谁,公聊的时候是0,私聊的时候是指定的用户id | 57 | chatSendPdu.peer = parseInt(_messageInfo.to);//发送给谁,公聊的时候是0,私聊的时候是指定的用户id |
| 58 | - chatSendPdu.isPublic = true; | 58 | + |
| 59 | chatSendPdu.userData = this._rCArrayBufferUtil.strToUint8Array("h5" + _messageInfo.message); | 59 | chatSendPdu.userData = this._rCArrayBufferUtil.strToUint8Array("h5" + _messageInfo.message); |
| 60 | chatSendPdu.fromName = this._rCArrayBufferUtil.strToUint8Array("h5" + this._confInfo.userName); | 60 | chatSendPdu.fromName = this._rCArrayBufferUtil.strToUint8Array("h5" + this._confInfo.userName); |
| 61 | chatSendPdu.fromRole = this._confInfo.classRole; | 61 | chatSendPdu.fromRole = this._confInfo.classRole; |
| 62 | - | ||
| 63 | - if (!(chatSendPdu.isPublic || 0 === chatSendPdu.peer)) { | 62 | + chatSendPdu.isPublic = true; |
| 63 | + // if (!(chatSendPdu.isPublic || 0 === chatSendPdu.peer)) { | ||
| 64 | + if (!chatSendPdu && 0!=chatSendPdu.peer) { | ||
| 64 | //发送给制定的人 | 65 | //发送给制定的人 |
| 66 | + loger.log('发送私聊消息.'); | ||
| 65 | this.send(chatSendPdu); | 67 | this.send(chatSendPdu); |
| 66 | } else { | 68 | } else { |
| 67 | //发送给所有人 | 69 | //发送给所有人 |
| 68 | - this.sendUniform(chatSendPdu); | 70 | + loger.log('发送公聊消息.'); |
| 71 | + //this.sendUniform(chatSendPdu); | ||
| 72 | + this.sendChatUniform(chatSendPdu); | ||
| 69 | } | 73 | } |
| 70 | } | 74 | } |
| 71 | 75 |
| @@ -48,7 +48,7 @@ class DocApe extends Ape { | @@ -48,7 +48,7 @@ class DocApe extends Ape { | ||
| 48 | tableDeleteHandler(itemIdx, itemData){ | 48 | tableDeleteHandler(itemIdx, itemData){ |
| 49 | /*const re={}; | 49 | /*const re={}; |
| 50 | re.type=ApeConsts.DOCUMENT_DEL; | 50 | re.type=ApeConsts.DOCUMENT_DEL; |
| 51 | - this._emit(MessageTypes.DOC_DEL, re);*/ | 51 | + this._emit(MessageTypes.DOC_DELETE, re);*/ |
| 52 | 52 | ||
| 53 | } | 53 | } |
| 54 | tableUpdateHandler(owner, itemIdx, itemData) { | 54 | tableUpdateHandler(owner, itemIdx, itemData) { |
| @@ -47,11 +47,11 @@ class VideoChat extends Ape { | @@ -47,11 +47,11 @@ class VideoChat extends Ape { | ||
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | //获取播流地址 | 49 | //获取播流地址 |
| 50 | - playVideoPath(_param){ | 50 | + getPlayVideoPath(_param){ |
| 51 | return {"code":0,"data":"播放流地址XXXXXXXXXXXXXXXXXXXXX"}; | 51 | return {"code":0,"data":"播放流地址XXXXXXXXXXXXXXXXXXXXX"}; |
| 52 | } | 52 | } |
| 53 | //获取推流地址 | 53 | //获取推流地址 |
| 54 | - publishVideoPath(_param){ | 54 | + getPublishVideoPath(_param){ |
| 55 | return {"code":0,"data":"推流地址XXXXXXXXXXXXXXXXXXXXXXX"}; | 55 | return {"code":0,"data":"推流地址XXXXXXXXXXXXXXXXXXXXXXX"}; |
| 56 | } | 56 | } |
| 57 | 57 |
| @@ -262,7 +262,7 @@ class WhiteBoardApe extends Ape { | @@ -262,7 +262,7 @@ class WhiteBoardApe extends Ape { | ||
| 262 | whiteBoardModelPdu.itemIdx =_itemIdx; | 262 | whiteBoardModelPdu.itemIdx =_itemIdx; |
| 263 | whiteBoardModelPdu.initiator =GlobalConfig.nodeId; | 263 | whiteBoardModelPdu.initiator =GlobalConfig.nodeId; |
| 264 | whiteBoardModelPdu.parentId=ApeConsts.WHITEBOARD_OBJ_TABLE_ID; | 264 | whiteBoardModelPdu.parentId=ApeConsts.WHITEBOARD_OBJ_TABLE_ID; |
| 265 | - | 265 | + whiteBoardModelPdu.pageNum=_param.pageNum||1; |
| 266 | whiteBoardModelPdu.pointGroup =EngineUtils.arrayToJsonString(_param.pointGroup); | 266 | whiteBoardModelPdu.pointGroup =EngineUtils.arrayToJsonString(_param.pointGroup); |
| 267 | whiteBoardModelPdu.color=_param.color||"#000000"; | 267 | whiteBoardModelPdu.color=_param.color||"#000000"; |
| 268 | 268 | ||
| @@ -271,13 +271,13 @@ class WhiteBoardApe extends Ape { | @@ -271,13 +271,13 @@ class WhiteBoardApe extends Ape { | ||
| 271 | unPackPdu(owner, itemIdx,itemData){ | 271 | unPackPdu(owner, itemIdx,itemData){ |
| 272 | this.annoInfos[itemIdx] = itemData; | 272 | this.annoInfos[itemIdx] = itemData; |
| 273 | try{ | 273 | try{ |
| 274 | - console.log("白板收到数据===tableUpdateHandler "); | 274 | + console.log("白板收到数据===unPackPdu "); |
| 275 | let whiteBoardModelPdu= pdu['RCWhiteBoardDataModel'].decode(itemData); | 275 | let whiteBoardModelPdu= pdu['RCWhiteBoardDataModel'].decode(itemData); |
| 276 | - console.log(whiteBoardModelPdu); | 276 | + //console.log(whiteBoardModelPdu); |
| 277 | loger.log(whiteBoardModelPdu); | 277 | loger.log(whiteBoardModelPdu); |
| 278 | return whiteBoardModelPdu; | 278 | return whiteBoardModelPdu; |
| 279 | }catch (err){ | 279 | }catch (err){ |
| 280 | - console.log("tableUpdateHandler Pdu解析错误,itemIdx="+itemIdx+" err:"+err.message); | 280 | + console.log("unPackPdu Pdu解析错误,itemIdx="+itemIdx+" err:"+err.message); |
| 281 | } | 281 | } |
| 282 | return null; | 282 | return null; |
| 283 | } | 283 | } |
| @@ -286,8 +286,7 @@ class WhiteBoardApe extends Ape { | @@ -286,8 +286,7 @@ class WhiteBoardApe extends Ape { | ||
| 286 | whiteboardMsgComingHandler(pdu) { | 286 | whiteboardMsgComingHandler(pdu) { |
| 287 | loger.warn('whiteboardMsgComingHandler needs to be handled.'); | 287 | loger.warn('whiteboardMsgComingHandler needs to be handled.'); |
| 288 | const recordInfo = pdu['RCWhiteboardDataRequestPdu'].decode(pdu); | 288 | const recordInfo = pdu['RCWhiteboardDataRequestPdu'].decode(pdu); |
| 289 | - console.log("whiteboardMsgComingHandler"); | ||
| 290 | - loger.log(recordInfo); | 289 | + loger.log("whiteboardMsgComingHandler",recordInfo); |
| 291 | } | 290 | } |
| 292 | 291 | ||
| 293 | tableInsertHandler(owner, itemIdx,itemData) { | 292 | tableInsertHandler(owner, itemIdx,itemData) { |
| @@ -300,10 +299,12 @@ class WhiteBoardApe extends Ape { | @@ -300,10 +299,12 @@ class WhiteBoardApe extends Ape { | ||
| 300 | console.log("tableInsertHandler Pdu解析错误,itemIdx="+itemIdx+" err:"+err.message); | 299 | console.log("tableInsertHandler Pdu解析错误,itemIdx="+itemIdx+" err:"+err.message); |
| 301 | }*/ | 300 | }*/ |
| 302 | let whiteBoardModel=this.unPackPdu(owner, itemIdx,itemData); | 301 | let whiteBoardModel=this.unPackPdu(owner, itemIdx,itemData); |
| 302 | + loger.log('tableInsertHandler',whiteBoardModel); | ||
| 303 | } | 303 | } |
| 304 | 304 | ||
| 305 | tableUpdateHandler(owner, itemIdx, itemData) { | 305 | tableUpdateHandler(owner, itemIdx, itemData) { |
| 306 | let whiteBoardModel=this.unPackPdu(owner, itemIdx,itemData); | 306 | let whiteBoardModel=this.unPackPdu(owner, itemIdx,itemData); |
| 307 | + loger.log('tableUpdateHandler',whiteBoardModel); | ||
| 307 | /* try{ | 308 | /* try{ |
| 308 | console.log("白板收到数据===tableUpdateHandler "); | 309 | console.log("白板收到数据===tableUpdateHandler "); |
| 309 | let whiteBoardModelPdu= pdu['RCWhiteBoardDataModel'].decode(itemData); | 310 | let whiteBoardModelPdu= pdu['RCWhiteBoardDataModel'].decode(itemData); |
| @@ -333,10 +334,17 @@ class WhiteBoardApe extends Ape { | @@ -333,10 +334,17 @@ class WhiteBoardApe extends Ape { | ||
| 333 | }*/ | 334 | }*/ |
| 334 | } | 335 | } |
| 335 | tableDeleteHandler(object_id, tableDeleteData){ | 336 | tableDeleteHandler(object_id, tableDeleteData){ |
| 336 | - console.log("白板收到数据,tableDeleteHandler object_id="+object_id); | ||
| 337 | - if(this.annoInfos[object_id]){ | ||
| 338 | - delete this.annoInfos[object_id]; | ||
| 339 | - console.log("当前白板的数据:"+this.annoInfos); | 337 | + // console.log("白板收到数据,tableDeleteHandler object_id="+object_id);//((18<< 16) + 1)=1179649 |
| 338 | + loger.log('tableDeleteHandler',object_id,tableDeleteData);//["tableDeleteHandler",1179649,{"type":231,"itemIdx":[1486301768]}] | ||
| 339 | + if(tableDeleteData&&tableDeleteData.itemIdx){ | ||
| 340 | + let len=tableDeleteData.itemIdx.length; | ||
| 341 | + let itemIdxs=tableDeleteData.itemIdx; | ||
| 342 | + for (let i=0;i<len;i++){ | ||
| 343 | + if(this.annoInfos[itemIdxs[i]]){ | ||
| 344 | + delete this.annoInfos[itemIdxs[i]]; | ||
| 345 | + loger.log("删除白板数据:",itemIdxs[i],"当前剩余的白板数据",this.annoInfos); | ||
| 346 | + } | ||
| 347 | + } | ||
| 340 | } | 348 | } |
| 341 | } | 349 | } |
| 342 | } | 350 | } |
| @@ -834,13 +834,15 @@ message RCWhiteBoardDataModel { | @@ -834,13 +834,15 @@ message RCWhiteBoardDataModel { | ||
| 834 | required uint32 itemIdx= 2;//itemIdx 每一次绘制的唯一标识 | 834 | required uint32 itemIdx= 2;//itemIdx 每一次绘制的唯一标识 |
| 835 | required uint32 initiator=3; //绘制来自谁 | 835 | required uint32 initiator=3; //绘制来自谁 |
| 836 | required uint32 parentId=4; //父级的id | 836 | required uint32 parentId=4; //父级的id |
| 837 | - optional string pointGroup=5; //坐标点集数组的JSON字符串 | ||
| 838 | - optional string color=6 [default = "#000000"]; //颜色 | ||
| 839 | - optional uint32 thickness= 7 ;//线条粗细 | ||
| 840 | - optional uint32 radius= 8;//园的半径 | ||
| 841 | - optional uint32 fontSize= 9;//字体大小 | ||
| 842 | - optional string fontName= 10;//字体名称 | ||
| 843 | - optional string text= 11;//文本内容 | 837 | + required uint32 pageNum= 5;//页码 |
| 838 | + optional string pointGroup=6; //坐标点集数组的JSON字符串 | ||
| 839 | + optional string color=7 [default = "#000000"]; //颜色 | ||
| 840 | + optional uint32 thickness= 8 ;//线条粗细 | ||
| 841 | + optional uint32 radius= 9;//园的半径 | ||
| 842 | + optional uint32 fontSize= 10;//字体大小 | ||
| 843 | + optional string fontName= 11;//字体名称 | ||
| 844 | + optional string text= 12;//文本内容 | ||
| 845 | + optional bytes data = 13;//暂时预留的参数 | ||
| 844 | } | 846 | } |
| 845 | 847 | ||
| 846 | 848 |
-
请 注册 或 登录 后发表评论