@aochuang/client-sdk 1.0.319 → 1.0.321

package/package.json

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

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

@@ -141,7 +141,7 @@ class ClientChat {
 		})
 		const mergeSessionCommonOptions = (options, instance) => {
 			let updateSessioning = false
-			let deleteSessioning = false
+			let removeSessioning = false
 			options.onAddSession = ({ session }) => {
 				// 同步未读会话
 				if (instance !== this.sessionUnread && session.unreadMsgCount > 0) {
@@ -219,23 +219,15 @@ class ClientChat {
 				}
 			}
 			options.onRemoveSession = ({ session }) => {
-				// 未读、星标等实例的局部移除不同步到其他实例，主会话移除时仅同步清理搜索缓存
-				if (instance === this.session) {
-					this.sessionFilter.removeSession(session.conversationId)
-					if (this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === session.conversationId) {
-						this.sessionManage.setCurrentSession(null)
-					}
-				}
-			}
-			options.onDeleteSession = ({ session }) => {
-				if (!session) {
+				if (instance !== this.session) {
 					return
 				}
-				if (deleteSessioning) {
+				if (removeSessioning) {
 					return
 				}
-				deleteSessioning = true
+				removeSessioning = true
 				try {
+					// 同步账号未读数量
 					this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
 						// 如果是免打扰的会话
 						if (session.mute) {
@@ -274,9 +266,12 @@ class ClientChat {
 					})
 					throw error
 				} finally {
-					deleteSessioning = false
+					removeSessioning = false
 				}
 			}
+			options.onDeleteSession = ({ session }) => {
+				// todo
+			}
 			options.onClearVirtualSession = ({ virtualSessionData }) => {
 				const selectedVirtualSession = virtualSessionData.find(v => this.sessionManage.currentSession && v.conversationId === this.sessionManage.currentSession.conversationId)
 				if (selectedVirtualSession) {
@@ -901,9 +896,11 @@ class ClientChat {
 									rs[v.wechatAccountId] = true
 									return rs
 								}, {}))
+								const changeFriendMap = {}
 								// 删除changeType为3移除的好友，例如转移的场景
 								if (data.friends && data.friends.length) {
 									data.friends.forEach(friend => {
+										changeFriendMap[friend.wechatFriendId] = friend
 										if (friend.changeType === 3) {
 											const removedFriend = this.contacts.removeFriend(friend.wechatFriendId)
 											if (!removedFriend) {
@@ -924,6 +921,31 @@ class ClientChat {
 										ps = this.account.reloadData()
 									}
 								}
+								// 这里还需要刷新一下当前会话选中的好友
+								if (this.sessionManage.currentSession && changeFriendMap[this.sessionManage.currentSession.targetId]) {
+									const sessionFriendId = this.sessionManage.currentSession.targetId
+									ps = ps.then(() => {
+										return this.contacts.getFriend(sessionFriendId, true)
+									})
+								}
+								// 刷新工作微信号未读消息数量
+								if (rs && rs.length) {
+									rs.forEach(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
+												}
+											}
+										})
+									})
+								}
 								return ps.finally(() => {
 									// 这里应该标记那些工作微信号的通讯录修改了，后面要在界面打个提示，告诉用户通讯录变化了，让手动刷新一下
 									// 同时也将缓存都清理一下，例如工作微信号分组统计数量等
@@ -988,6 +1010,24 @@ class ClientChat {
 								ps = this.account.reloadData()
 							}
 						}
+						// 刷新工作微信号未读消息数量
+						if (rs && rs.length) {
+							rs.forEach(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
+										}
+									}
+								})
+							})
+						}
 						return ps.finally(() => {
 							// 这里应该标记那些工作微信号的通讯录修改了，后面要在界面打个提示，告诉用户通讯录变化了，让手动刷新一下
 							// 同时也将缓存都清理一下，例如工作微信号分组统计数量等