moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

审核账号屏蔽私信和关闭推送

Browse Source
This commit is contained in:
huangjian
2020-12-15 11:47:53 +08:00
parent a6f45e34d6
commit 6cef42f2da
5 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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