yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.新增赛事消息uid 2.系统用户uid判断逻辑优化

Browse Source
This commit is contained in:
huangjian
2021-04-14 17:04:19 +08:00
parent efd0c89321
commit 4f6c8eeb1b
11 changed files with 59 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimRoomP2PMessageActivity.java
View File

@@ -28,7 +28,6 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.im.avtivity.NewBaseMessageActivity;
import com.yizhuan.erban.ui.im.fragment.MessageFragment;
import com.yizhuan.tutu.room_chat.event.ClickRootViewEvent;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.im.friend.IMFriendModel;
import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.initial.bean.InitInfo;
@@ -37,18 +36,15 @@ import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.SystemUidUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import org.greenrobot.eventbus.EventBus;
import java.util.List;
import java.util.Objects;
import java.util.Set;
/**
* 点对点聊天界面
* <p/>
@@ -112,8 +108,7 @@ public class NimRoomP2PMessageActivity extends NewBaseMessageActivity {
private boolean shouldDisplayAntiFraudTips() {
return !IMFriendModel.get().isMyFriend(sessionId) &&
(!(Objects.equals(sessionId, String.valueOf(XChatConstants.SECRETARY_UID)) ||
Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGE_UID)))) &&
!SystemUidUtil.isSystemUid(sessionId) &&
!IMFriendModel.get().hasCloseTips(sessionId);
}
@@ -276,8 +271,7 @@ public class NimRoomP2PMessageActivity extends NewBaseMessageActivity {
fragment.setContainerId(R.id.message_fragment_container);
// 等级限制：官方小秘书 和 系统消息，不设置等级限制
if (!Objects.equals(sessionId, String.valueOf(XChatConstants.SECRETARY_UID)) &&
!Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGE_UID))) {
if (!SystemUidUtil.isSystemUid(sessionId)) {
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
if (userInfo != null) {
UserLevelVo userLevelVo = userInfo.getUserLevelVo();

6
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgCommonRecentViewHolder.java
View File

@@ -12,7 +12,7 @@ import com.netease.nim.uikit.common.ui.recyclerview.holder.BaseViewHolder;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.RecentContact;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.utils.SystemUidUtil;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
@@ -119,9 +119,7 @@ public class RoomMsgCommonRecentViewHolder extends RoomMsgRecentViewHolder {
if (recent == null) return;
String contactId = recent.getContactId();
//去除小秘书,系统消息
long sysMsgUid = XChatConstants.SYSTEM_MESSAGE_UID;
long secretaryUid = XChatConstants.SECRETARY_UID;
if (String.valueOf(sysMsgUid).equals(contactId) || String.valueOf(secretaryUid).equals(contactId)) {
if (SystemUidUtil.isSystemUid(contactId) ) {
return;
}
}

10
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java
View File

@@ -3,19 +3,18 @@ package com.yizhuan.tutu.room_chat.fragment;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.Nullable;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseFragment;
import com.yizhuan.erban.common.NoDataFragment;
import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity;
import com.yizhuan.tutu.room_chat.adapter.RoomMsgFansViewAdapter;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.praise.event.PraiseEvent;
@@ -23,6 +22,7 @@ import com.yizhuan.xchat_android_core.user.AttentionModel;
import com.yizhuan.xchat_android_core.user.bean.FansInfo;
import com.yizhuan.xchat_android_core.user.bean.FansListInfo;
import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent;
import com.yizhuan.xchat_android_core.utils.SystemUidUtil;
import com.yizhuan.xchat_android_library.utils.ListUtils;
import org.greenrobot.eventbus.EventBus;
@@ -105,7 +105,7 @@ public class RoomMsgFansListFragment extends BaseFragment {
adapter.setOnItemChildClickListener((adapter1, view, position) -> {
FansInfo fansInfo = (FansInfo) adapter1.getItem(position);
if (fansInfo != null) {
if (XChatConstants.SECRETARY_UID == fansInfo.getUid()) {
if ( SystemUidUtil.isSystemUid(String.valueOf(fansInfo.getUid())) ) {
return;
}