@aochuang/client-sdk 1.0.314 → 1.0.316

package/package.json

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

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

@@ -23,6 +23,7 @@ export default class ClientChatAccount {
 			updateAccountMessageReadMethod: null,
 			deleteAccountSessionMethod: null,
 			getAccountGreetingUnreadMsgCountMethod: null,
+			batchGetAccountGreetingUnreadMsgCountMethod: null,
 			clearAccountGreetingUnreadMsgCountMethod: null,
 			onCurrentAccountChange: null,
 			onAccountAdded: null,
@@ -43,6 +44,7 @@ export default class ClientChatAccount {
 		this.updateAccountMessageReadMethod = options.updateAccountMessageReadMethod
 		this.deleteAccountSessionMethod = options.deleteAccountSessionMethod
 		this.getAccountGreetingUnreadMsgCountMethod = options.getAccountGreetingUnreadMsgCountMethod
+		this.batchGetAccountGreetingUnreadMsgCountMethod = options.batchGetAccountGreetingUnreadMsgCountMethod
 		this.clearAccountGreetingUnreadMsgCountMethod = options.clearAccountGreetingUnreadMsgCountMethod
 		this.onAccountAdded = options.onAccountAdded
 		this.onAccountRemoved = options.onAccountRemoved,
@@ -394,6 +396,41 @@ export default class ClientChatAccount {
 		})
 	}
 
+	/**
+	 * 批量获取所有账号的打招呼未读消息总数
+	*/
+	refreshAllAccountGreetingUnreadMsgCount () {
+		if (!this.batchGetAccountGreetingUnreadMsgCountMethod) {
+			return new Error('batchGetAccountGreetingUnreadMsgCountMethod未定义')
+		}
+		const wechatAccountIds = this.data.accountData.map(v => v.id).filter((id, index, data) => id && data.indexOf(id) === index)
+		const countData = {}
+		let requestPromise = Promise.resolve()
+		for (let index = 0; index < wechatAccountIds.length; index += 100) {
+			const currentWechatAccountIds = wechatAccountIds.slice(index, index + 100)
+			requestPromise = requestPromise.then(() => {
+				return this.batchGetAccountGreetingUnreadMsgCountMethod({
+					wechatAccountIds: currentWechatAccountIds
+				})
+			}).then(rs => {
+				;(rs && rs.data || []).forEach(item => {
+					if (item && item.wechatAccountId) {
+						countData[item.wechatAccountId] = item.count || 0
+					}
+				})
+			})
+		}
+		return requestPromise.then(() => {
+			let allCount = 0
+			wechatAccountIds.forEach(wechatAccountId => {
+				const count = countData[wechatAccountId] || 0
+				Vue.set(this.accountGreetingUnreadMsgCountData, wechatAccountId, count)
+				allCount += count
+			})
+			Vue.set(this.accountGreetingUnreadMsgCountData, 'all', allCount)
+		})
+	}
+
 	/**
 	 * 清空打招呼未读消息总数
 	*/
@@ -414,10 +451,11 @@ export default class ClientChatAccount {
 	reset () {
 		this.data.accountData = []
 		this.data.accountUnreadMessageNumData = []
+		this.data.accountGreetingUnreadMsgCountData = {}
 		if (this.cancelConnectRequest) {
 			this.cancelConnectRequest()
 		}
 		this._cacheLoadPromise = null
 		this.cancelConnectRequest = null
 	}
-}
+}

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

@@ -176,6 +176,7 @@ export default class ClientChatContacts {
 			getContactsRoomMethod: null,
 			getContactsFriendGroupCountMethod: null,
 			getContactsRoomGroupCountMethod: null,
+			onContactsFriendRemoved: null,
 			onContactsRoomRemoved: null,
 			onLoadRoomGroupData: null,
 			onLoadFriendGroupData: null,
@@ -218,6 +219,7 @@ export default class ClientChatContacts {
 		this.getContactsRoomMethod = options.getContactsRoomMethod
 		this.getContactsRoomGroupCountMethod = options.getContactsRoomGroupCountMethod
 		this.getContactsFriendGroupCountMethod = options.getContactsFriendGroupCountMethod
+		this.onContactsFriendRemoved = options.onContactsFriendRemoved
 		this.onContactsRoomRemoved = options.onContactsRoomRemoved
 		this.onLoadRoomGroupData = options.onLoadRoomGroupData
 		this.onLoadFriendGroupData = options.onLoadFriendGroupData
@@ -436,7 +438,8 @@ export default class ClientChatContacts {
 		if (!this.friendMap[id]) {
 			return
 		}
-		const index = this.data.friendData.indexOf(this.friendMap[id])
+		const friend = this.friendMap[id]
+		const index = this.data.friendData.indexOf(friend)
 		if (index >= 0) {
 			this.data.friendData.splice(index, 1)
 		}
@@ -457,6 +460,10 @@ export default class ClientChatContacts {
 			}
 		})
 		delete this.friendMap[id]
+		this.onContactsFriendRemoved && this.onContactsFriendRemoved({
+			friend
+		})
+		return friend
 	}
 	
 	updateFriend (id, props) {

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

@@ -93,6 +93,7 @@ class ClientChat {
 			updateAccountMessageReadMethod: null,
 			deleteAccountSessionMethod: null,
 			getAccountGreetingUnreadMsgCountMethod: null,
+			batchGetAccountGreetingUnreadMsgCountMethod: null,
 			clearAccountGreetingUnreadMsgCountMethod: null,
 			loadContactsRoomGroupDataMethod: null,
 			loadContactsFriendGroupDataMethod: null,
@@ -218,7 +219,13 @@ class ClientChat {
 				}
 			}
 			options.onRemoveSession = ({ session }) => {
-				// 移除不做同步，例如未读会话，前端会自己删除已读的会话，这个时候不能做同步，否则会把最近会话也移除了
+				// 未读、星标等实例的局部移除不同步到其他实例，主会话移除时仅同步清理搜索缓存
+				if (instance === this.session) {
+					this.sessionFilter.removeSession(session.conversationId)
+					if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === session.conversationId) {
+						this.sessionManage.setCurrentSession(null)
+					}
+				}
 			}
 			options.onDeleteSession = ({ session }) => {
 				if (!session) {
@@ -686,7 +693,23 @@ class ClientChat {
 			getContactsRoomMethod: options.getContactsRoomMethod,
 			getContactsFriendGroupCountMethod: options.getContactsFriendGroupCountMethod,
 			getContactsRoomGroupCountMethod: options.getContactsRoomGroupCountMethod,
+			onContactsFriendRemoved: ({ friend }) => {
+				this.contactsFilter.removeFriend(friend.id)
+				if (this.sessionManage.currentSession && this.sessionManage.currentSession.type === 0 && this.sessionManage.currentSession.targetId === friend.id) {
+					this.sessionManage.setCurrentSession(null)
+				}
+				const session = this.session.findSession(({ session }) => {
+					return session.targetId === friend.id
+				})
+				if (session) {
+					this.session.removeSession(session.conversationId)
+				}
+			},
 			onContactsRoomRemoved: ({ room }) => {
+				this.contactsFilter.removeRoom(room.id)
+				if (this.sessionManage.currentSession && this.sessionManage.currentSession.type === 1 && this.sessionManage.currentSession.targetId === room.id) {
+					this.sessionManage.setCurrentSession(null)
+				}
 				const accountId = options.getLoginAccountIdMethod ? options.getLoginAccountIdMethod() : room.accountId
 				let sessionId = createSessionId(accountId, room.id)
 				if (sessionId) {
@@ -737,6 +760,7 @@ class ClientChat {
 			updateAccountMessageReadMethod: options.updateAccountMessageReadMethod,
 			deleteAccountSessionMethod: options.deleteAccountSessionMethod,
 			getAccountGreetingUnreadMsgCountMethod: options.getAccountGreetingUnreadMsgCountMethod,
+			batchGetAccountGreetingUnreadMsgCountMethod: options.batchGetAccountGreetingUnreadMsgCountMethod,
 			clearAccountGreetingUnreadMsgCountMethod: options.clearAccountGreetingUnreadMsgCountMethod,
 			onAccountAdded: ({ account }) => {
 				return this.account.refreshAccountUnreadMessageNum({
@@ -745,6 +769,7 @@ class ClientChat {
 			},
 			onAccountLoaded: () => {
 				this.socket.doHeartbeat()
+				this.account.refreshAllAccountGreetingUnreadMsgCount().catch(() => {})
 			},
 			onCurrentAccountChange: ({ currentAccount }) => {
 				// // 如果群分组数据加载了再去刷成员数量，这样可以做到按需
@@ -880,7 +905,15 @@ class ClientChat {
 								if (data.friends && data.friends.length) {
 									data.friends.forEach(friend => {
 										if (friend.changeType === 3) {
-											this.contacts.removeFriend(friend.wechatFriendId)
+											const removedFriend = this.contacts.removeFriend(friend.wechatFriendId)
+											if (!removedFriend) {
+												const session = this.session.findSession(({ session }) => {
+													return session.targetId === friend.wechatFriendId
+												})
+												if (session) {
+													this.session.removeSession(session.conversationId)
+												}
+											}
 										}
 									})
 								}
@@ -907,15 +940,16 @@ class ClientChat {
 					}
 					// 删除好友
 					else if (data.changeType === 3) {
-						// 删除会话
-						const session = this.session.findSession(({ session }) => {
-							return session.targetId === data.wechatFriendId
-						})
-						if (session) {
-							this.session.removeSession(session.conversationId)
-						}
 						// 删除好友
-						this.contacts.removeFriend(data.wechatFriendId)
+						const removedFriend = this.contacts.removeFriend(data.wechatFriendId)
+						if (!removedFriend) {
+							const session = this.session.findSession(({ session }) => {
+								return session.targetId === data.wechatFriendId
+							})
+							if (session) {
+								this.session.removeSession(session.conversationId)
+							}
+						}
 						// todo 刷新一下微信号，如果微信号一个好友都没了，应该要删除掉的
 						this.contacts.markModify() // 标记通讯录修改
 					}