From a6f45e34d63599ac8e413046054353ed140ce307 Mon Sep 17 00:00:00 2001 From: huangjian Date: Fri, 11 Dec 2020 18:36:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=B3=E9=97=ADPK=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java index c3643065c..41fc547b8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java @@ -87,7 +87,7 @@ public class RoomOperationDialog extends BottomSheetDialog { true)); rvOPtList.setLayoutManager(new FullyGridLayoutManager(getContext(), 4)); optAdapter = new OptAdapter(context, null); - addPKAction(optAdapter); + //addPKAction(optAdapter); addKTVAction(optAdapter); //addGameAction(optAdapter); addRoomLimit(optAdapter); From 6cef42f2dab636329f9c973e16e4283dfed4885c Mon Sep 17 00:00:00 2001 From: huangjian Date: Tue, 15 Dec 2020 11:47:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E7=A7=81=E4=BF=A1=E5=92=8C=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/im/recent/RecentContactsFragment.java | 18 ++++++++++ .../xchat_android_core/auth/AuthModel.java | 36 +++++++++---------- .../initial/bean/InitInfo.java | 2 ++ .../xchat_android_core/utils/CheckUtils.java | 15 ++++++++ gradle.properties | 4 +-- 5 files changed, 53 insertions(+), 22 deletions(-) create mode 100644 core/src/main/java/com/yizhuan/xchat_android_core/utils/CheckUtils.java diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java index 87c2e63dc..8cc8e235f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java @@ -1,9 +1,11 @@ package com.yizhuan.erban.ui.im.recent; import android.os.Bundle; + import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -48,8 +50,12 @@ import com.qiyukf.unicorn.api.msg.UnicornMessage; 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; import org.greenrobot.eventbus.EventBus; @@ -61,6 +67,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -390,6 +397,17 @@ public class RecentContactsFragment extends TFragment { } private void refreshMessages(boolean unreadChanged) { + + if (CheckUtils.isCheckUser()) { + Iterator iterator = items.iterator(); + 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))) { + iterator.remove(); + } + } + } sortRecentContacts(items); notifyDataSetChanged(); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java index b3bfd7184..0cba75c0b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java @@ -47,6 +47,7 @@ import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; import com.yizhuan.xchat_android_core.utils.APIEncryptUtil; +import com.yizhuan.xchat_android_core.utils.CheckUtils; import com.yizhuan.xchat_android_core.utils.OldHttpErrorHandleUtil; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.net.rxnet.RxNet; @@ -284,7 +285,7 @@ public class AuthModel extends BaseModel implements IAuthModel { //是否是超管 if (loginResult.getSuperCodeVerify() == 1) { emitter.onError(new IsSuperAdminException(loginResult.getMessage())); - }else { + } else { emitter.onError(new Throwable(loginResult.getMessage())); } } else { @@ -742,7 +743,7 @@ public class AuthModel extends BaseModel implements IAuthModel { public void subscribe(SingleEmitter emitter) throws Exception { //获取登录信息 try { - LoginResult loginResult = api.quickPassLogin( token, accessToken, yiDunToken, shuMeiDeviceId ).blockingGet(); + LoginResult loginResult = api.quickPassLogin(token, accessToken, yiDunToken, shuMeiDeviceId).blockingGet(); if (!loginResult.isSuccess()) { if (loginResult.getCode() == CODE_BAN_ACCOUNT || loginResult.getCode() == CODE_BAN_DEVICE) { emitter.onError(new BanAccountException(loginResult.getReason(), loginResult.getDate())); @@ -752,7 +753,7 @@ public class AuthModel extends BaseModel implements IAuthModel { //是否是超管 if (loginResult.getSuperCodeVerify() == 1) { emitter.onError(new IsSuperAdminException(loginResult.getMessage())); - }else { + } else { emitter.onError(new Throwable(loginResult.getMessage())); } } else if (loginResult.getCode() == CODE_BIG_HEAD_NUM) { @@ -1051,8 +1052,8 @@ public class AuthModel extends BaseModel implements IAuthModel { switch (registerResult.getCode()) { case CODE_HIT_YI_DUN: case VERIFY_CODE_ERROR: - return Single.error(new FailReasonException( - registerResult.getMessage(), registerResult.getCode())); + return Single.error(new FailReasonException( + registerResult.getMessage(), registerResult.getCode())); } return Single.error(new Throwable(registerResult.getMessage())); } @@ -1312,8 +1313,8 @@ public class AuthModel extends BaseModel implements IAuthModel { private void initNotificationConfig() { - // 初始化消息提醒 - NIMClient.toggleNotification(true); + // 初始化消息提醒,如果是审核账号,不开启推送 + NIMClient.toggleNotification(!CheckUtils.isCheckUser()); // // 加载状态栏配置 // StatusBarNotificationConfig statusBarNotificationConfig = new StatusBarNotificationConfig(); //// 更新配置 @@ -1390,7 +1391,7 @@ public class AuthModel extends BaseModel implements IAuthModel { @Query("code") String code, @Query("yiDunToken") String yiDunToken, @Query("shuMeiDeviceId") String shuMeiDeviceId - ); + ); /** @@ -1601,22 +1602,17 @@ public class AuthModel extends BaseModel implements IAuthModel { Single> check(@Query("phone") String phone, @Query("code") String code); /** - * - * @param token - * 易盾一键登录token - * @param accessToken - * 易盾一键登录accessToken - * @param shuMeiDeviceId - * 数美设备id - * @param yiDunToken - * 易盾登录保护token + * @param token 易盾一键登录token + * @param accessToken 易盾一键登录accessToken + * @param shuMeiDeviceId 数美设备id + * @param yiDunToken 易盾登录保护token * @return */ @POST("acc/oneclick/login") Single quickPassLogin(@Query("token") String token, - @Query("accessToken") String accessToken, - @Query("shuMeiDeviceId") String shuMeiDeviceId, - @Query("yiDunToken") String yiDunToken + @Query("accessToken") String accessToken, + @Query("shuMeiDeviceId") String shuMeiDeviceId, + @Query("yiDunToken") String yiDunToken ); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java index 9584fb495..44c1f5baa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java @@ -143,4 +143,6 @@ public class InitInfo implements Serializable { private String androidUrl; private String iOSUrl; } + + private List checkUids; } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/CheckUtils.java b/core/src/main/java/com/yizhuan/xchat_android_core/utils/CheckUtils.java new file mode 100644 index 000000000..b896f9a76 --- /dev/null +++ b/core/src/main/java/com/yizhuan/xchat_android_core/utils/CheckUtils.java @@ -0,0 +1,15 @@ +package com.yizhuan.xchat_android_core.utils; + +import com.yizhuan.xchat_android_core.auth.AuthModel; +import com.yizhuan.xchat_android_core.initial.InitialModel; +import com.yizhuan.xchat_android_core.initial.bean.InitInfo; +import com.yizhuan.xchat_android_library.utils.ListUtils; + +public class CheckUtils { + + public static boolean isCheckUser() { + InitInfo initInfo = InitialModel.get().getCacheInitInfo(); + if (initInfo == null || ListUtils.isListEmpty(initInfo.getCheckUids())) return false; + return initInfo.getCheckUids().contains(AuthModel.get().getCurrentUid()); + } +} diff --git a/gradle.properties b/gradle.properties index 6c0f5682e..f09e7099d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,5 @@ with_jenkins=false #\u6253\u652F\u6301x86\u7684\u6A21\u62DF\u5668\u5305\u4F7F\u7528 ndk_abi_filters=arm -version_name=2.0.0 -version_code=200 \ No newline at end of file +version_name=2.0.2 +version_code=202 \ No newline at end of file From 78b3e373f958cfb33541e4163c1798cdca02e3d5 Mon Sep 17 00:00:00 2001 From: huangjian Date: Tue, 15 Dec 2020 15:13:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=B0=8F=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/im/avtivity/NimP2PMessageActivity.java | 16 +++++-------- .../erban/ui/im/fragment/MessageFragment.java | 7 +++--- .../recent/holder/CommonRecentViewHolder.java | 4 ++-- .../erban/ui/relation/FansListFragment.java | 3 ++- .../erban/ui/user/UserInfoActivity.java | 2 +- .../erban/ui/user/UserInfoOldActivity.java | 2 +- .../erban/ui/widget/MainRedPointTab.java | 23 +++++++++++-------- .../activity/NimRoomP2PMessageActivity.java | 13 ++++++----- .../RoomMsgCommonRecentViewHolder.java | 4 ++-- .../fragment/RoomMsgFansListFragment.java | 4 +++- .../XChatConstants.java | 16 ++++--------- 11 files changed, 45 insertions(+), 49 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java index 8c0bc6e47..ff33331b7 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java @@ -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(); diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java index ce1517e9d..cd3fc0c55 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java @@ -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(); diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java index 3c2d02586..b96de8344 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java @@ -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; } diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java b/app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java index 882581096..e80ac0aaa 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java @@ -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) { diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java index 567240536..4a90d1aa2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java @@ -164,7 +164,7 @@ public class UserInfoActivity extends BaseBindingActivity 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) { diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimRoomP2PMessageActivity.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimRoomP2PMessageActivity.java index 7c2e33c69..921da1193 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimRoomP2PMessageActivity.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/NimRoomP2PMessageActivity.java @@ -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(); diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgCommonRecentViewHolder.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgCommonRecentViewHolder.java index c6f939717..001ee5cc9 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgCommonRecentViewHolder.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgCommonRecentViewHolder.java @@ -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; } diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java index 2e2a5cbf7..7091f44c3 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java @@ -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())); diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java index 1bcfb497e..f6875610c 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java @@ -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 页面 From d00912c074ab60010e792ff3f34049fb0ec2f99e Mon Sep 17 00:00:00 2001 From: huangjian Date: Tue, 15 Dec 2020 15:48:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E5=B0=8F=E7=A7=98=E4=B9=A6uid=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/ui/im/avtivity/NimP2PMessageActivity.java | 7 +++---- .../com/yizhuan/erban/ui/im/fragment/MessageFragment.java | 2 +- .../yizhuan/erban/ui/im/recent/RecentContactsFragment.java | 4 +--- .../erban/ui/im/recent/holder/CommonRecentViewHolder.java | 6 +----- .../java/com/yizhuan/erban/ui/user/UserInfoActivity.java | 6 +----- .../com/yizhuan/erban/ui/user/UserInfoOldActivity.java | 3 +-- .../tutu/room_chat/activity/NimRoomP2PMessageActivity.java | 5 ++--- .../room_chat/adapter/RoomMsgCommonRecentViewHolder.java | 4 +--- .../yizhuan/xchat_android_constants/XChatConstants.java | 4 ++-- 9 files changed, 13 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java index ff33331b7..5b347b233 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/NimP2PMessageActivity.java @@ -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(); diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java index cd3fc0c55..1395e1c8f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java @@ -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(); diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java index 8cc8e235f..5fb323f6c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java @@ -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(); } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java index b96de8344..3dade92ff 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java index 4a90d1aa2..bd9734975 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java @@ -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 Date: Tue, 15 Dec 2020 16:36:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=BF=87=E6=BB=A4=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java index 5fb323f6c..d423f5f3f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java @@ -12,6 +12,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.coorchice.library.utils.LogUtils; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.api.model.contact.ContactChangedObserver; import com.netease.nim.uikit.api.model.main.OnlineStateChangeObserver; @@ -400,7 +401,7 @@ public class RecentContactsFragment extends TFragment { Iterator iterator = items.iterator(); while (iterator.hasNext()) { RecentContact recentContact = iterator.next(); - if (!recentContact.getContactId().equals(String.valueOf(XChatConstants.SECRETARY_UID)) || + if (!recentContact.getContactId().equals(String.valueOf(XChatConstants.SECRETARY_UID)) && !recentContact.getContactId().equals(String.valueOf(XChatConstants.SYSTEM_MESSAGE_UID))) { iterator.remove(); }