@aochuang/client-sdk 1.0.344 → 1.0.346

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

@@ -32,7 +32,6 @@ class ClientChat {
 			getLoginUserIdMethod: null,
 			getLoginUserTokenMethod: null,
 			loadAccountDataMethod: null,
-			getLoginAccountIdMethod: null, // 因为1.0有帮聊逻辑，帮聊消息以及通讯录的accountId不是登录用户的accountId，会导致找到的会话出现问题，所以这里提供一个方法让外部传入
 			loadSessionDataMethod: null,
 			updateSessionReadMethod: null,
 			getSessionMethod: null,
@@ -58,9 +57,8 @@ class ClientChat {
 		} 
 		if (!options.loadRoomMessageDataMethod) {
 			throw new Error('loadRoomMessageDataMethod不能为空')
-		}
+		} 
 		this.onOverwriteFriendInfoChange = options.onOverwriteFriendInfoChange
-		this.getLoginAccountIdMethod = options.getLoginAccountIdMethod
 		this.event = new Event({
 			checkOnMethod: (name) => {
 				if (name === 'ready') {
@@ -88,8 +86,7 @@ class ClientChat {
 			sortField: 'sendTime',
 			clientChat: this,
 			onAddMessageSuccess: ({ data }) => {
-				const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : data.qwAccountId
-				let sessionId = createSessionId(accountId, data.contactId)
+				let sessionId = createSessionId(data.corpId, data.qwAccountId, data.contactId)
 				// 更新会话
 				if (!sessionId) {
 					return
@@ -103,15 +100,6 @@ class ClientChat {
 						return this.session.getSession(sessionId).then(done)
 					})
 					this._sessionPollRequestMap[sessionId].start().then((rs) => {
-						// 后端更新会话是异步过程，返回的会话信息可能还未包含当前消息
-						if (rs && rs.data && !rs.data.unreadMsgCount) {
-							rs.data.unreadMsgCount = data.send ? 0 : 1
-							rs.data.lastMsgContent = data.content
-							rs.data.lastMsgType = data.msgType
-							rs.data.lastMsgTime = data.sendTime
-							rs.data.lastMsgId = data.id
-							rs.data.lastUpdateTime = data.updateDate
-						}
 						// 更新账号未读消息数量
 						this.account.updateAccountUnreadMessageNum(rs.data.qwAccountId, ({ unreadMesasgeNum }) => {
 							return unreadMesasgeNum += (rs.data.unreadMsgCount || 0)
@@ -122,7 +110,7 @@ class ClientChat {
 				} else {
 					this.session.updateSession(sessionId, ({ session }) => {
 						let unreadMsgCount = session.unreadMsgCount
-						if (!data.send) {
+						if (!data.isSend) {
 							unreadMsgCount = unreadMsgCount + 1
 						}
 						// 如果是当前会话，那么未读消息需要设置为0
@@ -167,8 +155,7 @@ class ClientChat {
 			sortField: 'sendTime',
 			clientChat: this,
 			onAddMessageSuccess: ({ data }) => {
-				const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : data.qwAccountId
-				let sessionId = createSessionId(accountId, data.roomId)
+				let sessionId = createSessionId(data.corpId, data.qwAccountId, data.roomId)
 				// 更新会话
 				if (!sessionId) {
 					return
@@ -183,15 +170,6 @@ class ClientChat {
 						return this.session.getSession(sessionId).then(done)
 					})
 					this._sessionPollRequestMap[sessionId].start().then((rs) => {
-						// 后端更新会话是异步过程，返回的会话信息可能还未包含当前消息
-						if (rs && rs.data && !rs.data.unreadMsgCount) {
-							rs.data.unreadMsgCount = data.send ? 0 : 1
-							rs.data.lastMsgContent = data.content
-							rs.data.lastMsgType = data.msgType
-							rs.data.lastMsgTime = data.sendTime
-							rs.data.lastMsgId = data.id
-							rs.data.lastUpdateTime = data.updateDate
-						}
 						// 更新账号未读消息数量
 						this.account.updateAccountUnreadMessageNum(rs.data.qwAccountId, ({ unreadMesasgeNum }) => {
 							return unreadMesasgeNum += (rs.data.unreadMsgCount || 0)
@@ -202,7 +180,7 @@ class ClientChat {
 				} else {
 					this.session.updateSession(sessionId, ({ session }) => {
 						let unreadMsgCount = session.unreadMsgCount
-						if (!data.send) {
+						if (!data.isSend) {
 							unreadMsgCount = unreadMsgCount + 1
 						}
 						// 如果是当前会话，那么未读消息需要设置为0
@@ -280,77 +258,6 @@ class ClientChat {
 		})
 		this.socket = new ClientChatSocket({
 			socket: options.socket,
-			onCmdQwContactInfoChanged: ({ data }) => {
-				const contacts = data && (Array.isArray(data.contacts)
-					? data.contacts
-					: (data.contactId ? [data] : []))
-				if (!contacts || !contacts.length) {
-					this.markAccountsModified(data && data.qwAccountIds)
-					return
-				}
-				const tasks = []
-				const removedTasks = []
-				contacts.forEach(contact => {
-					if (!contact) {
-						return
-					}
-					const changeType = Number(contact.changeType)
-					if (changeType === 1) {
-						tasks.push(this.handleQwContactAdded(contact, data))
-					} else if (changeType === 2) {
-						tasks.push(this.handleQwContactUpdated(contact))
-					} else if (changeType === 3) {
-						removedTasks.push(this.handleQwContactRemoved(contact, data))
-					}
-				})
-				return Promise.all(tasks.concat(removedTasks)).then(results => {
-					const accountUnreadCountMap = {}
-					removedTasks.forEach((task, index) => {
-						const result = results[tasks.length + index]
-						if (!result || !result.accountId || !result.unreadCount) {
-							return
-						}
-						accountUnreadCountMap[result.accountId] = (accountUnreadCountMap[result.accountId] || 0) + result.unreadCount
-					})
-					return Promise.all(Object.keys(accountUnreadCountMap).map(accountId => {
-						const removedUnreadCount = accountUnreadCountMap[accountId]
-						return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
-							return Math.max(0, unreadMesasgeNum - removedUnreadCount)
-						}).catch(error => {
-							console.warn('[client-chat] update account unread count failed', error)
-						})
-					}))
-				})
-			},
-			onCmdQwRoomInfoChanged: ({ data }) => {
-				const rooms = data && (Array.isArray(data.rooms)
-					? data.rooms
-					: (data.roomId ? [data] : []))
-				if (!rooms || !rooms.length) {
-					this.markAccountsModified(data && data.qwAccountIds)
-					return
-				}
-				const tasks = []
-				const removedTasks = []
-				rooms.forEach(room => {
-					if (!room) {
-						return
-					}
-					const changeType = Number(room.changeType)
-					if (changeType === 1) {
-						tasks.push(this.handleQwRoomAdded(room, data))
-					} else if (changeType === 2) {
-						tasks.push(this.handleQwRoomUpdated(room))
-					} else if (changeType === 3) {
-						removedTasks.push(this.handleQwRoomRemoved(room, data))
-					}
-				})
-				return Promise.all(tasks.concat(removedTasks)).then(results => {
-					return this.updateRemovedSessionUnreadCounts(
-						results.slice(tasks.length)
-					)
-				})
-			},
 			// 接受新消息
 			onCmdQwNewMessage: ({ data }) => {
 				// 插入消息
@@ -372,193 +279,19 @@ class ClientChat {
 				})
 			},
 			onHeartbeatSuccess: ({ data }) => {
-				const onlineMap = data || {}
+				if (!data.wq) {
+					return
+				}
+				const onlineMap = data.wq || {}
 				Object.keys(onlineMap).forEach(k => {
 					this.account.updateAccount(k, {
 						alive: onlineMap[k]
-					}) 
-				})
-			}
-		})
-	}
-
-	getQwAccountCorpId (qwAccountId, corpId) {
-		if (corpId || !qwAccountId || !this.account) {
-			return corpId
-		}
-		const account = this.account.getAccountData().find(item => item.id === qwAccountId)
-		return account && account.corpId
-	}
-
-	markAccountsModified (qwAccountIds) {
-		if (!Array.isArray(qwAccountIds) || !qwAccountIds.length) {
-			return
-		}
-		this.session.markModify(qwAccountIds)
-		this.contacts.markModify(qwAccountIds)
-	}
-
-	updateRemovedSessionUnreadCounts (results) {
-		const accountUnreadCountMap = {}
-		;(results || []).forEach(result => {
-			if (!result || !result.accountId || !result.unreadCount) {
-				return
-			}
-			accountUnreadCountMap[result.accountId] = (accountUnreadCountMap[result.accountId] || 0) + result.unreadCount
-		})
-		return Promise.all(Object.keys(accountUnreadCountMap).map(accountId => {
-			const removedUnreadCount = accountUnreadCountMap[accountId]
-			return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
-				return Math.max(0, unreadMesasgeNum - removedUnreadCount)
-			}).catch(error => {
-				console.warn('[client-chat] update account unread count failed', error)
-			})
-		}))
-	}
-
-	handleQwContactAdded (contact, eventData) {
-		const qwAccountId = contact.qwAccountId || (eventData && eventData.qwAccountId)
-		const corpId = this.getQwAccountCorpId(
-			qwAccountId,
-			contact.corpId || (eventData && eventData.corpId)
-		)
-		const contactId = contact.contactId
-		const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
-		const sessionId = createSessionId(accountId, contactId)
-		if (!sessionId) {
-			return Promise.resolve()
-		}
-		const localSession = this.session.getSessionByLocal(sessionId)
-		const oldUnread = localSession ? (localSession.unreadMsgCount || 0) : 0
-		return this.session.refreshSession(sessionId).then(rs => {
-			const serverSession = rs && rs.data
-			const newUnread = serverSession ? (serverSession.unreadMsgCount || 0) : 0
-			const accountId = (serverSession && serverSession.qwAccountId) || qwAccountId
-			const unreadDiff = newUnread - oldUnread
-			if (accountId && unreadDiff) {
-				return this.account.updateAccountUnreadMessageNum(accountId, ({ unreadMesasgeNum }) => {
-					return Math.max(0, unreadMesasgeNum + unreadDiff)
+					})
 				})
 			}
-		}).catch(error => {
-			console.warn('[client-chat] refresh added contact session failed', error)
-		})
-	}
-
-	handleQwContactUpdated (contact) {
-		if (!contact.contactId) {
-			return Promise.resolve()
-		}
-		return this.contacts.refreshFriend(contact.contactId).catch(error => {
-			console.warn('[client-chat] refresh contact failed', error)
-		})
-	}
-
-	handleQwContactRemoved (contact, eventData) {
-		if (!contact.contactId) {
-			return Promise.resolve()
-		}
-		this.contacts.removeFriend(contact.contactId)
-		let session = this.session.findSession(({ session }) => {
-			return String(session.type) === '0' &&
-				session.targetId === contact.contactId &&
-				(!contact.qwAccountId || session.qwAccountId === contact.qwAccountId)
-		})
-		if (!session) {
-			const qwAccountId = contact.qwAccountId || (eventData && eventData.qwAccountId)
-			const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
-			const sessionId = createSessionId(
-				accountId,
-				contact.contactId
-			)
-			session = sessionId && this.session.getSessionByLocal(sessionId)
-		}
-		if (!session) {
-			return Promise.resolve()
-		}
-		if (this.session.currentSession && this.session.currentSession.id === session.id) {
-			this.session.setCurrentSession(null)
-		}
-		const accountId = session.qwAccountId || contact.qwAccountId
-		const unreadCount = session.unreadMsgCount || 0
-		this.session.removeSession(session.id)
-		return Promise.resolve({
-			accountId,
-			unreadCount
 		})
 	}
 	
-	handleQwRoomAdded (room, eventData) {
-		if (!room.roomId) {
-			return Promise.resolve()
-		}
-		const qwAccountId = room.qwAccountId || (eventData && eventData.qwAccountId)
-		const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
-		const sessionId = createSessionId(accountId, room.roomId)
-		const localSession = sessionId && this.session.getSessionByLocal(sessionId)
-		const oldUnread = localSession ? (localSession.unreadMsgCount || 0) : 0
-		const tasks = [this.contacts.refreshRoom(room.roomId).catch(error => {
-			console.warn('[client-chat] refresh added room failed', error)
-		})]
-		if (sessionId) {
-			tasks.push(this.session.refreshSession(sessionId).then(rs => {
-				const serverSession = rs && rs.data
-				const unreadDiff = (serverSession ? (serverSession.unreadMsgCount || 0) : 0) - oldUnread
-				const changedAccountId = (serverSession && serverSession.qwAccountId) || qwAccountId
-				if (changedAccountId && unreadDiff) {
-					return this.account.updateAccountUnreadMessageNum(changedAccountId, ({ unreadMesasgeNum }) => {
-						return Math.max(0, unreadMesasgeNum + unreadDiff)
-					})
-				}
-			}).catch(error => {
-				console.warn('[client-chat] refresh added room session failed', error)
-			}))
-		}
-		return Promise.all(tasks)
-	}
-
-	handleQwRoomUpdated (room) {
-		if (!room.roomId) {
-			return Promise.resolve()
-		}
-		return this.contacts.refreshRoom(room.roomId).catch(error => {
-			console.warn('[client-chat] refresh room failed', error)
-		})
-	}
-
-	handleQwRoomRemoved (room, eventData) {
-		if (!room.roomId) {
-			return Promise.resolve()
-		}
-		this.contacts.removeRoom(room.roomId)
-		this.event.emit('roomRemoved', {
-			roomId: room.roomId
-		})
-		const qwAccountId = room.qwAccountId || (eventData && eventData.qwAccountId)
-		let session = this.session.findSession(({ session }) => {
-			return String(session.type) === '1' &&
-				session.targetId === room.roomId &&
-				(!qwAccountId || session.qwAccountId === qwAccountId)
-		})
-		if (!session) {
-			const accountId = this.getLoginAccountIdMethod ? this.getLoginAccountIdMethod() : qwAccountId
-			const sessionId = createSessionId(accountId, room.roomId)
-			session = sessionId && this.session.getSessionByLocal(sessionId)
-		}
-		if (!session) {
-			return Promise.resolve()
-		}
-		if (this.session.currentSession && this.session.currentSession.id === session.id) {
-			this.session.setCurrentSession(null)
-		}
-		const unreadCount = session.unreadMsgCount || 0
-		this.session.removeSession(session.id)
-		return Promise.resolve({
-			accountId: session.qwAccountId || qwAccountId,
-			unreadCount
-		})
-	}
-
 	connect () {
 		if (this.data.connectStatus === CONNECT_STATUS.Complete) {
 			return Promise.resolve()
@@ -595,4 +328,4 @@ class ClientChat {
 	}
 }
 
-export default ClientChat
+export default ClientChat

package/services/client-chat/client-chat-wework/utils.js

@@ -13,11 +13,11 @@ export function isUni () {
  * @param accountId - 客服id
  * @param targetId - wechatFriendId | wechatChatroomId
 */
-export function createSessionId (accountId, targetId) {
-	if (!accountId || !targetId) {
+export function createSessionId (corpId, accountId, targetId) {
+	if (!corpId || !accountId || !targetId) {
 		return
 	}
-	return shajs('sha1').update(`${accountId}${targetId}`).digest('hex')
+	return shajs('sha1').update(`${corpId}${accountId}${targetId}`).digest('hex')
 }
 
 /**
@@ -54,7 +54,7 @@ export function createSessionId (accountId, targetId) {
  *	     "msgSvrId": "4319123759514541049",
  *	     "msgType": 1,
  *	     "origin": "0",
- *	     "status": 0,
+ *	     "sendStatus": 0,
  *	     "tenantId": "1761952223049924608",
  *	     "wechatAccountId": "ad9d9ae2a8be4f27311312cdd4af3549dc8427ef",
  *	     "wechatFriendId": "2089efcc7f8f40b00b7f05fa4c6dfd3bb642774d",
@@ -79,4 +79,4 @@ export function createSessionData (message) {
 		wechatAccountId: message.wechatAccountId
 	}
 	return nextSession
-}
+}

package/uni-common/account-portray/account-portray.vue

@@ -0,0 +1,51 @@
+<template>
+	<bi-portray 
+		:avatar="accountData && accountData.avatar" 
+		:name="accountData && (accountData.memo || accountData.nickname)"
+		:loading="loading"
+	></bi-portray>
+</template>
+
+<script>
+import BiPortray from '@aochuang/common/uni-common/portray/portray.vue'
+
+export default {
+	name: 'BiAccountPortray',
+	components: {
+		BiPortray
+	},
+	props: {
+		id: {
+			type: String,
+			required: true
+		}
+	},
+	data () {
+		return {
+			loading: false,
+			accountData: null
+		}
+	},
+	watch: {
+		id () {
+			this.loadData()
+		}
+	},
+	created () {
+		this.loadData()
+	},
+	methods: {
+		loadData () {
+			this.loading = true
+			this.$clientChat.account.getAccount(this.id).then(rs => {
+				this.accountData = rs.data
+			}).finally(() => {
+				this.loading = false
+			})
+		}
+	}
+}
+</script>
+
+<style>
+</style>

package/uni-common/account-select/account-select-item.vue

@@ -0,0 +1,172 @@
+<template>
+	<view
+		class="bi-account-select-item"
+		:class="['bi-account-select-item--' + type, {'is-active': selected, 'is-online': isAll ? false : data && data.online, 'is-offline': isAll ? false : data && !data.online}]"
+	>
+		<view class="bi-account-select-item__icon">
+			<template v-if="isAll">
+				<bi-all-friend-avatar :size="avatarSize" :round="type === 'simple'"></bi-all-friend-avatar>
+			</template>
+			<template v-else>
+				<bi-avatar :src="data.avatar" :size="avatarSize" :round="type === 'simple'"></bi-avatar>
+			</template>
+		</view>
+		<view class="bi-account-select-item__text">
+			<template v-if="isAll">全部好友</template>
+			<template v-else>
+				{{ data.memo || data.nickname }}
+			</template>
+		</view>
+		<bi-badge class="bi-account-select-item__count" :value="unreadCount" :max="99" v-if="unreadCount"></bi-badge>
+	</view>
+</template>
+
+<script>
+import BiAvatar from '@aochuang/common/uni-components/avatar/avatar.vue' 
+import BiBadge from '@aochuang/common/uni-components/badge/badge.vue' 
+import BiAllFriendAvatar from '../all-friend-avatar/all-friend-avatar.vue'
+
+export default {
+	name: 'BiAccountSelectItem',
+	components: {
+		BiAvatar,
+		BiBadge,
+		BiAllFriendAvatar
+	},
+	props: {
+		isAll: {
+			type: Boolean
+		},
+		type: {
+			type: String,
+			validator (value) {
+				return ['default', 'simple'].includes(value)
+			}
+		},
+		selected: {
+			type: Boolean
+		},
+		data: {
+			type: Object
+		}
+	},
+	computed: {
+		avatarSize () {
+			return this.type === 'default' ? 'small' : 'mini'
+		},
+		accountUnreadMessageNumData () {
+			return this.$clientChat.account.accountUnreadMessageNumData || []
+		},
+		unreadCount () {
+			if (this.isAll) {
+				return this.accountUnreadMessageNumData.reduce((rs, account) => {
+					if (account.num) {
+						rs += account.num
+					}
+					return rs
+				}, 0)
+			} else {
+				const unreadMessageNumItem = this.accountUnreadMessageNumData.find(v => v.id === this.data.id)
+				return unreadMessageNumItem ? unreadMessageNumItem.num : 0
+			}
+		}
+	},
+	created () {
+		if (!this.isAll && !this.data) {
+			throw new Error('缺少data数据')
+		}
+	}
+}
+</script>
+
+<style lang="less">
+.bi-account-select-item{
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	position: relative;
+	transition: all .25s;
+	max-width: 100%;
+	&.is-active {
+		background: #3c9cff;
+		color: #fff;
+		&:after {
+			border-right-color: #fff;
+			border-bottom-color: #fff;
+		}
+	}
+	&.is-online {
+		.bi-account-select-item__icon{
+			&:after {
+				opacity: 1;
+				background-color: #40bf48;
+				border-color: #fff;
+			}
+		}
+	}
+	&.is-offline {
+		.bi-account-select-item__icon{
+			&:after {
+				opacity: 1;
+				background-color: #ccc;
+				border-color: #fff;
+			}
+		}
+	}
+}
+.bi-account-select-item__icon{
+	background-color: #eee;
+	margin-right: 6px;
+	position: relative;
+	line-height: 1em;
+	&:after {
+		content: '';
+		width: 8px;
+		height: 8px;
+		background-color: transparent;
+		border-radius: 50%;
+		border: 2px solid transparent;
+		position: absolute;
+		bottom: -2px;
+		right: -2px;
+		opacity: 0;
+	}
+}
+.bi-account-select-item__text{
+	flex: 1;
+	min-width: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.bi-account-select-item--default {
+	padding: 6px 24px 6px 12px;
+	&:after {
+		content: '';
+		width: 6px;
+		height: 6px;
+		border: 1px solid #ccc;
+		border-left: 0;
+		border-top: 0;
+		transform: rotate(-45deg) translateY(-50%);
+		position: absolute;
+		right: 12px;
+		top: 50%;
+	}
+	.bi-account-select-item__icon {
+		width: 32px;
+		height: 32px;
+		border-radius: 3px;
+	}
+}
+.bi-account-select-item--simple {
+	.bi-account-select-item__icon {
+		width: 24px;
+		height: 24px;
+		border-radius: 50%;
+	}
+	.bi-account-select-item__count{
+		transform: scale(.8);
+	}
+}
+</style>