@aochuang/client-sdk 1.0.344 → 1.0.346

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

@@ -15,7 +15,7 @@ const CONNECT_STATUS = {
 	Normal: 'normal',
 	Loading: 'loading',
 	Complete: 'complete'
-}
+} 
 
 function getAtMessageContent (data) {
 	if (!data || data.isSend || !data.content) {
@@ -423,22 +423,45 @@ class ClientChat {
 							rs.data.lastUpdateTime = data.updateDate
 						}
 						return rs
-					}).then((rs) => {
+					}, ({ session }) => {
 						// 更新账号未读消息数量
-						this.account.updateAccountUnreadMessageNum(rs.data.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
-							if (rs.data.mute) {
+						this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
+							if (session.mute) {
 								return {
-									num: (unreadMesasgeNum || 0) + (rs.data.unreadMsgCount || 0),
-									muteNum: (unreadMessageMuteNum || 0) + (rs.data.unreadMsgCount || 0)
+									num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
+									muteNum: (unreadMessageMuteNum || 0) + (session.unreadMsgCount || 0)
 								}
 							} else {
 								return {
-									num: (unreadMesasgeNum || 0) + (rs.data.unreadMsgCount || 0),
+									num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
 									muteNum: unreadMessageMuteNum
 								}
 							}
 						})
-					}, (error) => {
+					}, false).then((rs => {
+						// 前面更新未读消息数量只是处理会话的时候，因为getSession是异步的，会导致addMessage多次执行到这里，不会倒下面更新会话的逻辑
+						// 比如连续发了3条消息，然后getSession后端返回可能只会返回2条未读数，所以这里还需要补偿一下
+						const session = rs.data || {}
+						const isNewerMessage = data.wechatTime > (session.lastMsgTime || 0)
+						if (!data.isSend && isNewerMessage) {
+							if (!(this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data))) {
+								// 更新账号未读消息数量
+								this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
+									if (session.mute) {
+										return {
+											num: (unreadMesasgeNum || 0) + 1,
+											muteNum: (unreadMessageMuteNum || 0) + 1
+										}
+									} else {
+										return {
+											num: (unreadMesasgeNum || 0) + 1,
+											muteNum: unreadMessageMuteNum
+										}
+									}
+								})
+							}
+						}
+					}), (error) => {
 						this.socket.addLog({
 							group: 'client-chat-message:onAddMessageSuccess',
 							content: {
@@ -452,9 +475,15 @@ class ClientChat {
 							}
 						})
 					})
-				} else {
-					this.session.updateSession(sessionId, ({ session }) => {
-						const nextSession = {
+					} else {
+						this.session.updateSession(sessionId, ({ session }) => {
+							// listChange/getSession may already include this message in unreadMsgCount.
+							// Only count messages newer than the session watermark.
+							const isNewerMessage = data.wechatTime > (session.lastMsgTime || 0)
+							if (!isNewerMessage) {
+								return {}
+							}
+							const nextSession = {
 							lastMsgContent: data.content,
 							lastMsgType: data.msgType,
 							lastMsgTime: data.wechatTime,
@@ -462,7 +491,7 @@ class ClientChat {
 							lastUpdateTime: data.updateDate,
 							unreadMsgCount: session.unreadMsgCount
 						}
-						if (!data.isSend) {
+						if (!data.isSend && isNewerMessage) {
 							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data)) {
 								// 标记已读
 								this.session.setSessionRead(sessionId)
@@ -565,21 +594,44 @@ class ClientChat {
 							rs.data.lastAtMsgContent = appendLastAtMsgContent(rs.data.lastAtMsgContent, atMessage)
 						}
 						return rs
-					}).then((rs) => {
+					}, ({ session }) => {
 						// 更新账号未读消息数量
-						this.account.updateAccountUnreadMessageNum(rs.data.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
-							if (rs.data.mute) {
+						this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
+							if (session.mute) {
 								return {
-									num: (unreadMesasgeNum || 0) + (rs.data.unreadMsgCount || 0),
-									muteNum: (unreadMessageMuteNum || 0) + (rs.data.unreadMsgCount || 0)
+									num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
+									muteNum: (unreadMessageMuteNum || 0) + (session.unreadMsgCount || 0)
 								}
 							} else {
 								return {
-									num: (unreadMesasgeNum || 0) + (rs.data.unreadMsgCount || 0),
+									num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
 									muteNum: unreadMessageMuteNum
 								}
 							}
 						})
+					}, false).then(rs => {
+						// 前面更新未读消息数量只是处理会话的时候，因为getSession是异步的，会导致addMessage多次执行到这里，不会倒下面更新会话的逻辑
+						// 比如连续发了3条消息，然后getSession后端返回可能只会返回2条未读数，所以这里还需要补偿一下
+						const session = rs.data || {}
+						const isNewerMessage = data.wechatTime > (session.lastMsgTime || 0)
+						if (!data.isSend && isNewerMessage) {
+							if (!(this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data))) {
+								// 更新账号未读消息数量
+								this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
+									if (session.mute) {
+										return {
+											num: (unreadMesasgeNum || 0) + 1,
+											muteNum: (unreadMessageMuteNum || 0) + 1
+										}
+									} else {
+										return {
+											num: (unreadMesasgeNum || 0) + 1,
+											muteNum: unreadMessageMuteNum
+										}
+									}
+								})
+							}
+						}
 					}, (error) => {
 						this.socket.addLog({
 							group: 'client-chat-message:onAddMessageSuccess',
@@ -594,9 +646,15 @@ class ClientChat {
 							}
 						})
 					})
-				} else {
-					this.session.updateSession(sessionId, ({ session }) => {
-						const nextSession = {
+					} else {
+						this.session.updateSession(sessionId, ({ session }) => {
+							// listChange/getSession may already include this message in unreadMsgCount.
+							// Only count messages newer than the session watermark.
+							const isNewerMessage = data.wechatTime > (session.lastMsgTime || 0)
+							if (!isNewerMessage) {
+								return {}
+							}
+							const nextSession = {
 							lastMsgContent: data.content,
 							lastMsgType: data.msgType,
 							lastMsgTime: data.wechatTime,
@@ -604,7 +662,7 @@ class ClientChat {
 							lastUpdateTime: data.updateDate,
 							unreadMsgCount: session.unreadMsgCount
 						}
-						if (!data.isSend) {
+							if (!data.isSend && isNewerMessage) {
 							if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId && this.shouldMarkCurrentSessionRead(sessionId, data)) {
 								// 标记已读
 								this.session.setSessionRead(sessionId)
@@ -1082,9 +1140,13 @@ class ClientChat {
 			onCmdFriendAccepted: ({ data }) => {
 				// 刷新指定微信号请求数量
 				if (data.wechatAccountId) {
-					this.account.getAccountGreetingUnreadMsgCount({
-						wechatAccountId: data.wechatAccountId
-					})
+					if (!this.account.accountMap[data.wechatAccountId]) {
+						this.account.reloadData()
+					} else {
+						this.account.getAccountGreetingUnreadMsgCount({
+							wechatAccountId: data.wechatAccountId
+						})
+					}
 				}
 				// 刷新所有微信号请求数量
 				this.account.getAccountGreetingUnreadMsgCount()

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

@@ -74,7 +74,7 @@ export default class ClientChatMessage {
 	 *	     "msgSvrId": "4319123759514541049",
 	 *	     "msgType": 1,
 	 *	     "origin": "0",
-	 *	     "status": 0,
+	 *	     "sendStatus": 0,
 	 *	     "tenantId": "1761952223049924608",
 	 *	     "wechatAccountId": "ad9d9ae2a8be4f27311312cdd4af3549dc8427ef",
 	 *	     "wechatFriendId": "2089efcc7f8f40b00b7f05fa4c6dfd3bb642774d",
@@ -215,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) {
 				// 发送中
 			}
 			// 如果返回的是对象，证明发送成功了
@@ -277,4 +277,4 @@ export default class ClientChatMessage {
 	reset () {
 		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 
@@ -962,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) {
@@ -974,4 +926,4 @@ export default class ClientChatSession {
 			this.cancelRefreshRequest = null
 		}
 	}
-}
+}

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

@@ -15,14 +15,11 @@ export default class ClietChatSocket {
 			// 执行回调事件前的方法
 			beforeFireCallback: null, 
 			onCmdQwNewMessage: null,
-			onCmdQwContactInfoChanged: null,
-			onCmdQwRoomInfoChanged: null,
 			onCmdSendMessageResult: null,
 			onCmdFriendInfoChanged: null,
 			onCmdDownloadVideoResult: null,
 			onCmdChatroomInfoChanged: null,
 			onCmdChatroomInfoChangedBatch: null,
-			onHeartbeatSuccess: null,
 			onHeartbeatCheck: null
 		}, options)
 		if (!options.socket) {
@@ -30,11 +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('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
@@ -70,4 +62,4 @@ export default class ClietChatSocket {
 	setUrl (url) {
 		this.socket.setUrl(url)
 	}
-}
+}