@aochuang/client-sdk 1.0.291 → 1.0.293

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.291",
+  "version": "1.0.293",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/services/client-chat/client-chat-wechat/client-chat-concats.js

@@ -861,7 +861,7 @@ export default class ClientChatContacts {
 	// 一般用在切换群的时候，把前一次的群缓存的数据清理一下，避免占用内存
 	clearRoomMemberData (roomId) {
 		this.setRoomMemberData(roomId, null)
-		if (this.loadRoomMemberDataPromiseMap[roomId]) {
+		if (this.loadRoomMemberDataPromiseMap && this.loadRoomMemberDataPromiseMap[roomId]) {
 			delete this.loadRoomMemberDataPromiseMap[roomId]
 		}
 	}

package/services/client-chat/client-chat-wechat/client-chat.js

@@ -152,6 +152,23 @@ class ClientChat {
 						} else {
 							this.sessionUnread.updateSession(session.conversationId, session)
 						}
+						// 更新账号未读消息数量
+						this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
+							const beforeUnreadMsgCount = changeProps.unreadMsgCount.before || 0
+							const afterUnreadMsgCount = changeProps.unreadMsgCount.after || 0
+							const nextUnreadMessageNum = Math.max(0, (unreadMesasgeNum || 0) - beforeUnreadMsgCount) + afterUnreadMsgCount
+							if (session.mute) {
+								return {
+									num: nextUnreadMessageNum,
+									muteNum: Math.max(0, (unreadMessageMuteNum || 0) - beforeUnreadMsgCount) + afterUnreadMsgCount
+								}
+							} else {
+								return {
+									num: nextUnreadMessageNum,
+									muteNum: unreadMessageMuteNum || 0
+								}
+							}
+						})
 					}
 					const sessionInstances = this.sessionManage.getSessionInstacesBySessionId(session.conversationId)
 					sessionInstances.forEach(sessionInstance => {
@@ -775,21 +792,6 @@ class ClientChat {
 					}))
 				}
 			},
-			// 群聊有变化，如分配的情况
-			onCmdChatroomInfoChanged: ({ data }) => {
-				// 移除群聊
-				if (data.changeType === 3) {
-					this.contacts.removeRoom(data.wechatChatroomId)
-				} else {
-					// 其他情况就重新刷新一下群信息
-					if (this.sessionManage.currentSession && this.sessionManage.currentSession.targetId === data.wechatChatroomId) {
-						this.contacts.getRoom(data.wechatChatroomId, true) // 强制刷新群数据
-						this.contacts.loadRoomMemberData(data.wechatChatroomId, {  // 强制刷新群成员数据，因为有可能群主变化了
-							wechatChatroomId: data.wechatChatroomId
-						}, true)
-					}
-				}
-			},
 			onCmdChatroomMemberInfoChanged: ({ data }) => {
 				// 如果没有changeType的时候，目前看应该是群成员或者群信息变化了，需要重新刷新一下群成员和群信息
 				if (this.sessionManage.currentSession && this.sessionManage.currentSession.targetId === data.wechatChatroomId) {
@@ -905,17 +907,18 @@ class ClientChat {
 					if (session) {
 						this.session.removeSession(session.conversationId)
 					}
-					// 删除好友
+					// 删除群聊
 					this.contacts.removeRoom(data.wechatChatroomId)
 				} 
-				// 更新好友
-				else if (data.changeType === 2) {
-					this.contacts.getRoom({
-						wechatAccountId: data.wechatAccountId,
-						wechatChatroomId: data.wechatChatroomId
-					}).then(rs => {
-						this.contacts.updateRoom(data.wechatChatroomId, rs.data)
-					})
+				// 更新群聊
+				else {
+					// 其他情况就重新刷新一下群信息
+					if (this.sessionManage.currentSession && this.sessionManage.currentSession.targetId === data.wechatChatroomId) {
+						this.contacts.getRoom(data.wechatChatroomId, true) // 强制刷新群数据
+						this.contacts.loadRoomMemberData(data.wechatChatroomId, {  // 强制刷新群成员数据，因为有可能群主变化了
+							wechatChatroomId: data.wechatChatroomId
+						}, true)
+					}
 				}
 			},
 			// 下载视频任务