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

Merge branch 'huawei_check' into develop

Browse Source
This commit is contained in:
huangjian
2020-12-17 18:55:38 +08:00
parent 634bffccce cd4e67b264
commit b3949b6502
17 changed files with 98 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java
View File

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

17
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;
@@ -78,10 +77,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 +194,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_MESSAGE_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_MESSAGE_UID))) return;
ivAddBlackList = findViewById(com.yizhuan.erban.R.id.iv_add_black_list);
ivAddBlackList.setVisibility(View.VISIBLE);
ivAddBlackList.setOnClickListener((view) -> {
@@ -423,8 +418,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_MESSAGE_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_MESSAGE_UID))) {
rootView.findViewById(R.id.iv_game).setVisibility(View.GONE);
}
initUserLikeGame();

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

@@ -1,15 +1,18 @@
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;
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;
@@ -48,8 +51,10 @@ 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.customer_server.CustomerServerModel;
import com.yizhuan.xchat_android_core.customer_server.event.CustomerServerMsgEvent;
import com.yizhuan.xchat_android_core.utils.CheckUtils;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import org.greenrobot.eventbus.EventBus;
@@ -61,6 +66,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 +396,17 @@ public class RecentContactsFragment extends TFragment {
}
private void refreshMessages(boolean unreadChanged) {
if (CheckUtils.isCheckUser()) {
Iterator<RecentContact> 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_MESSAGE_UID))) {
iterator.remove();
}
}
}
sortRecentContacts(items);
notifyDataSetChanged();

8
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,8 +164,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_MESSAGE_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) {

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 == NimP2PMessageActivity.SECRETARY_UID || userId == NimP2PMessageActivity.SYSTEM_MESSAGE_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 == NimP2PMessageActivity.SECRETARY_UID || userId == NimP2PMessageActivity.SYSTEM_MESSAGE_UID) {
if (userId == XChatConstants.SECRETARY_UID || userId == XChatConstants.SYSTEM_MESSAGE_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) {

14
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;
@@ -29,6 +28,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 +45,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 +112,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_MESSAGE_UID)))) &&
!IMFriendModel.get().hasCloseTips(sessionId);
}
@@ -276,8 +276,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_MESSAGE_UID))) {
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

@@ -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,8 +119,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_MESSAGE_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_MESSAGE_UID = BuildConfig.DEBUG ? 935008 : 935066;
/**
* 测试环境系统消息那个用户的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 ? 935001 : 935067;
/**
* 登录页面「如何登录」对应的 H5 页面

36
core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java
View File

@@ -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<String> 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<ServiceResult<Object>> 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<LoginResult> 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
);

2
core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java
View File

@@ -143,4 +143,6 @@ public class InitInfo implements Serializable {
private String androidUrl;
private String iOSUrl;
}
private List<Long> checkUids;
}

15
core/src/main/java/com/yizhuan/xchat_android_core/utils/CheckUtils.java Normal file
View File

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

4
gradle.properties
View File

@@ -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
version_name=2.0.2
version_code=202