@aochuang/client-sdk 1.0.299 → 1.0.301

package/common/avatar/avatar.vue

@@ -37,7 +37,7 @@ export default {
 		innerSize () {
 			const map = {
 				mini: '24px',
-				small: '32px',
+				small: '36px',
 				medium: '48px',
 				large: '64px'
 			}

package/components/account-select/account-select.vue

@@ -6,7 +6,7 @@
         <template v-else>
             <template v-if="allowAllAccount">
                 <div 
-                    class="sdk-account-select__item is-all" :class="{'is-active': !value}"
+                    class="sdk-account-select__item is-all" :class="{'is-active': !value, 'is-online': true}"
                     @click="handleAccountItemClick(null)"
                 >
                     <div class="sdk-account-select__item-avatar">
@@ -23,7 +23,7 @@
             <template v-if="data && data.length">
                 <div 
                     class="sdk-account-select__item"
-                    :class="{'is-active': value === item.id}"
+                    :class="{'is-active': value === item.id, 'is-online': item[aliveField]}"
                     v-for="item in data"
                     :key="item.id"
                     @click="handleAccountItemClick(item)"
@@ -147,6 +147,13 @@ export default {
     transition: all .25s;
     position: relative;
 }
+.sdk-account-select__item:not(.is-online) {
+    color: #666;
+}
+.sdk-account-select__item:not(.is-online) .sdk-account-select__item-avatar{
+    filter: grayscale(100%);
+    opacity: .8;
+}
 .sdk-account-select__item:not(:last-child) {
     margin-bottom: 2px;
 }
@@ -178,9 +185,9 @@ export default {
     color: #666;
 }
 .sdk-account-select__item-avatar{
-    width: 32px;
-    height: 32px;
-    min-width: 32px;
+    width: 36px;
+    height: 36px;
+    min-width: 36px;
     border-radius: 3px;
     margin-right: 6px;
     position: relative;

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

@@ -135,9 +135,9 @@ export default {
 .sdk-session-item__avatar{
 	margin-right: 12px;
 	position: relative;
-	min-width: 32px;
-	width: 32px;
-	height: 32px;
+	min-width: 36px;
+	width: 36px;
+	height: 36px;
 	background-color: #eee;
 	border-radius: 3px;
 }
@@ -149,7 +149,7 @@ export default {
 	}
 	&:not(.is-mute) {
 		left: calc(~'100% - 12px');
-		top: -10px;
+		top: -8px;
 	}
 }
 .sdk-session-item__main{

package/package.json

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

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

@@ -394,6 +394,9 @@ export default class ClientChatSession {
 		if (!data.wechatAccountId) {
 			throw new Error('缺少必须参数wechatAccountId')
 		}
+		if (!Array.isArray(data.lastAtMsgContent)) {
+			data.lastAtMsgContent = []
+		}
 		if (this.onBeforeAddSession && this.onBeforeAddSession({
 			data
 		}) === false) {

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

@@ -46,6 +46,32 @@ function isAutoReadMessage (data) {
 	return !!(data && data.id && data.id.indexOf('AUTO-READ-') === 0)
 }
 
+function getAtMessageContent (data) {
+	if (!data || data.isSend || !data.content) {
+		return null
+	}
+	try {
+		const content = JSON.parse(data.content)
+		if (!content || (!Array.isArray(content.atIds) || !content.atIds.length) && (!content.text || content.text.indexOf('@所有人') < 0)) {
+			return null
+		}
+		return {
+			id: data.id,
+			content: data.content
+		}
+	} catch (e) {
+		return null
+	}
+}
+
+function appendLastAtMsgContent (lastAtMsgContent, atMessage) {
+	const messages = Array.isArray(lastAtMsgContent) ? lastAtMsgContent : []
+	if (!atMessage || messages.some(item => item && item.id === atMessage.id)) {
+		return messages
+	}
+	return messages.concat(atMessage)
+}
+
 class ClientChat {
 	data = Vue.observable({
 		connectStatus: CONNECT_STATUS.Normal
@@ -252,6 +278,9 @@ class ClientChat {
 				// 还要更新未读消息数量
 			}
 			options.onSessionReadChange = ({ session, oldUnreadMsgCount }) => {
+				instance.updateSession(session.conversationId, {
+					lastAtMsgContent: []
+				})
 				const isMute = session.mute
 				this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
 					// 如果是免打扰的会话
@@ -514,6 +543,7 @@ class ClientChat {
 			onAddMessageSuccess: ({ data }) => {
 				const accountId = options.getLoginAccountIdMethod ? options.getLoginAccountIdMethod() : data.accountId
 				let sessionId = createSessionId(accountId, data.wechatChatroomId)
+				const atMessage = getAtMessageContent(data)
 				// 更新会话
 				if (!sessionId) {
 					return
@@ -550,6 +580,9 @@ class ClientChat {
 							rs.data.lastMsgId = data.id
 							rs.data.lastUpdateTime = data.updateDate
 						}
+						if (rs && rs.data && atMessage && !(this.sessionManage.currentSession && this.sessionManage.currentSession.conversationId === sessionId)) {
+							rs.data.lastAtMsgContent = appendLastAtMsgContent(rs.data.lastAtMsgContent, atMessage)
+						}
 						return rs
 					}).then((rs) => {
 						// 更新账号未读消息数量
@@ -596,6 +629,9 @@ class ClientChat {
 								this.session.setSessionRead(sessionId)
 							} else {
 								nextSession.unreadMsgCount = session.unreadMsgCount + 1
+								if (atMessage) {
+									nextSession.lastAtMsgContent = appendLastAtMsgContent(session.lastAtMsgContent, atMessage)
+								}
 								// 更新账号未读消息数量
 								this.account.updateAccountUnreadMessageNum(session.wechatAccountId, ({ unreadMesasgeNum, unreadMessageMuteNum }) => {
 									if (session.mute) {

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

@@ -75,8 +75,9 @@ export function createSessionData (message) {
 		lastMsgType: message.msgType,
 		lastUpdateTime: message.wechatTime,
 		targetId,
+		lastAtMsgContent: [],
 		unreadMsgCount: 0,
 		wechatAccountId: message.wechatAccountId
 	}
 	return nextSession
-}
+}