@aochuang/client-sdk 1.0.312 → 1.0.314

package/package.json

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

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

@@ -83,7 +83,6 @@ export default class ClientChatContacts {
 		*/
 		roomData: [],
 		
-		
 		/**
 		 * {
 		 * 		groupId: [{
@@ -135,12 +134,26 @@ export default class ClientChatContacts {
 		 * 标记通讯录是否修改了
 		 * 如果修改了，比如接收到了分配好友的会话时，一定通讯录变了，变了的时候界面需要根据这个状态刷新通讯录
 		*/
-	    isModify: false
+	    isModify: false,
+
+		/**
+		 * 缓存的好友分组统计数量
+		*/
+		cacheFriendGroupCountMap: {},
+
+		/**
+		 * 缓存的群聊分组统计数量
+		*/
+		cacheRoomGroupCountMap: {}
 	})
 	
 	friendMap = {}
 	
 	roomMap = {}
+
+	_cacheFriendGroupCountMap = {}
+
+	_cacheRoomGroupCountMap = {}
 	
 	loadContactsRoomGroupDataMethod = null
 	
@@ -246,10 +259,18 @@ export default class ClientChatContacts {
 		return this.data.friendGroupData
 	}
 	
+	get cacheFriendGroupCountMap () {
+		return this.data.cacheFriendGroupCountMap
+	}
+
 	get roomGroupData () {
 		return this.data.roomGroupData
 	}
 	
+	get cacheRoomGroupCountMap () {
+		return this.data.cacheRoomGroupCountMap
+	}
+	
 	get isModify () {
 		return this.data.isModify
 	}
@@ -589,10 +610,10 @@ export default class ClientChatContacts {
 				}
 			}
 			const wechatAccountId = this.roomMap[id].wechatAccountId
-			if (wechatAccountId && this.data.accountBindFriendMap[wechatAccountId] && this.data.accountBindFriendMap[wechatAccountId][groupId]) {
-				const bindIndex = this.data.accountBindFriendMap[wechatAccountId][groupId].indexOf(this.roomMap[id])
+			if (wechatAccountId && this.data.accountBindRoomMap[wechatAccountId] && this.data.accountBindRoomMap[wechatAccountId][groupId]) {
+				const bindIndex = this.data.accountBindRoomMap[wechatAccountId][groupId].indexOf(this.roomMap[id])
 				if (bindIndex >= 0) {
-					this.data.accountBindFriendMap[wechatAccountId][groupId].splice(bindIndex, 1)
+					this.data.accountBindRoomMap[wechatAccountId][groupId].splice(bindIndex, 1)
 				}
 			}
 		})
@@ -720,15 +741,20 @@ export default class ClientChatContacts {
 		const { wechatAccountId, ...nextParams } = Object.assign({
 			wechatAccountId: null
 		}, params)
+		const cacheKey = wechatAccountId || 'all'
+		if (!this.data.cacheFriendGroupCountMap) {
+			this.data.cacheFriendGroupCountMap = {}
+		}
 		if (!this._cacheFriendGroupCountMap) {
 			this._cacheFriendGroupCountMap = {}
 		}
-		if (!this._cacheFriendGroupCountMap[wechatAccountId]) {
+		if (!this._cacheFriendGroupCountMap[cacheKey]) {
 			const groupIds =  (this.data.friendGroupData || []).map(v => v.id)
 			groupIds.forEach(id => {
 				Vue.set(this.data.refreshFriendGroupCountLoadingMap, id, true)
 			})
-			this._cacheFriendGroupCountMap[wechatAccountId] = this.getContactsFriendGroupCountMethod(Object.assign({}, nextParams, {
+			Vue.set(this.data.cacheFriendGroupCountMap, cacheKey, true)
+			this._cacheFriendGroupCountMap[cacheKey] = this.getContactsFriendGroupCountMethod(Object.assign({}, nextParams, {
 				wechatAccountIds: wechatAccountId ? [wechatAccountId] : null,
 				groupIds
 			})).finally(() => {
@@ -737,7 +763,7 @@ export default class ClientChatContacts {
 				})
 			})
 		} 
-		this._cacheFriendGroupCountMap[wechatAccountId].then(rs => {
+		this._cacheFriendGroupCountMap[cacheKey].then(rs => {
 			if (!rs || !rs.data || !rs.data.length) {
 				return
 			}
@@ -747,7 +773,21 @@ export default class ClientChatContacts {
 				})
 			})
 		})
-		return this._cacheFriendGroupCountMap[wechatAccountId]
+		return this._cacheFriendGroupCountMap[cacheKey]
+	}
+
+	// 标记所有好友分组修改
+	// 需要清理缓存
+	clearAllFriendGroupCountCache (wechatAccountId) {
+		if (!this.data.cacheFriendGroupCountMap) {
+			return
+		}
+		if (this._cacheFriendGroupCountMap) {
+			delete this._cacheFriendGroupCountMap[wechatAccountId]
+			delete this._cacheFriendGroupCountMap.all
+		}
+		Vue.delete(this.data.cacheFriendGroupCountMap, wechatAccountId)
+		Vue.delete(this.data.cacheFriendGroupCountMap, 'all')
 	}
 	
 	loadRoomGroupData () {
@@ -773,15 +813,20 @@ export default class ClientChatContacts {
 		const { wechatAccountId, ...nextParams } = Object.assign({
 			wechatAccountId: null
 		}, params)
+		if (!this.data.cacheRoomGroupCountMap) {
+			this.data.cacheRoomGroupCountMap = {}
+		}
 		if (!this._cacheRoomGroupCountMap) {
 			this._cacheRoomGroupCountMap = {}
 		}
-		if (!this._cacheRoomGroupCountMap[wechatAccountId] || refresh === true) {
+		const cacheKey = wechatAccountId || 'all'
+		if (!this._cacheRoomGroupCountMap[cacheKey] || refresh === true) {
 			const groupIds =  (this.data.roomGroupData || []).map(v => v.id)
 			groupIds.forEach(id => {
 				Vue.set(this.data.refreshRoomGroupCountLoadingMap, id, true)
 			})
-			this._cacheRoomGroupCountMap[wechatAccountId] = this.getContactsRoomGroupCountMethod(Object.assign({}, nextParams, {
+			Vue.set(this.data.cacheRoomGroupCountMap, cacheKey, true)
+			this._cacheRoomGroupCountMap[cacheKey] = this.getContactsRoomGroupCountMethod(Object.assign({}, nextParams, {
 				wechatAccountIds: wechatAccountId ? [wechatAccountId] : null,
 				groupIds
 			})).finally(() => {
@@ -790,7 +835,7 @@ export default class ClientChatContacts {
 				})
 			})
 		}
-		this._cacheRoomGroupCountMap[wechatAccountId].then(rs => {
+		this._cacheRoomGroupCountMap[cacheKey].then(rs => {
 			if (!rs || !rs.data || !rs.data.length) {
 				return
 			}
@@ -800,7 +845,19 @@ export default class ClientChatContacts {
 				})
 			})
 		})
-		return this._cacheRoomGroupCountMap[wechatAccountId]
+		return this._cacheRoomGroupCountMap[cacheKey]
+	}
+
+	clearAllRoomGroupCountCache (wechatAccountId) {
+		if (!this.data.cacheRoomGroupCountMap) {
+			return
+		}
+		if (this._cacheRoomGroupCountMap) {
+			delete this._cacheRoomGroupCountMap[wechatAccountId]
+			delete this._cacheRoomGroupCountMap.all
+		}
+		Vue.delete(this.data.cacheRoomGroupCountMap, wechatAccountId)
+		Vue.delete(this.data.cacheRoomGroupCountMap, 'all')
 	}
 	
 	getFriend (friendId, refresh) {
@@ -1001,11 +1058,13 @@ export default class ClientChatContacts {
 	}
 	
 	markModify () {
-		this.data.isModify = true
+		// this.data.isModify = true
+		console.warn('[ClientChat]markModify已过期')
 	}
 	
 	unmarkModify () {
-		this.data.isModify = false
+		// this.data.isModify = false
+		console.warn('[ClientChat]markModify已过期')
 	}
 	
 	reset () {
@@ -1022,6 +1081,8 @@ export default class ClientChatContacts {
 		this.data.accountBindRoomMap = {}
 		this.data.refreshRoomGroupCountLoadingMap = {}
 		this.data.refreshFriendGroupCountLoadingMap = {}
+		this.data.cacheFriendGroupCountMap = null
+		this.data.cacheRoomGroupCountMap = null
 		this._cacheFriendGroupCountMap = null
 		this._cacheRoomGroupCountMap = null
 		if (this.cancelConnectRequest) {

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

@@ -747,17 +747,17 @@ class ClientChat {
 				this.socket.doHeartbeat()
 			},
 			onCurrentAccountChange: ({ currentAccount }) => {
-				// 如果群分组数据加载了再去刷成员数量，这样可以做到按需
-				if (this.contacts.friendGroupData && this.contacts.friendGroupData.length) {
-					this.contacts.refreshAllFriendGroupCount({
-						wechatAccountId: currentAccount ? currentAccount.id : null
-					})
-				}
-				if (this.contacts.roomGroupData && this.contacts.roomGroupData.length) {
-					this.contacts.refreshAllRoomGroupCount({
-						wechatAccountId: currentAccount ? currentAccount.id : null
-					})
-				}
+				// // 如果群分组数据加载了再去刷成员数量，这样可以做到按需
+				// if (this.contacts.friendGroupData && this.contacts.friendGroupData.length) {
+				// 	this.contacts.refreshAllFriendGroupCount({
+				// 		wechatAccountId: currentAccount ? currentAccount.id : null
+				// 	})
+				// }
+				// if (this.contacts.roomGroupData && this.contacts.roomGroupData.length) {
+				// 	this.contacts.refreshAllRoomGroupCount({
+				// 		wechatAccountId: currentAccount ? currentAccount.id : null
+				// 	})
+				// }
 			},
 			onUnreadMessageNumChange: ({ accountId, unreadMessageNum }) => {
 				if (unreadMessageNum === 0) {
@@ -876,28 +876,31 @@ class ClientChat {
 									rs[v.wechatAccountId] = true
 									return rs
 								}, {}))
-								if (!wechatAccountIds || !wechatAccountIds.length) {
-									return
+								// 删除changeType为3移除的好友，例如转移的场景
+								if (data.friends && data.friends.length) {
+									data.friends.forEach(friend => {
+										if (friend.changeType === 3) {
+											this.contacts.removeFriend(friend.wechatFriendId)
+										}
+									})
 								}
-								// 统计任务返回的会话数据来按需刷新分组数量
-								// 更新当前微信号分组统计数量
-								return Promise.all([].concat(wechatAccountIds.reduce((rs, v) => {
-									rs.push(
-										this.contacts.refreshAllRoomGroupCount({
-											wechatAccountId: v
-										}, true)
-									)
-									rs.push(
-										this.contacts.refreshAllFriendGroupCount({
-											wechatAccountId: v
-										}, true)
-									)
-									return rs
-								}, [
-									// 刷新一下微信号
-									this.account.reloadData()
-								]))).then(() => {
+								let ps = Promise.resolve()
+								if (wechatAccountIds && wechatAccountIds.length) {
+									// 只要有一个不在现在的accountData里面，就需要重新加载微信号数据
+									if (wechatAccountIds.some(v => !this.account.accountMap[v])) {
+										ps = this.account.reloadData()
+									}
+								}
+								return ps.finally(() => {
+									// 这里应该标记那些工作微信号的通讯录修改了，后面要在界面打个提示，告诉用户通讯录变化了，让手动刷新一下
+									// 同时也将缓存都清理一下，例如工作微信号分组统计数量等
 									this.contacts.markModify() // 标记通讯录修改
+									// 标记工作微信号所有好友分组修改
+									if (data.wechatAccountIds && data.wechatAccountIds) {
+										data.wechatAccountIds.forEach(wechatAccountId => {
+											this.contacts.clearAllFriendGroupCountCache(wechatAccountId)
+										})
+									}
 								})
 							})
 						}
@@ -928,11 +931,41 @@ class ClientChat {
 			onCmdChatroomInfoChanged: ({ data }) => {
 				// 配分群聊
 				if (data.changeType === 4) {
-					// 增量拉取通讯录
-					// this.contacts.refresh().then(() => {
-					// 	// 增量拉取会话
-					// 	this.session.refresh()
-					// })
+					// 增量拉取分配产生的会话
+					return this.session.loadAssignTaskSessionData({
+						taskId: data.taskId
+					}).then((rs) => {
+						const wechatAccountIds = Object.keys((rs || []).reduce((rs, v) => {
+							rs[v.wechatAccountId] = true
+							return rs
+						}, {}))
+						// 删除changeType为3移除的群聊，例如转移的场景
+						if (data.chatrooms && data.chatrooms.length) {
+							data.chatrooms.forEach(room => {
+								if (room.changeType === 3) {
+									this.contacts.removeRoom(room.wechatChatroomId)
+								}
+							})
+						}
+						let ps = Promise.resolve()
+						if (wechatAccountIds && wechatAccountIds.length) {
+							// 只要有一个不在现在的accountData里面，就需要重新加载微信号数据
+							if (wechatAccountIds.some(v => !this.account.accountMap[v])) {
+								ps = this.account.reloadData()
+							}
+						}
+						return ps.finally(() => {
+							// 这里应该标记那些工作微信号的通讯录修改了，后面要在界面打个提示，告诉用户通讯录变化了，让手动刷新一下
+							// 同时也将缓存都清理一下，例如工作微信号分组统计数量等
+							this.contacts.markModify() // 标记通讯录修改
+							// 标记工作微信号所有好友分组修改，标记修改后后面不会走缓存
+							if (data.wechatAccountIds && data.wechatAccountIds) {
+								data.wechatAccountIds.forEach(wechatAccountId => {
+									this.contacts.clearAllRoomGroupCountCache(wechatAccountId)
+								})
+							}
+						})
+					})
 				}
 				// 删除群聊
 				else if (data.changeType === 3) {