Browse Source

一些小优化

master
xsx 2 years ago
parent
commit
101bc1d59a
  1. 3
      im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
  2. 3
      im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
  3. 16
      im-uniapp/App.vue
  4. 2
      im-uniapp/common/emotion.js
  5. 7
      im-uniapp/pages/chat/chat-box.vue

3
im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java

@ -206,12 +206,13 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
if(!imClient.isOnline(session.getUserId())){
throw new GlobalException(ResultCode.PROGRAM_ERROR, "网络连接失败,无法拉取离线消息");
}
// 查询用户加入的群组
List<GroupMember> members = groupMemberService.findByUserId(session.getUserId());
Map<Long, GroupMember> groupMemberMap = CollStreamUtil.toIdentityMap(members, GroupMember::getGroupId);
Set<Long> groupIds = groupMemberMap.keySet();
if(CollectionUtil.isEmpty(groupIds)){
// 关闭加载中标志
this.sendLoadingMessage(false);
return;
}
// 开启加载中标志

3
im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java

@ -182,10 +182,11 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
if(!imClient.isOnline(session.getUserId())){
throw new GlobalException(ResultCode.PROGRAM_ERROR, "网络连接失败,无法拉取离线消息");
}
// 查询用户好友列表
List<Friend> friends = friendService.findFriendByUserId(session.getUserId());
if (friends.isEmpty()) {
// 关闭加载中标志
this.sendLoadingMessage(false);
return;
}
// 开启加载中标志

16
im-uniapp/App.vue

@ -64,15 +64,19 @@
store.commit("loadingPrivateMsg",true)
http({
url: "/message/private/pullOfflineMessage?minId=" + minId,
method: 'get'
});
method: 'GET'
}).catch(()=>{
store.commit("loadingPrivateMsg",false)
})
},
pullGroupOfflineMessage(minId) {
store.commit("loadingGroupMsg",true)
http({
url: "/message/group/pullOfflineMessage?minId=" + minId,
method: 'get'
});
method: 'GET'
}).catch(()=>{
store.commit("loadingGroupMsg",false)
})
},
handlePrivateMessage(msg) {
//
@ -201,7 +205,7 @@
} else {
http({
url: `/friend/find/${id}`,
method: 'get'
method: 'GET'
}).then((friend) => {
store.commit("addFriend", friend);
resolve(friend)
@ -217,7 +221,7 @@
} else {
http({
url: `/group/find/${id}`,
method: 'get'
method: 'GET'
}).then((group) => {
resolve(group)
store.commit("addGroup", group);

2
im-uniapp/common/emotion.js

@ -25,7 +25,7 @@ let textToImg = (emoText) => {
// 微信小程序不能有前面的'/'
path = path.slice(1);
// #endif
let img = `<img src="${path}" style="with:35px;height:35px;
let img = `<img src="${path}" style="with:30px;height:30px;
margin: 0 -2px;vertical-align:bottom;"/>`;
return img;
}

7
im-uniapp/pages/chat/chat-box.vue

@ -497,10 +497,7 @@
},
onScrollToTop() {
if(this.showMinIdx==0){
uni.showToast({
title: "没有更多消息啦",
icon: "none"
})
console.log("消息已滚动到顶部")
return;
}
@ -575,7 +572,7 @@
this.$http({
url: `/group/members/${groupId}`,
method: 'get'
method: 'GET'
}).then((groupMembers) => {
this.groupMembers = groupMembers;
});

Loading…
Cancel
Save