@aochuang/client-sdk 1.0.336 → 1.0.338

package/components/session-select/session-select-item.vue

@@ -5,10 +5,8 @@
 				<div class="sdk-session-item__avatar-image">
 					<slot name="avatar"></slot>
 				</div>
-				<span class="sdk-session-item__avatar-badge">
+				<span v-if="data[unreadMsgCountField]" class="sdk-session-item__avatar-badge" :class="{'is-mute': data[muteField]}">
 					<sdk-badge  
-						:class="{'is-mute': data[muteField]}"
-						v-if="data[unreadMsgCountField]"  
 						:is-dot="data[muteField]"
 						:value="data[unreadMsgCountField]"
 						:max="99"

package/components/wework-chat-control/util.js

@@ -8,7 +8,7 @@ export const MESSAGE_TYPE = {
 	CUSTOM_EXPRESSION_W: 104,
     // MUSIC: 1040187441,
 	// ROOM_CALLING: 64,
-	SHARE_CARD: 41,
+	SHARE_CARD: 31,
 	// COMPANY_CARD: 41,
 	// VIDEO: 43,
 	// CUSTOM_EXPRESSION: 47,

package/components/wework-chat-panel/chat-panel-item.vue

@@ -7,7 +7,7 @@
         <template v-if="item.msgType !== '_EMPTY_'">
 			<slot name="chat-prefix" :item="item"></slot>
 		</template>
-      <template v-if="[0, 1, 2].includes(item.msgType)">
+      <template v-if="item.msgType === MESSAGE_TYPE.TEXT || item.msgType === MESSAGE_TYPE.TEXT_W">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -26,7 +26,7 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="[14, 101].includes(item.msgType)">
+      <template v-else-if="item.msgType === MESSAGE_TYPE.IMAGE">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -289,7 +289,7 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="item.msgType == MESSAGE_TYPE.URL">
+      <template v-else-if="item.msgType == MESSAGE_TYPE.URL || item.msgType == MESSAGE_TYPE.URLNew">
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -312,29 +312,6 @@
           </template>
         </sdk-chat-panel-box>
       </template>
-      <template v-else-if="[13, 15, 20, 102].includes(item.msgType)">
-        <sdk-chat-panel-box
-          :dir="dir"
-          :data="item"
-          :fetchUserMethod="fetchUserMethod"
-          bg-color="#fff"
-          br-color="#ddd"
-          @user-avatar-click="handleUserAvatarClick"
-          @user-avatar-contextmenu="handleUserAvatarContextmenu"
-          >
-          <template slot-scope="{ updateProp }">
-            <sdk-chat-control-file-url
-              v-bind="configData"
-              :id="item.id"
-              :content="msgContent"
-              :update-chat-box-prop="updateProp"
-            ></sdk-chat-control-file-url>
-          </template>
-          <template slot="append" slot-scope="{ updateProp }">
-            <slot name="chat-append" :item="item" :update-chat-box-prop="updateProp"></slot>
-          </template>
-        </sdk-chat-panel-box>
-      </template>
       <template v-else-if="item.msgType == MESSAGE_TYPE.CUSTOM_EXPRESSION">
         <sdk-chat-panel-box
           :dir="dir"
@@ -510,7 +487,7 @@
           :content="msgContent"
         ></sdk-chat-control-empty>
       </template>
-      <!-- <template v-else>
+      <template v-else>
         <sdk-chat-panel-box
           :dir="dir"
           :data="item"
@@ -523,7 +500,7 @@
             :content="msgContent"
           ></sdk-chat-control-unknow>
         </sdk-chat-panel-box>
-      </template> -->
+      </template>
       </div>
     </template>
   </wework-chat-control-config-msg>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aochuang/client-sdk",
-  "version": "1.0.336",
+  "version": "1.0.338",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

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

@@ -126,11 +126,7 @@ export default class ClientChatContacts {
 		*/
 		roomBindMemberMap: {},
 		
-		/**
-		 * 标记通讯录是否修改了
-		 * 如果修改了，比如接收到了分配好友的会话时，一定通讯录变了，变了的时候界面需要根据这个状态刷新通讯录
-		*/
-	    isModify: false
+		modifiedAccountMap: {}
 	})
 	
 	friendMap = {}
@@ -237,10 +233,6 @@ export default class ClientChatContacts {
 		return this.data.roomGroupData
 	}
 	
-	get isModify () {
-		return this.data.isModify
-	}
-	
 	setRoomGroup (data) {
 		this.data.roomGroupData = []
 		if (data && data.length) {
@@ -491,10 +483,10 @@ export default class ClientChatContacts {
 				}
 			}
 			const qwAccountId = this.roomMap[id].qwAccountId
-			if (qwAccountId && this.data.accountBindFriendMap[qwAccountId] && this.data.accountBindFriendMap[qwAccountId][groupId]) {
-				const bindIndex = this.data.accountBindFriendMap[qwAccountId][groupId].indexOf(this.roomMap[id])
+			if (qwAccountId && this.data.accountBindRoomMap[qwAccountId] && this.data.accountBindRoomMap[qwAccountId][groupId]) {
+				const bindIndex = this.data.accountBindRoomMap[qwAccountId][groupId].indexOf(this.roomMap[id])
 				if (bindIndex >= 0) {
-					this.data.accountBindFriendMap[qwAccountId][groupId].splice(bindIndex, 1)
+					this.data.accountBindRoomMap[qwAccountId][groupId].splice(bindIndex, 1)
 				}
 			}
 		})
@@ -769,12 +761,52 @@ export default class ClientChatContacts {
 		})
 	}
 	
-	markModify () {
-		this.data.isModify = true
+	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)
+		})
 	}
 	
-	unmarkModify () {
-		this.data.isModify = false
+	unmarkModify (qwAccountId) {
+		if (qwAccountId) {
+			Vue.delete(this.data.modifiedAccountMap, qwAccountId)
+		}
 	}
 	
 	reset () {
@@ -789,6 +821,7 @@ 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) {

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

@@ -82,7 +82,8 @@ export default class ClientChatSession {
 		/**
 		 * 删除会话
 		*/
-		deleteSessionMethod: null
+		deleteSessionMethod: null,
+		modifiedAccountMap: {}
 	})
 	
 	accountIds = []
@@ -119,6 +120,23 @@ 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
 	}
@@ -944,6 +962,7 @@ export default class ClientChatSession {
 		this.data.sessionData = {}
 		this.data.sessionGroupData = {}
 		this.data.sessionMuteMap = {}
+		this.data.modifiedAccountMap = {}
 		// this.data.sessionUnreadCountMap = {}
 		this.sessionMap = {}
 		if (this.cancelLoadDataRequest) {

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

@@ -16,6 +16,7 @@ export default class ClietChatSocket {
 			beforeFireCallback: null, 
 			onCmdQwNewMessage: null,
 			onCmdQwContactInfoChanged: null,
+			onCmdQwRoomInfoChanged: null,
 			onCmdSendMessageResult: null,
 			onCmdFriendInfoChanged: null,
 			onCmdDownloadVideoResult: null,
@@ -29,6 +30,7 @@ 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('onHeartbeatCheck', ({ mergeParams }) => {
 			options.onHeartbeatCheck && options.onHeartbeatCheck({
 				mergeParams

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

@@ -113,7 +113,7 @@ class ClientChat {
 				} else {
 					this.session.updateSession(sessionId, ({ session }) => {
 						let unreadMsgCount = session.unreadMsgCount
-						if (!data.isSend) {
+						if (!data.send) {
 							unreadMsgCount = unreadMsgCount + 1
 						}
 						// 如果是当前会话，那么未读消息需要设置为0
@@ -184,7 +184,7 @@ class ClientChat {
 				} else {
 					this.session.updateSession(sessionId, ({ session }) => {
 						let unreadMsgCount = session.unreadMsgCount
-						if (!data.isSend) {
+						if (!data.send) {
 							unreadMsgCount = unreadMsgCount + 1
 						}
 						// 如果是当前会话，那么未读消息需要设置为0
@@ -262,11 +262,12 @@ class ClientChat {
 		})
 		this.socket = new ClientChatSocket({
 			socket: options.socket,
-		onCmdQwContactInfoChanged: ({ data }) => {
+			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 = []
@@ -303,6 +304,35 @@ class ClientChat {
 					}))
 				})
 			},
+			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 }) => {
 				// 插入消息
@@ -345,6 +375,32 @@ class ClientChat {
 		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(
@@ -359,7 +415,6 @@ class ClientChat {
 		}
 		const localSession = this.session.getSessionByLocal(sessionId)
 		const oldUnread = localSession ? (localSession.unreadMsgCount || 0) : 0
-		this.contacts.markModify()
 		return this.session.refreshSession(sessionId).then(rs => {
 			const serverSession = rs && rs.data
 			const newUnread = serverSession ? (serverSession.unreadMsgCount || 0) : 0
@@ -379,9 +434,7 @@ class ClientChat {
 		if (!contact.contactId) {
 			return Promise.resolve()
 		}
-		return this.contacts.refreshFriend(contact.contactId).then(() => {
-			this.contacts.markModify()
-		}).catch(error => {
+		return this.contacts.refreshFriend(contact.contactId).catch(error => {
 			console.warn('[client-chat] refresh contact failed', error)
 		})
 	}
@@ -405,7 +458,6 @@ class ClientChat {
 			)
 			session = sessionId && this.session.getSessionByLocal(sessionId)
 		}
-		this.contacts.markModify()
 		if (!session) {
 			return Promise.resolve()
 		}
@@ -421,6 +473,77 @@ class ClientChat {
 		})
 	}
 	
+	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()