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

16
app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java
View File

@@ -78,10 +78,6 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity {
private boolean isResume = false;
private ImageView ivAddBlackList;
public static long SYSTEM_MESSAGE_UID = XChatApplication.isDebug() ?
XChatConstants.SYSTEM_MESSAGER_UID_DEBUG : XChatConstants.SYSTEM_MESSAGER_UID;
public static long SECRETARY_UID = XChatApplication.isDebug() ?
XChatConstants.SECRETARY_UID_DEBUG : XChatConstants.SECRETARY_UID;
private View tipsLayout;
private ImageView closeIcon;
@@ -199,16 +195,16 @@ public class NimP2PMessageActivity 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);
}
private void addBlackList() {
// 官方小秘书
if (sessionId.equals(String.valueOf(SECRETARY_UID))) return;
if (sessionId.equals(String.valueOf(XChatConstants.SECRETARY_UID))) return;
// 系统消息
if (Objects.equals(sessionId, String.valueOf(SYSTEM_MESSAGE_UID))) return;
if (Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGER_UID))) return;
ivAddBlackList = findViewById(com.yizhuan.erban.R.id.iv_add_black_list);
ivAddBlackList.setVisibility(View.VISIBLE);
ivAddBlackList.setOnClickListener((view) -> {
@@ -423,8 +419,8 @@ public class NimP2PMessageActivity 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();

7
app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java
View File

@@ -65,6 +65,7 @@ import com.yizhuan.erban.avroom.game.GameSelectDialog;
import com.yizhuan.erban.avroom.game.PlayGameActivity;
import com.yizhuan.erban.bindadapter.BaseAdapter;
import com.yizhuan.erban.common.widget.OriginalDrawStatusClickSpan;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.room.event.MessageSizeEvent;
import com.yizhuan.erban.ui.im.GreetPresenter;
import com.yizhuan.erban.ui.im.MessageListPanelEx;
@@ -112,8 +113,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import static com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity.SECRETARY_UID;
import static com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity.SYSTEM_MESSAGE_UID;
/**
* 聊天界面基类
@@ -341,8 +340,8 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi
sessionType = (SessionTypeEnum) getArguments().getSerializable(Extras.EXTRA_TYPE);
inRoom = getArguments().getBoolean(IN_ROOM, false);
ImGameMode.get().inRoom = inRoom;
if (inRoom || sessionId.equals(String.valueOf(SECRETARY_UID))
|| Objects.equals(sessionId, String.valueOf(SYSTEM_MESSAGE_UID))) {
if (inRoom || sessionId.equals(String.valueOf(XChatConstants.SECRETARY_UID))
|| Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGER_UID))) {
rootView.findViewById(R.id.iv_game).setVisibility(View.GONE);
}
initUserLikeGame();

4
app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java
View File

@@ -168,8 +168,8 @@ public class CommonRecentViewHolder extends RecentViewHolder {
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;
}

3
app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java
View File

@@ -19,6 +19,7 @@ import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.ui.relation.adapter.FansViewAdapter;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity;
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.im.friend.IMFriendModel;
@@ -127,7 +128,7 @@ public class FansListFragment extends BaseFragment {
adapter.setRylListener(new FansViewAdapter.OnItemClickListener() {
@Override
public void onItemClick(FansInfo fansInfo) {
if (NimP2PMessageActivity.SECRETARY_UID == fansInfo.getUid()) {
if (XChatConstants.SECRETARY_UID == fansInfo.getUid()) {
return;
}
if (type == ROOM_MSG) {

2
app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
View File

@@ -164,7 +164,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
if (bottomViewLayout != null)
bottomViewLayout.setVisibility(View.GONE);
} else {
if (userId == NimP2PMessageActivity.SECRETARY_UID || userId == NimP2PMessageActivity.SYSTEM_MESSAGE_UID) {
if (userId == XChatConstants.SECRETARY_UID || userId == XChatConstants.SYSTEM_MESSAGER_UID) {
identityState = IdentityState.NON;
} else {
identityState = IdentityState.OTHER;

2
app/src/main/java/com/yizhuan/erban/ui/user/UserInfoOldActivity.java
View File

@@ -272,7 +272,7 @@ public class UserInfoOldActivity extends BaseBindingActivity<ActivityUserInfoOld
if (bottomViewLayout != null)
bottomViewLayout.setVisibility(View.GONE);
} else {
if (userId == NimP2PMessageActivity.SECRETARY_UID || userId == NimP2PMessageActivity.SYSTEM_MESSAGE_UID) {
if (userId == XChatConstants.SECRETARY_UID || userId == XChatConstants.SYSTEM_MESSAGER_UID) {
identityState = IdentityState.NON;
} else {
identityState = IdentityState.OTHER;

23
app/src/main/java/com/yizhuan/erban/ui/widget/MainRedPointTab.java
View File

@@ -3,17 +3,21 @@ package com.yizhuan.erban.ui.widget;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.res.TypedArray;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.security.biometrics.build.G;
import com.netease.nim.uikit.common.ui.draggablebubbles.BubbleMessageTouchListener;
import com.netease.nim.uikit.common.ui.draggablebubbles.BubbleView;
import com.netease.nim.uikit.common.ui.draggablebubbles.MessageBubbleView;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.utils.CheckUtils;
/**
* <p> main tab 有消息个数 控件 (todo:还可以优化，将字体写在字体上面)
@@ -50,9 +54,8 @@ public class MainRedPointTab extends RelativeLayout {
mMainTab.setmTabIconSelect(mTabIconSelect);
mMainTab.setText(mTabText);
mTvNum = findViewById(R.id.msg_number);
if (draggable) {
MessageBubbleView.attach(mTvNum,false, new BubbleMessageTouchListener.BubbleDisappearListener() {
MessageBubbleView.attach(mTvNum, false, new BubbleMessageTouchListener.BubbleDisappearListener() {
@Override
public void dragStart(View view) {
@@ -79,15 +82,17 @@ public class MainRedPointTab extends RelativeLayout {
@SuppressLint("SetTextI18n")
public void setNumber(int number) {
if(mTvNum instanceof BubbleView){
if (mTvNum instanceof BubbleView) {
((BubbleView) mTvNum).setNumText(number);
return;
}
mTvNum.setVisibility(number <= 0 ? GONE : VISIBLE);
if (number > 99) {
mTvNum.setText("99+");
} else
mTvNum.setText(String.valueOf(number));
else {
if (number > 99) {
mTvNum.setText("99+");
} else
mTvNum.setText(String.valueOf(number));
}
mTvNum.setVisibility((CheckUtils.isCheckUser() || number <= 0) ? GONE : VISIBLE);
}
public void setmListener(RedPointDismissListener mListener) {

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()));

16
core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
View File

@@ -128,7 +128,7 @@ public class XChatConstants {
public static final String BAIDU_APP_KEY = "b8a4cb4bd1";//已更改
/**
* 友盟统计 key
* 友盟统计 key
*/
public static final String UMENG_APP_KEY = "5e86d850978eea071c37bf48";//已更改
@@ -202,7 +202,6 @@ public class XChatConstants {
public static final String SHARE_WORLD_DYNAMIC_URL = "/modules/world/share-page/index.html";
/**
* 游戏排行榜 URL
*/
@@ -211,21 +210,14 @@ public class XChatConstants {
/**
* 系统消息那个用户的UID
*/
public static final long SYSTEM_MESSAGER_UID = 90295478;
public static final long SYSTEM_MESSAGER_UID = BuildConfig.DEBUG ? 94188 : 90295478;
/**
* 测试环境系统消息那个用户的UID
*/
public static final long SYSTEM_MESSAGER_UID_DEBUG = 94188;
/**
* 小秘书那个用户的UID
*/
public static final long SECRETARY_UID = 90003989;
/**
* 测试小秘书那个用户的UID
*/
public static final long SECRETARY_UID_DEBUG = 91333;
public static final long SECRETARY_UID = BuildConfig.DEBUG ? 91333 : 90003989;
/**
* 登录页面「如何登录」对应的 H5 页面