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

审核账号屏蔽小红点

Browse Source
This commit is contained in:
huangjian
2020-12-15 15:13:20 +08:00
parent 6cef42f2da
commit 78b3e373f9
11 changed files with 45 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ 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;
@@ -45,8 +46,8 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
import static com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity.SECRETARY_UID;
import static com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity.SYSTEM_MESSAGE_UID;
/**
@@ -112,8 +113,8 @@ public class NimRoomP2PMessageActivity extends NewBaseMessageActivity {
private boolean shouldDisplayAntiFraudTips() {
return !IMFriendModel.get().isMyFriend(sessionId) &&
(!(Objects.equals(sessionId, String.valueOf(SECRETARY_UID)) ||
Objects.equals(sessionId, String.valueOf(SYSTEM_MESSAGE_UID)))) &&
(!(Objects.equals(sessionId, String.valueOf(XChatConstants.SECRETARY_UID)) ||
Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGER_UID)))) &&
!IMFriendModel.get().hasCloseTips(sessionId);
}
@@ -276,8 +277,8 @@ public class NimRoomP2PMessageActivity extends NewBaseMessageActivity {
fragment.setContainerId(R.id.message_fragment_container);
// 等级限制：官方小秘书 和 系统消息，不设置等级限制
if (!Objects.equals(sessionId, String.valueOf(SECRETARY_UID)) &&
!Objects.equals(sessionId, String.valueOf(SYSTEM_MESSAGE_UID))) {
if (!Objects.equals(sessionId, String.valueOf(XChatConstants.SECRETARY_UID)) &&
!Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGER_UID))) {
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
if (userInfo != null) {
UserLevelVo userLevelVo = userInfo.getUserLevelVo();

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

@@ -121,8 +121,8 @@ public class RoomMsgCommonRecentViewHolder extends RoomMsgRecentViewHolder {
if (recent == null) return;
String contactId = recent.getContactId();
//去除小秘书,系统消息
long sysMsgUid = XChatApplication.isDebug() ? XChatConstants.SYSTEM_MESSAGER_UID_DEBUG : XChatConstants.SYSTEM_MESSAGER_UID;
long secretaryUid = XChatApplication.isDebug() ? XChatConstants.SECRETARY_UID_DEBUG : XChatConstants.SECRETARY_UID;
long sysMsgUid = XChatConstants.SYSTEM_MESSAGER_UID;
long secretaryUid = XChatConstants.SECRETARY_UID;
if (String.valueOf(sysMsgUid).equals(contactId) || String.valueOf(secretaryUid).equals(contactId)) {
return;
}

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

@@ -15,6 +15,7 @@ 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;
@@ -104,7 +105,8 @@ public class RoomMsgFansListFragment extends BaseFragment {
adapter.setOnItemChildClickListener((adapter1, view, position) -> {
FansInfo fansInfo = (FansInfo) adapter1.getItem(position);
if (fansInfo != null) {
if (NimP2PMessageActivity.SECRETARY_UID == fansInfo.getUid()) {
if (XChatConstants.SECRETARY_UID == fansInfo.getUid()) {
return;
}
NimRoomP2PMessageActivity.start(getActivity(), String.valueOf(fansInfo.getUid()));