From 4f6c1f8a72e35ab191a9de40cc03c021a81d8ed6 Mon Sep 17 00:00:00 2001
From: zhangdong <973849793@qq.com>
Date: Mon, 22 Jul 2019 14:59:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BBlog=20+=20=E6=94=B6=E5=88=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo/src/components/chat/ChatMessage.js | 6 +++++-
 demo/src/redux/MessageRedux.js          | 1 -
 demo/src/redux/WebIMRedux.js            | 2 +-
 demo/src/utils/AppDB.js                 | 3 +--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/demo/src/components/chat/ChatMessage.js b/demo/src/components/chat/ChatMessage.js
index a2ca0b11..2dfd95fe 100644
--- a/demo/src/components/chat/ChatMessage.js
+++ b/demo/src/components/chat/ChatMessage.js
@@ -48,11 +48,15 @@ export default ({ bySelf, from, time, body, status, id, toJid, to, ok, type, ...
     const localFormat = renderTime(time)
 
     let content = null
+    
     function oncontextmenu(toJid){
+        if(!toJid){
+            return message.error('撤回失败')
+        }
         WebIM.conn.recallMessage({
             to: to,
             mid: toJid,
-            group: type,
+            type: type,
             success: function(){
                 ok(id)
             },
diff --git a/demo/src/redux/MessageRedux.js b/demo/src/redux/MessageRedux.js
index 7c786fdc..58e9a72c 100644
--- a/demo/src/redux/MessageRedux.js
+++ b/demo/src/redux/MessageRedux.js
@@ -587,7 +587,6 @@ export const updateMessageStatus = (state, { message, status = "" }) => {
     let mids = state.getIn([ "byMid" ])||{}
     let mid
     for( var i in mids){
-        console.log('ii',i)
         if(mids[i].id == id){
             mid = i
         }
diff --git a/demo/src/redux/WebIMRedux.js b/demo/src/redux/WebIMRedux.js
index f5e853bb..119e6ea3 100644
--- a/demo/src/redux/WebIMRedux.js
+++ b/demo/src/redux/WebIMRedux.js
@@ -256,9 +256,9 @@ WebIM.conn.listen({
         logger.info("onReceivedMessage", message)
         const { id, mid } = message
         store.dispatch(MessageActions.updateMessageMid(id, mid))
+        store.dispatch(MessageActions.updateMessageStatus(message, "sent"))
     },
     onRecallMessage: message => {
-        console.log("撤回消息", message)
         store.dispatch(MessageActions.deleteMessage(message)) 
         logger.info("onRecallMessage", message)
     },
diff --git a/demo/src/utils/AppDB.js b/demo/src/utils/AppDB.js
index 55c0cf82..9b44fd89 100644
--- a/demo/src/utils/AppDB.js
+++ b/demo/src/utils/AppDB.js
@@ -103,7 +103,6 @@ const AppDB = {
     },
 
     deleteMessage(id){
-        console.log('ddddd', id)
         const $_TABLE = this.$_TABLE
         return this.exec(resolve => {
             $_TABLE.where("id")
@@ -120,7 +119,7 @@ const AppDB = {
                     $_TABLE.where("id")
                         .equals(id)
                         .modify({ "toJid": mid })
-                        .then(res => console.log('res',res))
+                        .then(res => {})
                 })
         }, 1000)