@aochuang/client-sdk 1.0.356 → 1.0.359

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

@@ -228,50 +228,40 @@ export default class ClientChatSession {
 		})
 	}
 
-	getSession (sessionId, serializeMethod, callback = null, isCache = true) {
-		if (typeof callback === 'boolean') {
-			isCache = callback
-			callback = null
-		}
+	getSession (sessionId, serializeMethod) {
 		if (this.sessionMap[sessionId]) {  
 			return Promise.resolve({
 				data: this.sessionMap[sessionId]
 			})
 		}
 		// 这里需要轮询从后端获取会话，后端会话更新和创建是异步的，所以要多轮训请求几次
-		if (this.pollRequestMap[sessionId]) {
-			// 因为有的地方要复用缓存，有的地方不能缓存，比如onAddMessagSuccess的时候不能缓存
-			if (isCache) {
-				return this.pollRequestMap[sessionId].ps
-			} else {
-				this.pollRequestMap[sessionId].stop()
-			}
-		}
-		const pollRequest = createPollRequest(({ done, fail }) => {
-			return this.getSessionMethod({
-				id: sessionId
-			}).then((rs) => {
+		if (!this.pollRequestMap[sessionId] || !this.pollRequestMap[sessionId].ps) {
+			const pollRequest = createPollRequest(({ done, fail }) => {
+				return this.getSessionMethod({
+					id: sessionId
+				}).then((rs) => {
+					if (rs.data) {
+						done(rs)
+					}
+				})
+			})
+			this.pollRequestMap[sessionId] = pollRequest
+			this.pollRequestMap[sessionId].ps = pollRequest.start().then(rs => {
+				if (serializeMethod) {
+					rs = serializeMethod(rs)
+				}
 				if (rs.data) {
-					done(rs)
+					this.addSession(rs.data, null)
+					return rs
+				} else {
+					return Promise.reject('未找到会话' + sessionId)
+				}
+			}).finally(() => {
+				if (this.pollRequestMap[sessionId] === pollRequest) {
+					delete this.pollRequestMap[sessionId]
 				}
 			})
-		})
-		this.pollRequestMap[sessionId] = pollRequest
-		this.pollRequestMap[sessionId].ps = pollRequest.start().then(rs => {
-			if (serializeMethod) {
-				rs = serializeMethod(rs)
-			}
-			if (rs.data) {
-				this.addSession(rs.data, null, callback)
-				return rs
-			} else {
-				return Promise.reject('未找到会话' + sessionId)
-			}
-		}).finally(() => {
-			if (this.pollRequestMap[sessionId] === pollRequest) {
-				delete this.pollRequestMap[sessionId]
-			}
-		})
+		}
 		return this.pollRequestMap[sessionId].ps
 	}
 	
@@ -397,7 +387,7 @@ export default class ClientChatSession {
 	 *		"wechatAccountId": "2a39a725814acf07502299ab2285fff8d44377f5"
 	 *	}
 	*/
-	addSession (data, wechatAccountId, callback) {
+	addSession (data, wechatAccountId) {
 		if (!data || !data.conversationId) {
 			throw new Error('缺少必须参数conversationId')
 		}
@@ -412,56 +402,53 @@ export default class ClientChatSession {
 		}) === false) {
 			return
 		}
-		let nextData = data
+		if (wechatAccountId && wechatAccountId !== ALL_WECHAT_ACCOUNT_ID && data.wechatAccountId !== wechatAccountId) {
+			throw new Error('会话的wechatAccount和加载分组的wechatAccountId不一致')
+		}
+		let nextData = null
+		let isRefreshAll = false
+		let groupIds = []
 		// 如果会话已经存在，那么取已经存在的，以后有需要可以用data更新已经存在的会话，保持引用关系
+		// 一般比较容易出现，例如all的时候，分配的时候有可能会出现，例如以前的会话没有正确删除，后面有分配过来了
 		if (this.sessionMap[data.conversationId]) {
+			// 如果会话比较老，就不更新属性
+			if (this.sessionMap[data.conversationId].lastMsgTime && data.lastMsgTime && this.sessionMap[data.conversationId].lastMsgTime <= data.lastMsgTime) {
+				// 先删后插
+				this._removeSessionBySessionGroup(this.sessionMap[data.conversationId].conversationId)
+				// 更新属性
+				Object.keys(data).forEach(k => {
+					Vue.set(this.sessionMap[data.conversationId], k, data[k])
+				})
+			}
 			nextData = this.sessionMap[data.conversationId]
+			isRefreshAll = true
 		} else {
-			this.sessionMap[data.conversationId] = nextData
+			nextData = data
 		}
-		const topField = nextData.stickyOnTop ? 0 : 1 // 置顶
-		if (wechatAccountId && wechatAccountId !== ALL_WECHAT_ACCOUNT_ID && nextData.wechatAccountId !== wechatAccountId) {
-			throw new Error('会话的wechatAccount和加载分组的wechatAccountId不一致')
+		if (!nextData) {
+			return
 		}
-		const groupIds = []
-		// 传了wechatAccountId，是分页加载的，这里要保持分页加载数据的链路不受动态加载的影响
 		if (wechatAccountId) {
-			groupIds.push(wechatAccountId)
-			// 传了wechatAccountId才记录lastMsgTime和lastUpdateTime
-			const lastFields = ['lastMsgTime', 'lastUpdateTime']
-			groupIds.forEach(groupId => {
-				lastFields.forEach(lastField => {
-					const lastUpdateSortFields = this.getSortField(nextData[lastField])
-					if (!lastUpdateSortFields) {
-						return
-					}
-					if (!this._lastUpdateSessionMap) {
-						this._lastUpdateSessionMap = {}
-					}
-					if (!this._lastUpdateSessionMap[groupId]) {
-						this._lastUpdateSessionMap[groupId] = {}
-					}
-					if (!this._lastUpdateSessionMap[groupId][lastField]) {
-						this._lastUpdateSessionMap[groupId][lastField] = {}
-					}
-					if (!this._lastUpdateSessionMap[groupId][lastField][topField]) {
-						this._lastUpdateSessionMap[groupId][lastField][topField] = {}
-					}
-					if (!this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day]) {
-						this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day] = {}
-					}
-					if (!this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day][lastUpdateSortFields.milliseconds]) {
-						this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day][lastUpdateSortFields.milliseconds] = []
-					}
-					this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day][lastUpdateSortFields.milliseconds].push(nextData)
-				})
-			})
+			// 传了wechatAccountId，是分页加载的，这里要保持分页加载数据的链路不受动态加载的影响
+			// 加载会话是新的在上面，老的在下面，所以一定要记录好上次分页加载的时间点
+			if (isRefreshAll) {
+				groupIds.push(nextData.wechatAccountId)
+				groupIds.push(ALL_WECHAT_ACCOUNT_ID)
+			} else {
+				groupIds.push(wechatAccountId)
+			}
+			// 先把老的删除掉
+			this._removeLastUpdateSessionMap(nextData.conversationId, wechatAccountId)
+			// 再插入新的
+			this._updateLastUpdateSessionMap([wechatAccountId], nextData)
 		} else {
 			groupIds.push(nextData.wechatAccountId)
 			groupIds.push(ALL_WECHAT_ACCOUNT_ID)
 		}
+		this.sessionMap[data.conversationId] = nextData
 		// 分组的
 		const sortFields = this.getSortField(nextData.lastMsgTime)
+		const topField = nextData.stickyOnTop ? 0 : 1 // 置顶
 		groupIds.forEach(groupId => {
 			// 如果已经在分组里面了，就不新增了，
 			if (this._getSessionBySessionGroup(nextData.conversationId, groupId)) {
@@ -492,21 +479,62 @@ export default class ClientChatSession {
 				Vue.set(this.data.sessionMuteMap, nextData.wechatAccountId, {})
 			}
 			Vue.set(this.data.sessionMuteMap[nextData.wechatAccountId], nextData.conversationId, nextData)
+		} else {
+			if (this.data.sessionMuteMap[nextData.wechatAccountId]) {
+				Vue.delete(this.data.sessionMuteMap[nextData.wechatAccountId], nextData.conversationId)
+			}
 		}
 		// 检测一下是不是存在一样的虚拟会话，存在的话就删除
 		const virtualSessionIndex = this.data.virtualSessionData.findIndex(v => v.conversationId === nextData.conversationId)
 		if (virtualSessionIndex > -1) {
 			this.data.virtualSessionData.splice(virtualSessionIndex, 1)
 		}
-		callback && callback({
-			session: data
-		})
 		this.onAddSession && this.onAddSession({
-			session: data
+			wechatAccountId,
+			session: nextData
 		})
 	}
-	
-	removeSession (conversationId) {
+
+	_updateLastUpdateSessionMap (groupIds, nextData) {
+		if (!groupIds || !groupIds.length || !nextData) {
+			return
+		}
+		// 传了wechatAccountId才记录lastMsgTime
+		const lastFields = ['lastMsgTime']
+		const topField = nextData.stickyOnTop ? 0 : 1 // 置顶
+		groupIds.forEach(groupId => {
+			lastFields.forEach(lastField => {
+				const lastUpdateSortFields = this.getSortField(nextData[lastField])
+				if (!lastUpdateSortFields) {
+					return
+				}
+				if (!this._lastUpdateSessionMap) {
+					this._lastUpdateSessionMap = {}
+				}
+				if (!this._lastUpdateSessionMap[groupId]) {
+					this._lastUpdateSessionMap[groupId] = {}
+				}
+				if (!this._lastUpdateSessionMap[groupId][lastField]) {
+					this._lastUpdateSessionMap[groupId][lastField] = {}
+				}
+				if (!this._lastUpdateSessionMap[groupId][lastField][topField]) {
+					this._lastUpdateSessionMap[groupId][lastField][topField] = {}
+				}
+				if (!this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day]) {
+					this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day] = {}
+				}
+				if (!this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day][lastUpdateSortFields.milliseconds]) {
+					this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day][lastUpdateSortFields.milliseconds] = []
+				}
+				this._lastUpdateSessionMap[groupId][lastField][topField][lastUpdateSortFields.day][lastUpdateSortFields.milliseconds].push({
+					conversationId: nextData.conversationId,
+					lastMsgTime: nextData.lastMsgTime
+				})
+			})
+		})
+	}
+
+	_removeSessionBySessionGroup (conversationId, wechatAccountId) {
 		if (!this.sessionMap[conversationId]) {
 			return
 		}
@@ -515,7 +543,7 @@ export default class ClientChatSession {
 			return
 		}
 		const topField = session.stickyOnTop ? 0 : 1 // 置顶
-		const groupIds = [session.wechatAccountId, ALL_WECHAT_ACCOUNT_ID]
+		const groupIds = wechatAccountId ? [wechatAccountId] : [session.wechatAccountId, ALL_WECHAT_ACCOUNT_ID]
 		const sortFields = this.getSortField(session.lastMsgTime)
 		groupIds.forEach(groupId => {
 			if (!this.data.sessionGroupData[groupId] || !this.data.sessionGroupData[groupId][topField]) {
@@ -523,7 +551,7 @@ export default class ClientChatSession {
 			}
 			const groupSession = this.data.sessionGroupData[groupId][topField]
 			if (groupSession[sortFields.day] && groupSession[sortFields.day][sortFields.milliseconds]) {
-				const groupIndex = groupSession[sortFields.day][sortFields.milliseconds].indexOf(this.sessionMap[conversationId])
+				const groupIndex = groupSession[sortFields.day][sortFields.milliseconds].indexOf(session)
 				if (groupIndex >= 0) {
 					groupSession[sortFields.day][sortFields.milliseconds].splice(groupIndex, 1)
 				}
@@ -541,10 +569,19 @@ export default class ClientChatSession {
 				}
 			}
 		})
-		if (this.data.sessionMuteMap[session.wechatAccountId]) {
-			delete this.data.sessionMuteMap[session.wechatAccountId][conversationId]
+	}
+
+	_removeLastUpdateSessionMap (conversationId, wechatAccountId) {
+		if (!this.sessionMap[conversationId]) {
+			return
 		}
-		const lastFields = ['lastMsgTime', 'lastUpdateTime']
+		const session = this.sessionMap[conversationId]
+		if (!session) {
+			return
+		}
+		let isDeleted = false
+		const lastFields = ['lastMsgTime']
+		const groupIds = wechatAccountId ? [wechatAccountId] : [session.wechatAccountId, ALL_WECHAT_ACCOUNT_ID]
 		groupIds.forEach(groupId => {
 			if (!this._lastUpdateSessionMap || !this._lastUpdateSessionMap[groupId]) {
 				return
@@ -553,26 +590,93 @@ export default class ClientChatSession {
 				if (!this._lastUpdateSessionMap[groupId][lastField]) {
 					return
 				}
+				const loastUpdateSortFields = this.getSortField(session[lastField])
 				Object.keys(this._lastUpdateSessionMap[groupId][lastField]).forEach(topField => {
 					if (!this._lastUpdateSessionMap[groupId][lastField][topField]) {
 						return
 					}
-					const loastUpdateSortFields = this.getSortField(session.lastUpdateTime)
 					if (this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day] && this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day][loastUpdateSortFields.milliseconds]) {
-						const index = this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day][loastUpdateSortFields.milliseconds].indexOf(session)
+						let index = -1
+						this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day][loastUpdateSortFields.milliseconds].some((v, i) => {
+							if (v.conversationId === session.conversationId) {
+								index = i
+								return true
+							}
+						})
 						if (index >= 0) {
 							this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day][loastUpdateSortFields.milliseconds].splice(index, 1)
-						}
-						if (!this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day][loastUpdateSortFields.milliseconds].length) {
-							Vue.delete(this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day], loastUpdateSortFields.milliseconds)
-						}
-						if (isEmptyObject(this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day])) {
-							Vue.delete(this._lastUpdateSessionMap[groupId][lastField][topField], loastUpdateSortFields.day)
+							if (!this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day][loastUpdateSortFields.milliseconds].length) {
+								Vue.delete(this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day], loastUpdateSortFields.milliseconds)
+							}
+							if (isEmptyObject(this._lastUpdateSessionMap[groupId][lastField][topField][loastUpdateSortFields.day])) {
+								Vue.delete(this._lastUpdateSessionMap[groupId][lastField][topField], loastUpdateSortFields.day)
+							}
+							isDeleted = true
 						}
 					}
 				})
 			})
 		})
+		if (!isDeleted) {
+			groupIds.some(groupId => {
+				if (!this._lastUpdateSessionMap || !this._lastUpdateSessionMap[groupId]) {
+					return
+				}
+				return lastFields.some(lastField => {
+					if (!this._lastUpdateSessionMap[groupId][lastField]) {
+						return
+					}
+					return Object.keys(this._lastUpdateSessionMap[groupId][lastField]).some(topField => {
+						if (!this._lastUpdateSessionMap[groupId][lastField][topField]) {
+							return
+						}
+						return Object.keys(this._lastUpdateSessionMap[groupId][lastField][topField]).some(day => {
+							if (!this._lastUpdateSessionMap[groupId][lastField][topField][day]) {
+								return
+							}
+							return Object.keys(this._lastUpdateSessionMap[groupId][lastField][topField][day]).some(milliseconds => {
+								if (!this._lastUpdateSessionMap[groupId][lastField][topField][day][milliseconds]) {
+									return
+								}
+								let index = -1
+								this._lastUpdateSessionMap[groupId][lastField][topField][day][milliseconds].some((v, i) => {
+									if (v.conversationId === session.conversationId) {
+										index = i
+										return true
+									}
+								})
+								if (index >= 0) {
+									this._lastUpdateSessionMap[groupId][lastField][topField][day][milliseconds].splice(index, 1)
+									if (!this._lastUpdateSessionMap[groupId][lastField][topField][day][milliseconds].length) {
+										Vue.delete(this._lastUpdateSessionMap[groupId][lastField][topField][day], milliseconds)
+									}
+									if (isEmptyObject(this._lastUpdateSessionMap[groupId][lastField][topField][day])) {
+										Vue.delete(this._lastUpdateSessionMap[groupId][lastField][topField], day)
+									}
+									isDeleted = true
+									return true
+								}
+							})
+						})
+					})
+				})
+			})
+		} 
+	}
+	
+	removeSession (conversationId) {
+		if (!this.sessionMap[conversationId]) {
+			return
+		}
+		const session = this.sessionMap[conversationId]
+		if (!session) {
+			return
+		}
+		this._removeSessionBySessionGroup(conversationId)
+		this._removeLastUpdateSessionMap(conversationId)
+		if (this.data.sessionMuteMap[session.wechatAccountId]) {
+			delete this.data.sessionMuteMap[session.wechatAccountId][conversationId]
+		}
 		delete this.sessionMap[conversationId]
 		this.onRemoveSession && this.onRemoveSession({
 			session

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

@@ -115,7 +115,24 @@ class ClientChat {
 		const mergeSessionCommonOptions = (options, instance) => {
 			let updateSessioning = false
 			let removeSessioning = false
-			options.onAddSession = ({ session }) => {
+			options.onAddSession = ({ session, wechatAccountId }) => {
+				// 不是来源于分页的时候，没有wechatAccountId就是代表不是走的分页增加的会话，一般为获取新消息或则分配的会话
+				if (!wechatAccountId && instance === this.session) {
+					// 更新账号未读消息数量
+					this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
+						if (session.mute) {
+							return {
+								num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
+								muteNum: (unreadMessageMuteNum || 0) + (session.unreadMsgCount || 0)
+							}
+						} else {
+							return {
+								num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
+								muteNum: unreadMessageMuteNum
+							}
+						}
+					})
+				}
 				// 同步未读会话
 				if (instance !== this.sessionUnread && session.unreadMsgCount > 0) {
 					const localSession = this.sessionUnread.findSession((localSession) => localSession.conversationId === session.conversationId)
@@ -423,22 +440,7 @@ class ClientChat {
 							rs.data.lastUpdateTime = data.updateDate
 						}
 						return rs
-					}, ({ session }) => {
-						// 更新账号未读消息数量
-						this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
-							if (session.mute) {
-								return {
-									num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
-									muteNum: (unreadMessageMuteNum || 0) + (session.unreadMsgCount || 0)
-								}
-							} else {
-								return {
-									num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
-									muteNum: unreadMessageMuteNum
-								}
-							}
-						})
-					}, false).then((rs => {
+					}).then((rs => {
 						// 前面更新未读消息数量只是处理会话的时候，因为getSession是异步的，会导致addMessage多次执行到这里，不会倒下面更新会话的逻辑
 						// 比如连续发了3条消息，然后getSession后端返回可能只会返回2条未读数，所以这里还需要补偿一下
 						const session = rs.data || {}
@@ -594,22 +596,7 @@ class ClientChat {
 							rs.data.lastAtMsgContent = appendLastAtMsgContent(rs.data.lastAtMsgContent, atMessage)
 						}
 						return rs
-					}, ({ session }) => {
-						// 更新账号未读消息数量
-						this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
-							if (session.mute) {
-								return {
-									num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
-									muteNum: (unreadMessageMuteNum || 0) + (session.unreadMsgCount || 0)
-								}
-							} else {
-								return {
-									num: (unreadMesasgeNum || 0) + (session.unreadMsgCount || 0),
-									muteNum: unreadMessageMuteNum
-								}
-							}
-						})
-					}, false).then(rs => {
+					}).then(rs => {
 						// 前面更新未读消息数量只是处理会话的时候，因为getSession是异步的，会导致addMessage多次执行到这里，不会倒下面更新会话的逻辑
 						// 比如连续发了3条消息，然后getSession后端返回可能只会返回2条未读数，所以这里还需要补偿一下
 						const session = rs.data || {}

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
 		}
 	}
-}
+}