@aochuang/client-sdk 1.0.360 → 1.0.363

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.360",
+  "version": "1.0.363",
   "description": "",
   "files": [
     "common",

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

@@ -5,14 +5,20 @@ 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({
@@ -21,11 +27,13 @@ export default class ClientChatAccount {
 			getAccountUnreadMessageNumMethod: null,
 			updateAccountMessageReadMethod: null,
 			deleteAccountSessionMethod: null,
+			getAccountGreetingUnreadMsgCountMethod: null,
 			onCurrentAccountChange: null,
 			onAccountAdded: null,
 			onAccountRemoved: null,
 			onUnreadMessageNumChange: null,
-			onDeleteAccountSession: null
+			onDeleteAccountSession: null,
+			onAccountLoaded: null
 		}, options)
 		if (!options.loadAccountDataMethod) {
 			throw new Error('缺少loadAccountDataMethod配置')
@@ -38,10 +46,12 @@ 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 () {
@@ -55,6 +65,10 @@ export default class ClientChatAccount {
 	get currentAccount () {
 		return this.data.currentAccount
 	}
+
+	get accountGreetingUnreadMsgCountData () {
+		return this.data.accountGreetingUnreadMsgCountData
+	}
 	
 	setCurrentAccount (accountId) {
 		let account = null
@@ -282,6 +296,9 @@ 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()
@@ -298,9 +315,75 @@ 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-session.js

@@ -465,6 +465,9 @@ export default class ClientChatSession {
 			}
 		}
 		delete this.sessionMap[id]
+		if (this.data.currentSessionId === id) {
+			this.data.currentSessionId = null
+		}
 		if (checkLastUpdateSession !== false) {
 			// todo 后面可能会删掉这块的逻辑，因为后端排序逻辑变了
 			this.checkAndUpdateLastUpdateSession()
@@ -609,7 +612,9 @@ export default class ClientChatSession {
 								return true
 							}
 						})
-						this.data.sessionGroupData[groupField][topField][oldSortFields.day][oldSortFields.milliseconds].splice(index, 1)
+						if (index >= 0) {
+							this.data.sessionGroupData[groupField][topField][oldSortFields.day][oldSortFields.milliseconds].splice(index, 1)
+						}
 					}
 				})
 				// 按照新的时间来分组排序
@@ -682,7 +687,9 @@ export default class ClientChatSession {
 								return true
 							}
 						})
-						this.data.sessionGroupData[groupField][topField][sortFields.day][sortFields.milliseconds].splice(index, 1)
+						if (index >= 0) {
+							this.data.sessionGroupData[groupField][topField][sortFields.day][sortFields.milliseconds].splice(index, 1)
+						}
 					}
 				})
 				// 所有的

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

@@ -16,6 +16,8 @@ export default class ClietChatSocket {
 			beforeFireCallback: null, 
 			onCmdQwNewMessage: null,
 			onCmdQwContactInfoChanged: null,
+			onCmdQwContactRequestChanged: null,
+			onCmdQwAcceptContactRequest: null,
 			onCmdQwRoomInfoChanged: null,
 			onCmdSendMessageResult: null,
 			onCmdFriendInfoChanged: null,
@@ -31,6 +33,8 @@ 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)

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

@@ -40,6 +40,7 @@ class ClientChat {
 			getAccountUnreadMessageNumMethod: null,
 			updateAccountMessageReadMethod: null,
 			deleteAccountSessionMethod: null,
+			getAccountGreetingUnreadMsgCountMethod: null,
 			loadContactsRoomGroupDataMethod: null,
 			loadContactsFriendGroupDataMethod: null,
 			loadContactsFriendDataMethod: null,
@@ -262,12 +263,18 @@ class ClientChat {
 			loadAccountDataMethod: options.loadAccountDataMethod,
 			getAccountUnreadMessageNumMethod: options.getAccountUnreadMessageNumMethod,
 			updateAccountMessageReadMethod: options.updateAccountMessageReadMethod,
+			getAccountGreetingUnreadMsgCountMethod: options.getAccountGreetingUnreadMsgCountMethod,
 			onAccountAdded: ({ account }) => {
 				return this.account.refreshAccountUnreadMessageNum({
 					qwAccountId: account.id,
 					corpId: account.corpId
 				})
 			},
+			onAccountLoaded: () => {
+				if (options.getAccountGreetingUnreadMsgCountMethod) {
+					this.account.refreshAllAccountGreetingUnreadMsgCount().catch(() => {})
+				}
+			},
 			onCurrentAccountChange: ({ currentAccount }) => {
 				this.contacts.refreshAllFriendGroupCount({
 					qwAccountId: currentAccount ? currentAccount.id : null
@@ -283,6 +290,24 @@ class ClientChat {
 		})
 		this.socket = new ClientChatSocket({
 			socket: options.socket,
+			onCmdQwContactRequestChanged: ({ data } = {}) => {
+				// {
+				// 	"cmdType": CmdQwContactRequestChanged
+				// 	"seq": 123,
+				// 	"cmdType": "CmdQwContactRequestChanged",
+				// 	"changeType": 1,
+				// 	"record": { ...QwContactRequestRecordDto... 
+				// }
+				// changeType：1 = 新增、2 = 状态变化（值来自 ChangeTypeEnum，序列化为数字）
+				// 触发时机：新同步到一条好友请求 → changeType=1；之后每次状态流转（1/2/3/4）→ changeType=2
+				// 推送目标：该记录 accountId 对应的客服端。若该请求未分配客服（设备无保管者）则不推送，前端不能依赖推送判断「没有新的好友请求」
+				// 新增和状态流转都会影响待处理数量，刷新对应账号的好友请求数
+				this.refreshGreetingUnreadMsgCountByPush(data)
+			},
+			onCmdQwAcceptContactRequest: ({ data } = {}) => {
+				// CmdQwAcceptContactRequest 请求字段不变（qwAccountId、remoteId），错误提示文案不变。但点击通过后状态立即变为 1（请求中），需等设备回执：超时→2、失败→3、成功→4。原来把「通过成功」判断为 2 的逻辑必须改成 4
+				this.refreshGreetingUnreadMsgCountByPush(data)
+			},
 			onCmdQwContactInfoChanged: ({ data }) => {
 				const contacts = data && (Array.isArray(data.contacts)
 					? data.contacts
@@ -401,6 +426,20 @@ class ClientChat {
 		this.contacts.markModify(qwAccountIds)
 	}
 
+	/**
+	 * 根据好友请求相关推送刷新待处理好友请求数量
+	 * 推送里能拿到账号id就只刷该账号，否则刷全部
+	*/
+	refreshGreetingUnreadMsgCountByPush (data) {
+		if (!this.account || !this.account.getAccountGreetingUnreadMsgCountMethod) {
+			return
+		}
+		const record = (data && data.record) || data || {}
+		const qwAccountId = record.qwAccountId || record.accountId || (data && data.qwAccountId)
+		const params = qwAccountId && this.account.accountMap[qwAccountId] ? { qwAccountIds: [qwAccountId] } : undefined
+		this.account.getAccountGreetingUnreadMsgCount(params).catch(() => {})
+	}
+
 	updateRemovedSessionUnreadCounts (results) {
 		const accountUnreadCountMap = {}
 		;(results || []).forEach(result => {