diff --git a/hs-im-server/im-tcp/im-tcp.iml b/hs-im-server/im-tcp/im-tcp.iml index 6cf5908..40defed 100644 --- a/hs-im-server/im-tcp/im-tcp.iml +++ b/hs-im-server/im-tcp/im-tcp.iml @@ -7,6 +7,7 @@ + diff --git a/lim-ts-sdk-master/lim-ts-sdk/src/lim/core/ImClient.ts b/lim-ts-sdk-master/lim-ts-sdk/src/lim/core/ImClient.ts index 518c934..4a3c4ba 100644 --- a/lim-ts-sdk-master/lim-ts-sdk/src/lim/core/ImClient.ts +++ b/lim-ts-sdk-master/lim-ts-sdk/src/lim/core/ImClient.ts @@ -123,7 +123,7 @@ export class ImClient { this.url = "wss://" + ip + "/hs_ws"; } - + } var req = new LoginPack(self.appId, self.userId, 1); @@ -296,7 +296,7 @@ export class ImClient { resolve(resp); }) } - + public getUserSequence(): Promise { return new Promise((resolve, _) => { let api = new HttpApi(this.httpUrl); @@ -304,8 +304,8 @@ export class ImClient { resolve(resp); }) } - - + + public getUserConversationList(lastSequence:Long): Promise { return new Promise((resolve, _) => { let api = new HttpApi(this.httpUrl); @@ -372,8 +372,8 @@ export class ImClient { this.conn.send(p2pPack.pack(false)); } } - - + + // 消息接收ack public sendP2PMessageReciveAck (rAck: any) { console.log("=============== sendP2PMessageReciveAck") @@ -382,11 +382,12 @@ export class ImClient { rAck.fromId = this.userId; console.log(rAck) - - let p2pPack_1107 = imClient.buildMessagePack(MessageCommand.MSG_RECIVE_ACK, rAck); + + + let p2pPack_1107 = imClient.buildMessagePack(MessageCommand.MSG_RECIVE_ACK, rAck);// 1107 rAck.conversationType=0 - let p2pPack_1106 = imClient.buildMessagePack(MessageCommand.MSG_READED, rAck); - let p2pPack_1054 = imClient.buildMessagePack(MessageCommand.MSG_READED_RECEIPT, rAck); + let p2pPack_1106 = imClient.buildMessagePack(MessageCommand.MSG_READED, rAck); // 1106 + let p2pPack_1054 = imClient.buildMessagePack(MessageCommand.MSG_READED_RECEIPT, rAck); // 1054 if (this.conn) { @@ -406,12 +407,12 @@ export class ImClient { rAck.fromId = this.userId; console.log(rAck) - + let p2pPack = imClient.buildMessagePack(MessageCommand.MSG_READED_RECEIPT, rAck); if (this.conn) { console.log("=============== sendP2PMessageReadedRECEIPT 正式开始发送已读回执") this.conn.send(p2pPack.pack(false)); - } + } } @@ -419,7 +420,7 @@ export class ImClient { return this.userId; } - //拉取离线信息记录 + //拉取离线信息记录 private async loadOfflineMessage() { log.info("loadOfflineMessage start") let api = new HttpApi(this.httpUrl);