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

系统消息和小秘书uid修改

Browse Source
This commit is contained in:
huangjian
2020-12-15 15:48:05 +08:00
parent 78b3e373f9
commit d00912c074
9 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@ import com.netease.nimlib.sdk.msg.MsgServiceObserve;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.CustomNotification;
import com.yizhuan.erban.R;
import com.yizhuan.erban.application.XChatApplication;
import com.yizhuan.erban.common.widget.CustomImageSpan;
import com.yizhuan.erban.ui.im.audio.ShakeHeartDialogFragment;
import com.yizhuan.erban.ui.im.fragment.MessageFragment;
@@ -196,7 +195,7 @@ public class NimP2PMessageActivity 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_MESSAGER_UID)))) &&
Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGE_UID)))) &&
!IMFriendModel.get().hasCloseTips(sessionId);
}
@@ -204,7 +203,7 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity {
// 官方小秘书
if (sessionId.equals(String.valueOf(XChatConstants.SECRETARY_UID))) return;
// 系统消息
if (Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGER_UID))) return;
if (Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGE_UID))) return;
ivAddBlackList = findViewById(com.yizhuan.erban.R.id.iv_add_black_list);
ivAddBlackList.setVisibility(View.VISIBLE);
ivAddBlackList.setOnClickListener((view) -> {
@@ -420,7 +419,7 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity {
// 等级限制：官方小秘书 和 系统消息，不设置等级限制
if (!Objects.equals(sessionId, String.valueOf(XChatConstants.SECRETARY_UID)) &&
!Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGER_UID))) {
!Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGE_UID))) {
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
if (userInfo != null) {
UserLevelVo userLevelVo = userInfo.getUserLevelVo();

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

@@ -341,7 +341,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi
inRoom = getArguments().getBoolean(IN_ROOM, false);
ImGameMode.get().inRoom = inRoom;
if (inRoom || sessionId.equals(String.valueOf(XChatConstants.SECRETARY_UID))
|| Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGER_UID))) {
|| Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGE_UID))) {
rootView.findViewById(R.id.iv_game).setVisibility(View.GONE);
}
initUserLikeGame();

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

@@ -51,10 +51,8 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.home.event.ContactTrashEvent;
import com.yizhuan.erban.ui.im.recent.adapter.RecentContactAdapter;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.customer_server.CustomerServerModel;
import com.yizhuan.xchat_android_core.customer_server.event.CustomerServerMsgEvent;
import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.utils.CheckUtils;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
@@ -403,7 +401,7 @@ public class RecentContactsFragment extends TFragment {
while (iterator.hasNext()) {
RecentContact recentContact = iterator.next();
if (!recentContact.getContactId().equals(String.valueOf(XChatConstants.SECRETARY_UID)) ||
!recentContact.getContactId().equals(String.valueOf(XChatConstants.SYSTEM_MESSAGER_UID))) {
!recentContact.getContactId().equals(String.valueOf(XChatConstants.SYSTEM_MESSAGE_UID))) {
iterator.remove();
}
}

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

@@ -9,22 +9,18 @@ import android.view.View;
import com.netease.nim.uikit.api.NimUIKit;
import com.netease.nim.uikit.common.ui.draggablebubbles.BubbleMessageTouchListener;
import com.netease.nim.uikit.common.ui.draggablebubbles.MessageBubbleView;
import com.netease.nim.uikit.common.ui.drop.DropFake;
import com.netease.nim.uikit.common.ui.drop.DropManager;
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseQuickAdapter;
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.BuildConfig;
import com.yizhuan.erban.R;
import com.yizhuan.erban.application.XChatApplication;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.level.UserLevelVo;
import com.yizhuan.xchat_android_core.noble.NobleInfo;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import static android.view.View.GONE;
@@ -168,7 +164,7 @@ public class CommonRecentViewHolder extends RecentViewHolder {
if (recent == null) return;
String contactId = recent.getContactId();
//去除小秘书,系统消息
long sysMsgUid = XChatConstants.SYSTEM_MESSAGER_UID;
long sysMsgUid = XChatConstants.SYSTEM_MESSAGE_UID;
long secretaryUid = XChatConstants.SECRETARY_UID;
if (String.valueOf(sysMsgUid).equals(contactId) || String.valueOf(secretaryUid).equals(contactId)) {
return;

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

@@ -16,9 +16,7 @@ import androidx.core.widget.NestedScrollView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.security.biometrics.service.build.V;
import com.jude.rollviewpager.hintview.TextHintView;
import com.netease.nim.uikit.common.util.sys.ScreenUtil;
import com.netease.nim.uikit.impl.cache.NimUserInfoCache;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.netease.nimlib.sdk.RequestCallbackWrapper;
@@ -51,7 +49,6 @@ import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean;
import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel;
import com.yizhuan.xchat_android_core.customer_server.CustomerServerModel;
import com.yizhuan.xchat_android_core.im.friend.IMFriendModel;
import com.yizhuan.xchat_android_core.level.UserLevelVo;
import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
@@ -74,7 +71,6 @@ import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.xchat_android_library.utils.SizeUtils;
@@ -164,7 +160,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
if (bottomViewLayout != null)
bottomViewLayout.setVisibility(View.GONE);
} else {
if (userId == XChatConstants.SECRETARY_UID || userId == XChatConstants.SYSTEM_MESSAGER_UID) {
if (userId == XChatConstants.SECRETARY_UID || userId == XChatConstants.SYSTEM_MESSAGE_UID) {
identityState = IdentityState.NON;
} else {
identityState = IdentityState.OTHER;

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

@@ -45,7 +45,6 @@ import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.common.widget.dialog.CommonPopupDialog;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.community.user_dynamic.UserDynamicFrg;
import com.yizhuan.erban.databinding.ActivityUserInfoBinding;
import com.yizhuan.erban.databinding.ActivityUserInfoOldBinding;
import com.yizhuan.erban.family.view.activity.FamilyHomeActivity;
import com.yizhuan.erban.family.view.activity.FamilyMemberListActivity;
@@ -272,7 +271,7 @@ public class UserInfoOldActivity extends BaseBindingActivity<ActivityUserInfoOld
if (bottomViewLayout != null)
bottomViewLayout.setVisibility(View.GONE);
} else {
if (userId == XChatConstants.SECRETARY_UID || userId == XChatConstants.SYSTEM_MESSAGER_UID) {
if (userId == XChatConstants.SECRETARY_UID || userId == XChatConstants.SYSTEM_MESSAGE_UID) {
identityState = IdentityState.NON;
} else {
identityState = IdentityState.OTHER;

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

@@ -3,7 +3,6 @@ package com.yizhuan.tutu.room_chat.activity;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.os.Bundle;
import android.text.SpannableStringBuilder;
import android.util.Log;
@@ -114,7 +113,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_MESSAGER_UID)))) &&
Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGE_UID)))) &&
!IMFriendModel.get().hasCloseTips(sessionId);
}
@@ -278,7 +277,7 @@ public class NimRoomP2PMessageActivity extends NewBaseMessageActivity {
// 等级限制：官方小秘书 和 系统消息，不设置等级限制
if (!Objects.equals(sessionId, String.valueOf(XChatConstants.SECRETARY_UID)) &&
!Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGER_UID))) {
!Objects.equals(sessionId, String.valueOf(XChatConstants.SYSTEM_MESSAGE_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

@@ -11,9 +11,7 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseQuickAdapter;
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.BuildConfig;
import com.yizhuan.erban.R;
import com.yizhuan.erban.application.XChatApplication;
import com.yizhuan.xchat_android_constants.XChatConstants;
import static android.view.View.GONE;
@@ -121,7 +119,7 @@ public class RoomMsgCommonRecentViewHolder extends RoomMsgRecentViewHolder {
if (recent == null) return;
String contactId = recent.getContactId();
//去除小秘书,系统消息
long sysMsgUid = XChatConstants.SYSTEM_MESSAGER_UID;
long sysMsgUid = XChatConstants.SYSTEM_MESSAGE_UID;
long secretaryUid = XChatConstants.SECRETARY_UID;
if (String.valueOf(sysMsgUid).equals(contactId) || String.valueOf(secretaryUid).equals(contactId)) {
return;

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

@@ -210,13 +210,13 @@ public class XChatConstants {
/**
* 系统消息那个用户的UID
*/
public static final long SYSTEM_MESSAGER_UID = BuildConfig.DEBUG ? 94188 : 90295478;
public static final long SYSTEM_MESSAGE_UID = BuildConfig.DEBUG ? 935008 : 935066;
/**
* 小秘书那个用户的UID
*/
public static final long SECRETARY_UID = BuildConfig.DEBUG ? 91333 : 90003989;
public static final long SECRETARY_UID = BuildConfig.DEBUG ? 935001 : 935067;
/**