@aochuang/client-sdk 1.0.313 → 1.0.315

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.313",
+  "version": "1.0.315",
   "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.js

@@ -93,6 +93,7 @@ class ClientChat {
 			updateAccountMessageReadMethod: null,
 			deleteAccountSessionMethod: null,
 			getAccountGreetingUnreadMsgCountMethod: null,
+			batchGetAccountGreetingUnreadMsgCountMethod: null,
 			clearAccountGreetingUnreadMsgCountMethod: null,
 			loadContactsRoomGroupDataMethod: null,
 			loadContactsFriendGroupDataMethod: null,
@@ -737,6 +738,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 +747,7 @@ class ClientChat {
 			},
 			onAccountLoaded: () => {
 				this.socket.doHeartbeat()
+				this.account.refreshAllAccountGreetingUnreadMsgCount().catch(() => {})
 			},
 			onCurrentAccountChange: ({ currentAccount }) => {
 				// // 如果群分组数据加载了再去刷成员数量，这样可以做到按需
@@ -877,8 +880,8 @@ class ClientChat {
 									return rs
 								}, {}))
 								// 删除changeType为3移除的好友，例如转移的场景
-								if (data.wechatFriendIds && data.wechatFriendIds.length) {
-									data.wechatFriendIds.forEach(friend => {
+								if (data.friends && data.friends.length) {
+									data.friends.forEach(friend => {
 										if (friend.changeType === 3) {
 											this.contacts.removeFriend(friend.wechatFriendId)
 										}
@@ -939,9 +942,9 @@ class ClientChat {
 							rs[v.wechatAccountId] = true
 							return rs
 						}, {}))
-						// 删除changeType为3移除的好友，例如转移的场景
-						if (data.wechatChatroomIds && data.wechatChatroomIds.length) {
-							data.wechatChatroomIds.forEach(room => {
+						// 删除changeType为3移除的群聊，例如转移的场景
+						if (data.chatrooms && data.chatrooms.length) {
+							data.chatrooms.forEach(room => {
 								if (room.changeType === 3) {
 									this.contacts.removeRoom(room.wechatChatroomId)
 								}