修改delivery和acked的格式，补全windowssdk的空位

mingyewei · Jul 10, 2017 · 1dcfa5f · 1dcfa5f
1 parent ad6f949
commit 1dcfa5f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/demo/javascript/src/api.js b/demo/javascript/src/api.js
@@ -351,6 +351,10 @@ module.exports = {
     },
 
     sendRead: function (message) {
+        // TODO: Window SDK
+        if (WebIM.config.isWindowSDK) {
+
+        }
         if (!WebIM.config.read)
             return;
         // 阅读消息时反馈一个已阅读

diff --git a/demo/javascript/src/components/chat/chat.js b/demo/javascript/src/components/chat/chat.js
@@ -301,6 +301,10 @@ module.exports = React.createClass({
                 }
             },
             onDeliveredMessage: function (message) {
+                // TODO: Window SDK
+                if (WebIM.config.isWindowSDK) {
+
+                }
                 var msg = document.getElementsByName(message.mid);
                 // 记录消息的状态
                 for (var targetId in Demo.chatRecord) {
@@ -315,6 +319,10 @@ module.exports = React.createClass({
                 }
             },
             onReadMessage: function (message) {
+                // TODO: Window SDK
+                if (WebIM.config.isWindowSDK) {
+
+                }
                 var msg = document.getElementsByName(message.mid);
                 if (msg) {
                     if (msg[0]) {

diff --git a/sdk/src/message.js b/sdk/src/message.js
@@ -269,20 +269,28 @@ var CryptoJS = require('crypto-js');
                 dom.up().c('roomtype', {xmlns: 'easemob:x:roomtype', type: 'chatroom'});
             }
             if (message.bodyId) {
-                dom.up().c('body').t(message.bodyId);
+                dom = $msg({
+                    to: message.toJid
+                    , id: message.id
+                    , xmlns: 'jabber:client'
+                }).c('body').t(message.bodyId);
                 var delivery = {
                     xmlns: 'urn:xmpp:receipts'
                     , id: message.bodyId
                 };
-                dom.up().c('delivery').t(_utils.stringify(delivery));
+                dom.up().c('delivery', delivery);
             }
             if (message.ackId) {
-                dom.up().c('body').t(message.ackId);
+                dom = $msg({
+                    to: message.toJid
+                    , id: message.id
+                    , xmlns: 'jabber:client'
+                }).c('body').t(message.ackId);
                 var read = {
                     xmlns: 'urn:xmpp:receipts'
                     , id: message.ackId
                 };
-                dom.up().c('acked').t(_utils.stringify(read));
+                dom.up().c('acked', read);
             }
 
             setTimeout(function () {