@aochuang/client-sdk 1.0.376 → 1.0.377

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

@@ -5,20 +5,14 @@ export default class ClientChatAccount {
 	data = Vue.observable({
 		accountData: [],
 		accountUnreadMessageNumData: [],
-		accountGreetingUnreadMsgCountData: {},
 		currentAccount: null
 	})
 		
 	loadAccountDataMethod = null
 	
 	getAccountUnreadMessageNumMethod = null
-
-	getAccountGreetingUnreadMsgCountMethod = null
 	
 	accountMap = {}
-
-	// 好友请求数量请求合并，key为账号id列表
-	greetingUnreadRequestMap = {}
 	
 	constructor (options) {
 		options = Object.assign({
@@ -27,13 +21,11 @@ export default class ClientChatAccount {
 			getAccountUnreadMessageNumMethod: null,
 			updateAccountMessageReadMethod: null,
 			deleteAccountSessionMethod: null,
-			getAccountGreetingUnreadMsgCountMethod: null,
 			onCurrentAccountChange: null,
 			onAccountAdded: null,
 			onAccountRemoved: null,
 			onUnreadMessageNumChange: null,
-			onDeleteAccountSession: null,
-			onAccountLoaded: null
+			onDeleteAccountSession: null
 		}, options)
 		if (!options.loadAccountDataMethod) {
 			throw new Error('缺少loadAccountDataMethod配置')
@@ -46,12 +38,10 @@ export default class ClientChatAccount {
 		this.getAccountUnreadMessageNumMethod = options.getAccountUnreadMessageNumMethod
 		this.updateAccountMessageReadMethod = options.updateAccountMessageReadMethod
 		this.deleteAccountSessionMethod = options.deleteAccountSessionMethod
-		this.getAccountGreetingUnreadMsgCountMethod = options.getAccountGreetingUnreadMsgCountMethod
 		this.onAccountAdded = options.onAccountAdded
 		this.onAccountRemoved = options.onAccountRemoved,
 		this.onUnreadMessageNumChange = options.onUnreadMessageNumChange
 		this.onDeleteAccountSession = options.onDeleteAccountSession
-		this.onAccountLoaded = options.onAccountLoaded
 	}
 	
 	get accountData () {
@@ -65,10 +55,6 @@ export default class ClientChatAccount {
 	get currentAccount () {
 		return this.data.currentAccount
 	}
-
-	get accountGreetingUnreadMsgCountData () {
-		return this.data.accountGreetingUnreadMsgCountData
-	}
 	
 	setCurrentAccount (accountId) {
 		let account = null
@@ -296,9 +282,6 @@ export default class ClientChatAccount {
 		this._cacheLoadPromise = this.loadAccountDataMethod()
 		this._cacheLoadPromise.then(rs => {
 			this.setAccountData(rs.data)
-			this.onAccountLoaded && this.onAccountLoaded({
-				data: rs.data
-			})
 		})
 		this.cancelConnectRequest = () => {
 			this._cacheLoadPromise.abort()
@@ -315,75 +298,9 @@ export default class ClientChatAccount {
 		return this.loadData()
 	}
 	
-	/**
-	 * 设置指定企微账号的待处理好友请求数量，并重算all
-	*/
-	setAccountGreetingUnreadMsgCount (params) {
-		if (!params || !params.qwAccountId) {
-			throw new Error('缺少必须参数')
-		}
-		Vue.set(this.data.accountGreetingUnreadMsgCountData, params.qwAccountId, params.count || 0)
-		this.updateAllAccountGreetingUnreadMsgCount()
-	}
-
-	updateAllAccountGreetingUnreadMsgCount () {
-		const allCount = Object.keys(this.data.accountGreetingUnreadMsgCountData).reduce((rs, key) => {
-			return key === 'all' ? rs : rs + (this.data.accountGreetingUnreadMsgCountData[key] || 0)
-		}, 0)
-		Vue.set(this.data.accountGreetingUnreadMsgCountData, 'all', allCount)
-	}
-
-	/**
-	 * 获取待处理好友请求数量
-	 * qwAccountIds不传则刷新所有账号；后端数量为0的账号不返回，所以先置0再覆盖
-	*/
-	getAccountGreetingUnreadMsgCount (params) {
-		if (!this.getAccountGreetingUnreadMsgCountMethod) {
-			return Promise.reject(new Error('getAccountGreetingUnreadMsgCountMethod未定义'))
-		}
-		let qwAccountIds = (params || {}).qwAccountIds
-		if (qwAccountIds && !Array.isArray(qwAccountIds)) {
-			qwAccountIds = [qwAccountIds]
-		}
-		qwAccountIds = (qwAccountIds || []).filter((id, index, data) => id && data.indexOf(id) === index).map(String)
-		const isAll = !qwAccountIds.length
-		const requestKey = isAll ? 'all' : qwAccountIds.slice().sort().join(',')
-		if (this.greetingUnreadRequestMap[requestKey]) {
-			return this.greetingUnreadRequestMap[requestKey]
-		}
-		const request = this.getAccountGreetingUnreadMsgCountMethod({
-			qwAccountIds: isAll ? undefined : qwAccountIds
-		}).then(rs => {
-			const targetIds = isAll ? Object.keys(this.accountMap) : qwAccountIds
-			targetIds.forEach(id => {
-				Vue.set(this.data.accountGreetingUnreadMsgCountData, id, 0)
-			})
-			;((rs && rs.data) || []).forEach(item => {
-				if (item && item.qwAccountId) {
-					Vue.set(this.data.accountGreetingUnreadMsgCountData, String(item.qwAccountId), item.count || 0)
-				}
-			})
-			this.updateAllAccountGreetingUnreadMsgCount()
-			return this.data.accountGreetingUnreadMsgCountData
-		}).finally(() => {
-			delete this.greetingUnreadRequestMap[requestKey]
-		})
-		this.greetingUnreadRequestMap[requestKey] = request
-		return request
-	}
-
-	/**
-	 * 刷新所有账号的待处理好友请求数量
-	*/
-	refreshAllAccountGreetingUnreadMsgCount () {
-		return this.getAccountGreetingUnreadMsgCount()
-	}
-	
 	reset () {
 		this.data.accountData = []
 		this.data.accountUnreadMessageNumData = []
-		this.data.accountGreetingUnreadMsgCountData = {}
-		this.greetingUnreadRequestMap = {}
 		if (this.cancelConnectRequest) {
 			this.cancelConnectRequest()
 		}

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

@@ -126,7 +126,11 @@ export default class ClientChatContacts {
 		*/
 		roomBindMemberMap: {},
 		
-		modifiedAccountMap: {}
+		/**
+		 * 标记通讯录是否修改了
+		 * 如果修改了，比如接收到了分配好友的会话时，一定通讯录变了，变了的时候界面需要根据这个状态刷新通讯录
+		*/
+	    isModify: false
 	})
 	
 	friendMap = {}
@@ -233,6 +237,10 @@ export default class ClientChatContacts {
 		return this.data.roomGroupData
 	}
 	
+	get isModify () {
+		return this.data.isModify
+	}
+	
 	setRoomGroup (data) {
 		this.data.roomGroupData = []
 		if (data && data.length) {
@@ -483,10 +491,10 @@ export default class ClientChatContacts {
 				}
 			}
 			const qwAccountId = this.roomMap[id].qwAccountId
-			if (qwAccountId && this.data.accountBindRoomMap[qwAccountId] && this.data.accountBindRoomMap[qwAccountId][groupId]) {
-				const bindIndex = this.data.accountBindRoomMap[qwAccountId][groupId].indexOf(this.roomMap[id])
+			if (qwAccountId && this.data.accountBindFriendMap[qwAccountId] && this.data.accountBindFriendMap[qwAccountId][groupId]) {
+				const bindIndex = this.data.accountBindFriendMap[qwAccountId][groupId].indexOf(this.roomMap[id])
 				if (bindIndex >= 0) {
-					this.data.accountBindRoomMap[qwAccountId][groupId].splice(bindIndex, 1)
+					this.data.accountBindFriendMap[qwAccountId][groupId].splice(bindIndex, 1)
 				}
 			}
 		})
@@ -620,37 +628,6 @@ export default class ClientChatContacts {
 			return rs
 		})
 	}
-
-	/**
-	 * 强制从服务端刷新好友资料，绕过本地缓存。
-	 */
-	refreshFriend (friendId) {
-		if (!friendId) {
-			return Promise.reject('缺少好友id')
-		}
-		if (!this.getContactsFriendMethod) {
-			return Promise.reject(new Error('getContactsFriendMethod未定义'))
-		}
-		return this.getContactsFriendMethod({
-			id: friendId
-		}).then(rs => {
-			if (!rs || !rs.data) {
-				return Promise.reject('未找到好友' + friendId)
-			}
-			if (this.friendMap[friendId]) {
-				const nextKeys = Object.keys(rs.data)
-				Object.keys(this.friendMap[friendId]).forEach(key => {
-					if (!nextKeys.includes(key)) {
-						Vue.delete(this.friendMap[friendId], key)
-					}
-				})
-				this.updateFriend(friendId, rs.data)
-			} else {
-				this.addFriend(rs.data)
-			}
-			return rs
-		})
-	}
 	
 	setRoomMemberData (roomId, data) {
 		if (!roomId) {
@@ -761,52 +738,12 @@ export default class ClientChatContacts {
 		})
 	}
 	
-	refreshRoom (id) {
-		if (!id) {
-			return Promise.reject('缺少群id')
-		}
-		if (!this.getContactsRoomMethod) {
-			return Promise.reject(new Error('getContactsRoomMethod未定义'))
-		}
-		return this.getContactsRoomMethod({
-			id
-		}).then(rs => {
-			if (!rs || !rs.data) {
-				return Promise.reject('未找到群' + id)
-			}
-			const localRoom = this.roomMap[id]
-			if (localRoom) {
-				this.removeRoom(id)
-				const nextKeys = Object.keys(rs.data)
-				Object.keys(localRoom).forEach(key => {
-					if (!nextKeys.includes(key)) {
-						Vue.delete(localRoom, key)
-					}
-				})
-				Object.keys(rs.data).forEach(key => {
-					Vue.set(localRoom, key, rs.data[key])
-				})
-			}
-			this.addRoom(localRoom || rs.data)
-			return rs
-		})
-	}
-
-	isModify (qwAccountId) {
-		return !!(qwAccountId && this.data.modifiedAccountMap[qwAccountId])
-	}
-
-	markModify (qwAccountIds) {
-		const ids = Array.isArray(qwAccountIds) ? qwAccountIds : [qwAccountIds]
-		ids.filter(Boolean).forEach(id => {
-			Vue.set(this.data.modifiedAccountMap, id, true)
-		})
+	markModify () {
+		this.data.isModify = true
 	}
 	
-	unmarkModify (qwAccountId) {
-		if (qwAccountId) {
-			Vue.delete(this.data.modifiedAccountMap, qwAccountId)
-		}
+	unmarkModify () {
+		this.data.isModify = false
 	}
 	
 	reset () {
@@ -821,7 +758,6 @@ export default class ClientChatContacts {
 		this.data.groupBindRoomMap = {}
 		this.data.accountBindFriendMap = {}
 		this.data.accountBindRoomMap = {}
-		this.data.modifiedAccountMap = {}
 		this._cacheFriendGroupCountMap = null
 		this._cacheRoomGroupCountMap = null
 		if (this.cancelConnectRequest) {
@@ -833,4 +769,4 @@ export default class ClientChatContacts {
 			this.cancelRefreshRequest = null
 		}
 	}
-}
+}

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

@@ -2,7 +2,6 @@ import Vue from 'vue'
 import Event from '../../../utils/event.js'
 import { unique } from '../../../utils/string.js'
 import { formatDate } from '../../../utils/date.js'
-import { createPromise } from '../../../utils/util'
 
 export default class ClientChatMessage {
 	
@@ -23,8 +22,6 @@ export default class ClientChatMessage {
 	})
 	
 	messageMap = {}
-	tempMessageMap = {}
-	checkMessageSendResultTaskList = []
 	
 	get messageData () {
 		return this.data.messageData
@@ -36,18 +33,15 @@ export default class ClientChatMessage {
 			queryMethod: null,
 			sortField: null, // 排序的字段，必须是唯一的，例如时间
 			groupField: null, // 分组的字段
-			checkMessageSendResultMethod: null,
 			onAddMessageSuccess: null // 新增消息成功回调事件
 		}, options)
 		if (!options.clientChat) {
 			throw new Error('必须将clientChat传递过来')
 		}
-		if (!options.checkMessageSendResultMethod) throw new Error('缺少checkMessageSendResultMethod配置')
 		this.queryMethod = options.queryMethod
 		this.clientChat = options.clientChat
 		this.groupField = options.groupField
 		this.sortField = options.sortField
-		this.checkMessageSendResultMethod = options.checkMessageSendResultMethod
 		this.onAddMessageSuccess = options.onAddMessageSuccess
 		this.event = new Event()
 	}
@@ -80,7 +74,7 @@ export default class ClientChatMessage {
 	 *	     "msgSvrId": "4319123759514541049",
 	 *	     "msgType": 1,
 	 *	     "origin": "0",
-	 *	     "status": 0,
+	 *	     "sendStatus": 0,
 	 *	     "tenantId": "1761952223049924608",
 	 *	     "wechatAccountId": "ad9d9ae2a8be4f27311312cdd4af3549dc8427ef",
 	 *	     "wechatFriendId": "2089efcc7f8f40b00b7f05fa4c6dfd3bb642774d",
@@ -95,10 +89,6 @@ export default class ClientChatMessage {
 		if (this.messageMap[data.id]) {
 			return
 		}
-		if (this.tempMessageMap[data.id]) {
-			Object.assign(data, this.tempMessageMap[data.id])
-			delete this.tempMessageMap[data.id]
-		}
 		const groupField = data[this.groupField]
 		if (!this.data.messageData[groupField]) {
 			Vue.set(this.data.messageData, groupField, {})
@@ -115,7 +105,6 @@ export default class ClientChatMessage {
 		}
 		this.data.messageData[groupField][sortFields.day][sortFields.milliseconds].push(data)
 		this.messageMap[data.id] = data
-		if (data.isSend && data.status === 1 && !data._temp) this.addCheckMessageSendResultTask(data)
 		if (fireEvent !== false) {
 			this.event && this.event.emit('add-message', {
 				data
@@ -130,7 +119,6 @@ export default class ClientChatMessage {
 		if (!id) {
 			return
 		}
-		this.removeCheckMessageSendResultTask(id)
 		const message = this.messageMap[id]
 		if (!message) {
 			return
@@ -166,7 +154,6 @@ export default class ClientChatMessage {
 	updateMessage (id, props) {
 		const message = this.getMessage(id)
 		if (!message) {
-			this.tempMessageMap[id] = props
 			return
 		}
 		if (!props) {
@@ -228,11 +215,11 @@ export default class ClientChatMessage {
 		}, data, {
 			cmdType: 'CmdQwSendMessage'
 		})).then(({ data }) => {
-			if (data.status === 0) {
+			if (data.sendStatus === 0) {
 				// 发送成功
-			} else if (data.status === 2) {
+			} else if (data.sendStatus === 2) {
 				// 发送失败
-			} else if (data.status === 1) {
+			} else if (data.sendStatus === 1) {
 				// 发送中
 			}
 			// 如果返回的是对象，证明发送成功了
@@ -286,35 +273,8 @@ export default class ClientChatMessage {
 		this.clearMessage()
 		return this.loadMessageData(params)
 	}
-
-	addCheckMessageSendResultTask (message) {
-		if (this.checkMessageSendResultTaskList.some(v => v.id === message.id)) return
-		let timer
-		const task = { id: message.id, promise: createPromise(), check: () => {
-			if (message.status !== 1) return task.promise.resolve()
-			if (Date.now() - (message.createTime || message.sendTime) > 5 * 60 * 1000) return task.promise.resolve({status: 3, resultMsg: '消息发送超时'})
-			timer = setTimeout(() => {
-				Promise.resolve(this.checkMessageSendResultMethod({message})).then(rs => {
-					const data = rs && rs.data
-					if (data && data.status === 1) task.check()
-					else task.promise.resolve(data || {})
-				}, () => task.check())
-			}, 3000)
-		}, cancel: () => { clearTimeout(timer); task.promise.reject('reject') } }
-		this.checkMessageSendResultTaskList.push(task)
-		task.check()
-		task.promise.then(rs => this.updateMessage(message.id, rs || {})).finally(() => this.removeCheckMessageSendResultTask(message.id))
-	}
-
-	removeCheckMessageSendResultTask (id) {
-		const index = this.checkMessageSendResultTaskList.findIndex(v => v.id === id)
-		if (index >= 0) { this.checkMessageSendResultTaskList[index].cancel(); this.checkMessageSendResultTaskList.splice(index, 1) }
-	}
 	
 	reset () {
-		this.checkMessageSendResultTaskList.forEach(task => task.cancel())
-		this.checkMessageSendResultTaskList = []
-		this.tempMessageMap = {}
 		this.data.messageData = {}
 	}
-}
+}

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

@@ -82,8 +82,7 @@ export default class ClientChatSession {
 		/**
 		 * 删除会话
 		*/
-		deleteSessionMethod: null,
-		modifiedAccountMap: {}
+		deleteSessionMethod: null
 	})
 	
 	accountIds = []
@@ -120,23 +119,6 @@ export default class ClientChatSession {
 		return this.data.loading
 	}
 	
-	isModify (qwAccountId) {
-		return !!(qwAccountId && this.data.modifiedAccountMap[qwAccountId])
-	}
-
-	markModify (qwAccountIds) {
-		const ids = Array.isArray(qwAccountIds) ? qwAccountIds : [qwAccountIds]
-		ids.filter(Boolean).forEach(id => {
-			Vue.set(this.data.modifiedAccountMap, id, true)
-		})
-	}
-
-	unmarkModify (qwAccountId) {
-		if (qwAccountId) {
-			Vue.delete(this.data.modifiedAccountMap, qwAccountId)
-		}
-	}
-
 	get loadAssignTaskSessioning () {
 		return this.data.loadAssignTaskSessioning
 	}
@@ -223,35 +205,6 @@ export default class ClientChatSession {
 	getSessionByLocal (sessionId) {
 		return this.sessionMap[sessionId]
 	}
-
-	/**
-	 * 强制从服务端刷新会话，绕过本地缓存。
-	 */
-	refreshSession (sessionId) {
-		if (!sessionId) {
-			return Promise.reject('缺少会话id')
-		}
-		return this.getSessionMethod({
-			id: sessionId
-		}).then(rs => {
-			if (!rs || !rs.data) {
-				return Promise.reject('未找到会话' + sessionId)
-			}
-			// 事件计算出的 sessionId 是本地索引，始终保持与服务端返回对象一致。
-			const serverSession = Object.assign({}, rs.data, {
-				id: sessionId
-			})
-			const localSession = this.getSessionByLocal(sessionId)
-			if (localSession) {
-				this.updateSession(sessionId, serverSession)
-			} else {
-				this.addSession(serverSession)
-			}
-			return Object.assign({}, rs, {
-				data: serverSession
-			})
-		})
-	}
 	
 	findSession (findFn) {
 		let result 
@@ -465,9 +418,6 @@ export default class ClientChatSession {
 			}
 		}
 		delete this.sessionMap[id]
-		if (this.data.currentSessionId === id) {
-			this.data.currentSessionId = null
-		}
 		if (checkLastUpdateSession !== false) {
 			// todo 后面可能会删掉这块的逻辑，因为后端排序逻辑变了
 			this.checkAndUpdateLastUpdateSession()
@@ -612,9 +562,7 @@ export default class ClientChatSession {
 								return true
 							}
 						})
-						if (index >= 0) {
-							this.data.sessionGroupData[groupField][topField][oldSortFields.day][oldSortFields.milliseconds].splice(index, 1)
-						}
+						this.data.sessionGroupData[groupField][topField][oldSortFields.day][oldSortFields.milliseconds].splice(index, 1)
 					}
 				})
 				// 按照新的时间来分组排序
@@ -687,9 +635,7 @@ export default class ClientChatSession {
 								return true
 							}
 						})
-						if (index >= 0) {
-							this.data.sessionGroupData[groupField][topField][sortFields.day][sortFields.milliseconds].splice(index, 1)
-						}
+						this.data.sessionGroupData[groupField][topField][sortFields.day][sortFields.milliseconds].splice(index, 1)
 					}
 				})
 				// 所有的
@@ -969,7 +915,6 @@ export default class ClientChatSession {
 		this.data.sessionData = {}
 		this.data.sessionGroupData = {}
 		this.data.sessionMuteMap = {}
-		this.data.modifiedAccountMap = {}
 		// this.data.sessionUnreadCountMap = {}
 		this.sessionMap = {}
 		if (this.cancelLoadDataRequest) {
@@ -981,4 +926,4 @@ export default class ClientChatSession {
 			this.cancelRefreshRequest = null
 		}
 	}
-}
+}

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

@@ -15,16 +15,11 @@ export default class ClietChatSocket {
 			// 执行回调事件前的方法
 			beforeFireCallback: null, 
 			onCmdQwNewMessage: null,
-			onCmdQwContactInfoChanged: null,
-			onCmdQwContactRequestChanged: null,
-			onCmdQwAcceptContactRequest: null,
-			onCmdQwRoomInfoChanged: null,
 			onCmdSendMessageResult: null,
 			onCmdFriendInfoChanged: null,
 			onCmdDownloadVideoResult: null,
 			onCmdChatroomInfoChanged: null,
 			onCmdChatroomInfoChangedBatch: null,
-			onHeartbeatSuccess: null,
 			onHeartbeatCheck: null
 		}, options)
 		if (!options.socket) {
@@ -32,13 +27,6 @@ export default class ClietChatSocket {
 		}
 		this.socket = options.socket
 		this.socket.event.on('onCmdQwNewMessage', options.onCmdQwNewMessage)
-		this.socket.event.on('onCmdQwContactInfoChanged', options.onCmdQwContactInfoChanged)
-		this.socket.event.on('onCmdQwContactRequestChanged', options.onCmdQwContactRequestChanged)
-		this.socket.event.on('onCmdQwAcceptContactRequest', options.onCmdQwAcceptContactRequest)
-		this.socket.event.on('onCmdQwRoomInfoChanged', options.onCmdQwRoomInfoChanged)
-		this.socket.event.on('onHeartbeatSuccess', (evt) => {
-			options.onHeartbeatSuccess && options.onHeartbeatSuccess(evt)
-		})
 		this.socket.event.on('onHeartbeatCheck', ({ mergeParams }) => {
 			options.onHeartbeatCheck && options.onHeartbeatCheck({
 				mergeParams
@@ -74,4 +62,4 @@ export default class ClietChatSocket {
 	setUrl (url) {
 		this.socket.setUrl(url)
 	}
-}
+}