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

[Modify]1.5.2代码合并

Browse Source
This commit is contained in:
wushaocheng
2023-02-27 19:14:06 +08:00
parent 6c49ae8e4f
commit b8de3e76c3
6 changed files with 131 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java
View File

@@ -27,19 +27,12 @@ import io.reactivex.Single;
public interface IUserModel extends IModel {
/**
* 信息不全登录后调
*
* @param userInfo
*/
public void requestCompleteUserInfo(UserInfo userInfo, String shareChannel, String shareUid, String roomUid);
/**
* 信息不全登录，增加了邀请码
*
* @param userInfo
*/
public Single<UserInfo> requestCompleteUserInfo(UserInfo userInfo, String shareChannel, String shareUid, String roomUid, String shareCode);
public Single<UserInfo> requestCompleteUserInfo(UserInfo userInfo, String shareChannel, String shareUid, String roomUid, String shareCode, String adid);
/**

34
core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
View File

@@ -346,13 +346,6 @@ public final class UserModel extends BaseModel implements IUserModel {
.compose(RxHelper.handleSchedulers());
}
//此方法兼容其他端，其他端最好改为 return Single的同名方法
@Override
public void requestCompleteUserInfo(final UserInfo userInfo, String shareChannel, String shareUid, String roomUid) {
requestCompleteUserInfo(userInfo, shareChannel, shareUid, roomUid, null).subscribe();
}
/**
* 用户补全资料
*
@@ -362,7 +355,7 @@ public final class UserModel extends BaseModel implements IUserModel {
* @param roomUid
*/
@Override
public Single<UserInfo> requestCompleteUserInfo(final UserInfo userInfo, String shareChannel, String shareUid, String roomUid, String inviteCode) {
public Single<UserInfo> requestCompleteUserInfo(final UserInfo userInfo, String shareChannel, String shareUid, String roomUid, String inviteCode, String adid) {
if (StringUtils.isEmpty(String.valueOf(userInfo.getUid()))) {
return Single.error(new Throwable(ResUtil.getString(R.string.xchat_android_core_user_usermodel_08)));
@@ -416,7 +409,8 @@ public final class UserModel extends BaseModel implements IUserModel {
null,
null,
null,
inviteCode
inviteCode,
adid
)
.compose(RxHelper.handleBeanData())
.compose(RxHelper.handleSchedulers())
@@ -502,7 +496,8 @@ public final class UserModel extends BaseModel implements IUserModel {
region,
userDesc,
null,
null
null,
""
)
.compose(RxHelper.handleBeanData())
.compose(RxHelper.handleSchedulers())
@@ -910,23 +905,8 @@ public final class UserModel extends BaseModel implements IUserModel {
@Field("region") String region,
@Field("userDesc") String userDesc,
@Field("shareCode") String shareCode,
@Field("inviteCode") String inviteCode);
/**
* @param ticket
* @param uid
* @param nick
* @param avatar
* @param gender
* @return
*/
@FormUrlEncoded
@POST("user/v2/update")
Single<ServiceResult<UserInfo>> updateUserInfo(@Field("ticket") String ticket,
@Field("uid") long uid,
@Field("nick") String nick,
@Field("avatar") String avatar,
@Field("gender") int gender);
@Field("inviteCode") String inviteCode,
@Field("adid") String adid);
/**